From c63a72ef0d158de1d98ca46e510adee2e4299e3b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Nov 2012 22:25:10 -0800 Subject: [PATCH] extern-inline: no 'static inline' * m4/extern-inline.m4 (gl_EXTERN_INLINE): Do not require AC_C_INLINE. (_GL_INLINE, _GL_EXTERN_INLINE): Define as 'static', not as 'static inline', for older compilers. --- ChangeLog | 6 ++++++ m4/extern-inline.m4 | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ac628ad0..f6d9439ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-11-29 Paul Eggert + extern-inline: no 'static inline' + * m4/extern-inline.m4 (gl_EXTERN_INLINE): + Do not require AC_C_INLINE. + (_GL_INLINE, _GL_EXTERN_INLINE): Define as 'static', not as + 'static inline', for older compilers. + snippet/warn-on-use: no 'static inline' * build-aux/snippet/warn-on-use.h: Remove unnecessary 'inline' in comment. diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 600c8d3fa..24922605e 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -7,7 +7,6 @@ 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'. @@ -32,8 +31,8 @@ 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 +# define _GL_EXTERN_INLINE static #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -- 2.11.0