* lib/stdio.in.h (rpl_fwrite): Now static, not static inline. * m4/stdio_h.m4 (gl_STDIO_H): Do not require AC_C_INLINE. --- ChangeLog | 4 ++++ lib/stdio.in.h | 2 +- m4/stdio_h.m4 | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 9095547..139e88a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-08-18 Paul Eggert <[email protected]> + stdio: avoid 'static inline' + * lib/stdio.in.h (rpl_fwrite): Now static, not static inline. + * m4/stdio_h.m4 (gl_STDIO_H): Do not require AC_C_INLINE. + stat: avoid 'static inline' * lib/stat.c (orig_stat): Now static, not static inline. * m4/stat.m4 (gl_PREREQ_STAT): Do not require AC_C_INLINE. diff --git a/lib/stdio.in.h b/lib/stdio.in.h index fab325d..498bb94 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -581,7 +581,7 @@ _GL_CXXALIAS_SYS (fwrite, size_t, This affects only function declaration attributes, so it's not needed for C++. */ # if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL -static inline size_t _GL_ARG_NONNULL ((1, 4)) +static size_t _GL_ARG_NONNULL ((1, 4)) rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream) { size_t r = fwrite (ptr, s, n, stream); diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 5298dd6..3bd6580 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 42 +# stdio_h.m4 serial 43 dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_NEXT_HEADERS([stdio.h]) dnl No need to create extra modules for these functions. Everyone who uses -- 1.7.6.5
