diff options
| author | Simon Josefsson <simon@josefsson.org> | 2013-03-24 10:17:07 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2013-03-24 10:17:07 +0100 |
| commit | 50e02f7e015ccd603d89039f1ad82a5b2eb9a25a (patch) | |
| tree | 165b0e7818031f9cc9f57c5b78fd23a03b2cbb99 /gl/m4/extern-inline.m4 | |
| parent | eb7dcd9f2da288acf527e13fc8f701d7b20886bf (diff) | |
| download | libtasn1-50e02f7e015ccd603d89039f1ad82a5b2eb9a25a.tar.gz libtasn1-50e02f7e015ccd603d89039f1ad82a5b2eb9a25a.tar.bz2 libtasn1-50e02f7e015ccd603d89039f1ad82a5b2eb9a25a.zip | |
Update gnulib files.
Diffstat (limited to 'gl/m4/extern-inline.m4')
| -rw-r--r-- | gl/m4/extern-inline.m4 | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4 index 12f24fa..0152f29 100644 --- a/gl/m4/extern-inline.m4 +++ b/gl/m4/extern-inline.m4 @@ -1,13 +1,12 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012 Free Software Foundation, Inc. +dnl Copyright 2012-2013 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. AC_DEFUN([gl_EXTERN_INLINE], [ - AC_REQUIRE([AC_C_INLINE]) AH_VERBATIM([extern_inline], [/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. @@ -17,11 +16,22 @@ 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__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__ + in the same include file, after uses of _GL_INLINE. + + Suppress extern inline with HP-UX cc, as it appears to be broken; see + <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. + + 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 __HP_cc) \ + && !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__)) @@ -30,12 +40,12 @@ AC_DEFUN([gl_EXTERN_INLINE], # endif # define _GL_EXTERN_INLINE extern #else -# define _GL_INLINE static inline -# define _GL_EXTERN_INLINE static inline +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED #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 \ |