diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-11 08:41:16 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-11 08:41:16 -0800 |
| commit | 4a8c422f3139a9b4fb2c7ffae5aef3bea28bdc65 (patch) | |
| tree | bdb456bf9196457f4e359bce9cd61e99d46c3719 | |
| parent | 0efa0d15dbf7e444276ac469b419e708ba885191 (diff) | |
| download | gnulib-4a8c422f3139a9b4fb2c7ffae5aef3bea28bdc65.tar.gz | |
extern-inline: avoid incompatibility with Darwin Libc
* m4/extern-inline.m4 (_GL_INLINE, _GL_EXTERN_INLINE): Do not use
extern inline if __APPLE__. Use _GL_UNUSED in the non-inline branch.
Problem reported by Akim Demaille in
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/extern-inline.m4 | 20 |
2 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2012-12-11 Paul Eggert <eggert@cs.ucla.edu> + + extern-inline: avoid incompatibility with Darwin Libc + * m4/extern-inline.m4 (_GL_INLINE, _GL_EXTERN_INLINE): Do not use + extern inline if __APPLE__. Use _GL_UNUSED in the non-inline branch. + Problem reported by Akim Demaille in + <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. + 2012-12-11 Simon Josefsson <simon@josefsson.org> gnupload: Work with GnuPG using gpg-agent (for smartcards). diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 24922605e6..0a9fc9a75b 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -16,13 +16,19 @@ AC_DEFUN([gl_EXTERN_INLINE], 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__)) @@ -31,8 +37,8 @@ AC_DEFUN([gl_EXTERN_INLINE], # 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__) |