diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-08-04 20:34:00 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-08-04 20:34:00 +0200 |
| commit | 58c2a296d9378f246f58b5abb2ec75d70ae2be78 (patch) | |
| tree | 32776d58fd1e027a271b5aaaceca6d8358ea1c43 /gnulib/m4/extern-inline.m4 | |
| parent | 97ba16c1e12111c63fd1d38814dcc46eb9affc28 (diff) | |
New upstream version 1.1.1
Diffstat (limited to 'gnulib/m4/extern-inline.m4')
| -rw-r--r-- | gnulib/m4/extern-inline.m4 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gnulib/m4/extern-inline.m4 b/gnulib/m4/extern-inline.m4 index 94b46dde0..c4c5e7f22 100644 --- a/gnulib/m4/extern-inline.m4 +++ b/gnulib/m4/extern-inline.m4 @@ -8,15 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXTERN_INLINE], [ AH_VERBATIM([extern_inline], -[/* _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>. @@ -39,7 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE], && !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__)) @@ -59,6 +52,10 @@ AC_DEFUN([gl_EXTERN_INLINE], # 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\"") \ |