diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-12 06:17:32 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-12 06:17:32 -0500 |
| commit | 4a9a8f1387fc4ed34a042ac9dfa66e79b59c55d7 (patch) | |
| tree | 9c91f8731f8efa6d94dff8966e0642f5e0a7dc7c /autogen | |
| parent | cc98b6842663b6fe30e0b7c7a628604959d5dc69 (diff) | |
| download | emacs-4a9a8f1387fc4ed34a042ac9dfa66e79b59c55d7.tar.gz | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -rw-r--r-- | autogen/config.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/autogen/config.in b/autogen/config.in index fd34e6a6ec2..f9d839bc750 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -1536,13 +1536,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ when FOO is an inline function in the header; see <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__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -1551,8 +1557,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ # endif # define _GL_EXTERN_INLINE extern #else -# define _GL_INLINE static -# define _GL_EXTERN_INLINE static +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) |