[PATCH] fix gcc4.1 build failure on xconfig
scripts/kconfig/qconf.h:25: error: extra qualification âConfigSettings::â on member âreadSizesâ scripts/kconfig/qconf.h:26: error: extra qualification âConfigSettings::â on member âwriteSizesâ scripts/kconfig/qconf.h:127: error: extra qualification âConfigList::â on member âupdateMenuListâ Signed-off-by: Dave Jones <davej@redhat.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
1dac06b20d
commit
19144d0bea
@@ -22,8 +22,8 @@ public:
|
|||||||
|
|
||||||
#if QT_VERSION >= 300
|
#if QT_VERSION >= 300
|
||||||
void readListSettings();
|
void readListSettings();
|
||||||
QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok);
|
QValueList<int> readSizes(const QString& key, bool *ok);
|
||||||
bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value);
|
bool writeSizes(const QString& key, const QValueList<int>& value);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool showAll;
|
bool showAll;
|
||||||
@@ -124,7 +124,7 @@ public:
|
|||||||
void setParentMenu(void);
|
void setParentMenu(void);
|
||||||
|
|
||||||
template <class P>
|
template <class P>
|
||||||
void ConfigList::updateMenuList(P*, struct menu*);
|
void updateMenuList(P*, struct menu*);
|
||||||
|
|
||||||
bool updateAll;
|
bool updateAll;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user