From dcf27bef48c9800d5a2be8349226f73f1b8ff2e5 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 25 Sep 2012 13:58:12 +0200 Subject: [PATCH] extern-inline: provide a -Wundef safe config.h * m4/extern-inline.m4 (gl_EXTERN_INLINE): Protect "#if __GNUC_STDC_INLINE__" with "defined __GNUC_STDC_INLINE__" to produce a -Wundef warning free config.h. --- ChangeLog | 7 +++++++ m4/extern-inline.m4 | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c419884c0b..2905eef4e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-09-28 Akim Demaille + + extern-inline: provide a -Wundef safe config.h + * m4/extern-inline.m4 (gl_EXTERN_INLINE): Protect + "#if __GNUC_STDC_INLINE__" with "defined __GNUC_STDC_INLINE__" + to produce a -Wundef warning free config.h. + 2012-09-26 Paul Eggert hash-pjw: relax license to LGPLv2+ diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 12f24fab95..600c8d3fa1 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -18,7 +18,9 @@ AC_DEFUN([gl_EXTERN_INLINE], . _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 \ -- 2.39.5