diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-06-23 22:45:05 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-06-23 22:45:05 +0100 |
| commit | 0bc8d3264d94fba1e14fb20368ad7b325a3b22fc (patch) | |
| tree | bafaa99054f59731abe06e9e34bab09c84bd2505 /config.h.in | |
| parent | 069e522e372a250839652ac143083962ef25295c (diff) | |
Upgrade to Gnulib 20130623.
Diffstat (limited to 'config.h.in')
| -rw-r--r-- | config.h.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/config.h.in b/config.h.in index 2de592ed..efa85da9 100644 --- a/config.h.in +++ b/config.h.in @@ -1995,15 +1995,7 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. - _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. - _GL_INLINE_HEADER_BEGIN contains useful stuff to put - in an include file, before uses of _GL_INLINE. - It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, - when FOO is an inline function in the header; see - <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. - _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. +/* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. @@ -2026,7 +2018,8 @@ && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined __APPLE__) # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -2046,6 +2039,10 @@ # define _GL_INLINE_HEADER_CONST_PRAGMA \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") # endif + /* Suppress GCC's bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ |