diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-22 21:01:46 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-22 21:01:46 -0700 |
| commit | 758bed52afd57bd140409bfbbeabb4a89b5182d3 (patch) | |
| tree | 29883f4b2b1a5e6f5070b02888a0d06241d8f19a /m4/extern-inline.m4 | |
| parent | 967a72c957b41e7af82ddfae8487066d6735f5b8 (diff) | |
| download | emacs-758bed52afd57bd140409bfbbeabb4a89b5182d3.tar.gz | |
Merge from gnulib.
This incorporates:
2013-10-14 acl: allow cross-compilation to Gentoo
2013-10-18 extern-inline: make safe for -Wundef usage
2013-09-30 fpending: use pure+const function attrs
* lib/fpending.h, m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
Diffstat (limited to 'm4/extern-inline.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 4862d60d8e7..e4454d8fe3d 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,3 +1,4 @@ +# extern-inline.m4 serial 2 dnl 'extern inline' a la ISO C99. dnl Copyright 2012-2013 Free Software Foundation, Inc. @@ -41,7 +42,7 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ && !defined _GL_EXTERN_INLINE_APPLE_BUG) -# if __GNUC_GNU_INLINE__ +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # else |