From aaea7495957f5b82fe4e1c8a90a8d96cd77c0001 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 1 Jul 2013 16:43:19 -0700
Subject: Merge from gnulib.

This incorporates:
2013-06-23 ignore-value: port to gcc -pedantic
2013-06-21 extern-inline: port to gcc -std=c89
---
 m4/extern-inline.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 4e801e31f4..c4c5e7f221 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__))
-- 
cgit v1.2.3