diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-01 16:43:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-01 16:43:19 -0700 |
| commit | aaea7495957f5b82fe4e1c8a90a8d96cd77c0001 (patch) | |
| tree | aad1d58e24582aca9744e8c51ad1d514e1a5615f /m4 | |
| parent | ab71f1741c2583d2ae7c753743fc5da49a5ad093 (diff) | |
| download | emacs-aaea7495957f5b82fe4e1c8a90a8d96cd77c0001.tar.gz | |
Merge from gnulib.
This incorporates:
2013-06-23 ignore-value: port to gcc -pedantic
2013-06-21 extern-inline: port to gcc -std=c89
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/extern-inline.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 4e801e31f41..c4c5e7f221b 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__)) |