diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-29 20:11:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-29 20:12:24 -0700 |
| commit | 6eaa9a57a172181f866d9c50f3e5880601551932 (patch) | |
| tree | f7c80892059656bef4d7f266f2ae62908deb2d1e /m4/extern-inline.m4 | |
| parent | fa175b449597256dc4cb0411ce1978aa2016c170 (diff) | |
| download | emacs-6eaa9a57a172181f866d9c50f3e5880601551932.tar.gz | |
Merge from gnulib
This incorporates:
2015-04-29 extern-inline: no need for workaround in GCC 5.1
2015-04-26 file-has-acl: port to CentOS 6
* m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
Diffstat (limited to 'm4/extern-inline.m4')
| -rw-r--r-- | m4/extern-inline.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index e74339a165e..72800650e6f 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -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 |