aboutsummaryrefslogtreecommitdiffstats
path: root/m4/extern-inline.m4
diff options
context:
space:
mode:
authorPaul Eggert2013-10-22 21:01:46 -0700
committerPaul Eggert2013-10-22 21:01:46 -0700
commit758bed52afd57bd140409bfbbeabb4a89b5182d3 (patch)
tree29883f4b2b1a5e6f5070b02888a0d06241d8f19a /m4/extern-inline.m4
parent967a72c957b41e7af82ddfae8487066d6735f5b8 (diff)
downloademacs-758bed52afd57bd140409bfbbeabb4a89b5182d3.tar.gz
emacs-758bed52afd57bd140409bfbbeabb4a89b5182d3.zip
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.m43
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 @@
1# extern-inline.m4 serial 2
1dnl 'extern inline' a la ISO C99. 2dnl 'extern inline' a la ISO C99.
2 3
3dnl Copyright 2012-2013 Free Software Foundation, Inc. 4dnl Copyright 2012-2013 Free Software Foundation, Inc.
@@ -41,7 +42,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
41# define _GL_EXTERN_INLINE_IN_USE 42# define _GL_EXTERN_INLINE_IN_USE
42#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ 43#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
43 && !defined _GL_EXTERN_INLINE_APPLE_BUG) 44 && !defined _GL_EXTERN_INLINE_APPLE_BUG)
44# if __GNUC_GNU_INLINE__ 45# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
45 /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ 46 /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
46# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) 47# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
47# else 48# else