Commit 65788e2e authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from gnulib.

parent 34cf6f39
2012-09-30 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2012-09-28 extern-inline: provide a -Wundef safe config.h
2012-09-27 Paul Eggert <eggert@cs.ucla.edu> 2012-09-27 Paul Eggert <eggert@cs.ucla.edu>
Check more robustly for timer_settime. Check more robustly for timer_settime.
......
...@@ -18,7 +18,9 @@ AC_DEFUN([gl_EXTERN_INLINE], ...@@ -18,7 +18,9 @@ AC_DEFUN([gl_EXTERN_INLINE],
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
_GL_INLINE_HEADER_END contains useful stuff to put _GL_INLINE_HEADER_END contains useful stuff to put
in the same include file, after uses of _GL_INLINE. */ 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_INLINE inline
# define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE extern inline
#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) #elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
...@@ -35,7 +37,7 @@ AC_DEFUN([gl_EXTERN_INLINE], ...@@ -35,7 +37,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
#endif #endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
# if __GNUC_STDC_INLINE__ # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
# define _GL_INLINE_HEADER_CONST_PRAGMA # define _GL_INLINE_HEADER_CONST_PRAGMA
# else # else
# define _GL_INLINE_HEADER_CONST_PRAGMA \ # define _GL_INLINE_HEADER_CONST_PRAGMA \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment