aboutsummaryrefslogtreecommitdiffstats
path: root/m4/extern-inline.m4
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-03-12 22:07:39 +0200
committerArnold D. Robbins <arnold@skeeve.com>2018-03-12 22:07:39 +0200
commited1faa79b624518172ffe51c0bd098d142e15db1 (patch)
treee3302d79857fb85196ba91da0159d4d0f4f41d7c /m4/extern-inline.m4
parent2851796ba5a630da07559169df261afa094ee0d9 (diff)
parente795ffe30a78eaf86ca14e7639695be41020b2f6 (diff)
downloadegawk-ed1faa79b624518172ffe51c0bd098d142e15db1.tar.gz
egawk-ed1faa79b624518172ffe51c0bd098d142e15db1.tar.bz2
egawk-ed1faa79b624518172ffe51c0bd098d142e15db1.zip
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'm4/extern-inline.m4')
-rw-r--r--m4/extern-inline.m47
1 files changed, 4 insertions, 3 deletions
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 0edbe3c8..72800650 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -1,6 +1,6 @@
dnl 'extern inline' a la ISO C99.
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
+dnl Copyright 2012-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -74,12 +74,13 @@ AC_DEFUN([gl_EXTERN_INLINE],
# define _GL_EXTERN_INLINE static _GL_UNUSED
#endif
-/* In GCC, suppress bogus "no previous prototype for 'FOO'"
+/* In GCC 4.6 (inclusive) to 5.1 (exclusive),
+ suppress bogus "no previous prototype for 'FOO'"
and "no previous declaration for 'FOO'" diagnostics,
when FOO is an inline function in the header; see
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>. */
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__
# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
# define _GL_INLINE_HEADER_CONST_PRAGMA
# else