* m4/extern-inline.m4 (gl_EXTERN_INLINE): Do not use __gnu_inline__ if pedantic and pre-C99. --- ChangeLog | 6 ++++++ m4/extern-inline.m4 | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog index 5e4f02f..ce43380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-06-21 Paul Eggert <egg...@cs.ucla.edu> + + extern-inline: port to gcc -std=c89 + * m4/extern-inline.m4 (gl_EXTERN_INLINE): + Do not use __gnu_inline__ if pedantic and pre-C99. + 2013-06-18 Paul Eggert <egg...@cs.ucla.edu> doc: document extern-inline diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 4e801e3..c4c5e7f 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -31,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__)) -- 1.7.11.7