diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-29 21:19:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-29 21:19:32 -0700 |
| commit | 65788e2e93a48015493514b7e8b712700d31a7a2 (patch) | |
| tree | bf57bd85f8cadfe03ad1eac60119bb61f4851268 /m4 | |
| parent | 34cf6f39526599378cc1d5800e707a8a6e80c8dd (diff) | |
| download | emacs-65788e2e93a48015493514b7e8b712700d31a7a2.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/extern-inline.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 12f24fab95f..600c8d3fa17 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -18,7 +18,9 @@ AC_DEFUN([gl_EXTERN_INLINE], <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. _GL_INLINE_HEADER_END contains useful stuff to put in the same include file, after uses of _GL_INLINE. */ -#if __GNUC__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__ +#if (__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline #elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) @@ -35,7 +37,7 @@ AC_DEFUN([gl_EXTERN_INLINE], #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -# if __GNUC_STDC_INLINE__ +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ # define _GL_INLINE_HEADER_CONST_PRAGMA # else # define _GL_INLINE_HEADER_CONST_PRAGMA \ |