aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkr?nzer <bernhard.rosenkranzer@linaro.org>2015-03-25 13:46:34 -0500
committerBernhard Rosenkr?nzer <bernhard.rosenkranzer@linaro.org>2015-03-25 13:46:34 -0500
commit76f148583ab6eb709bd930aeec6855663619a68b (patch)
tree4be4c427b76d63c002be9a1e03082322cb2d21c4
parentd6d4ad0663dc91a448139d9bac4fecab43a41b30 (diff)
downloadtoybox-76f148583ab6eb709bd930aeec6855663619a68b.tar.gz
Fix toybox build with C99 compilers
toybox "make menuconfig" currently fails to build if the compiler is in C99 mode (clang 3.6 and gcc 5.0 snapshots default to C99 mode, you can also reproduce the failure with older gcc by using 'make menuconfig HOSTCC="gcc -std=gnu99"'). The problem is that inline semantics changed in C99, and kconf_id_lookup's inline-ness depends on C89 semantics there.
-rw-r--r--kconfig/zconf.hash.c_shipped2
1 files changed, 1 insertions, 1 deletions
diff --git a/kconfig/zconf.hash.c_shipped b/kconfig/zconf.hash.c_shipped
index 47c8b5ba..0287aa3b 100644
--- a/kconfig/zconf.hash.c_shipped
+++ b/kconfig/zconf.hash.c_shipped
@@ -159,7 +159,7 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
"enable"
};
#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
-#ifdef __GNUC__
+#if defined(__GNUC__) && __STDC_VERSION__ < 199901L
__inline
#endif
struct kconf_id *