* lib/fflush.c (clear_ungetc_buffer_preserving_position) (clear_ungetc_buffer, disable_seek_optimization) (restore_seek_optimization, update_fpos_cache): * lib/stat.c (orig_stat): Now static, not static inline. * m4/fflush.m4 (gl_PREREQ_FFLUSH): * m4/stat.m4 (gl_PREREQ_STAT): Do not require AC_C_INLINE. --- ChangeLog | 10 ++++++++++ lib/fflush.c | 10 +++++----- lib/stat.c | 2 +- m4/fflush.m4 | 8 ++------ m4/stat.m4 | 8 ++------ 5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog index d535d57..22b2918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2012-11-08 Paul Eggert <[email protected]> + fflush, stat: no 'static inline' + * lib/fflush.c (clear_ungetc_buffer_preserving_position) + (clear_ungetc_buffer, disable_seek_optimization) + (restore_seek_optimization, update_fpos_cache): + * lib/stat.c (orig_stat): + Now static, not static inline. + * m4/fflush.m4 (gl_PREREQ_FFLUSH): + * m4/stat.m4 (gl_PREREQ_STAT): + Do not require AC_C_INLINE. + error, filevercmp: no 'static inline' * lib/error.c (is_open, flush_stdout): * lib/filevercmp.c (order): diff --git a/lib/fflush.c b/lib/fflush.c index 7e70727..0a20091 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -36,7 +36,7 @@ #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ -static inline void +static void clear_ungetc_buffer_preserving_position (FILE *fp) { if (fp->_flags & _IO_IN_BACKUP) @@ -47,7 +47,7 @@ clear_ungetc_buffer_preserving_position (FILE *fp) #else /* Clear the stream's ungetc buffer. May modify the value of ftello (fp). */ -static inline void +static void clear_ungetc_buffer (FILE *fp) { # if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ @@ -73,7 +73,7 @@ clear_ungetc_buffer (FILE *fp) #if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -static inline int +static int disable_seek_optimization (FILE *fp) { int saved_flags = fp_->_flags & (__SOPT | __SNPT); @@ -81,7 +81,7 @@ disable_seek_optimization (FILE *fp) return saved_flags; } -static inline void +static void restore_seek_optimization (FILE *fp, int saved_flags) { fp_->_flags = (fp_->_flags & ~(__SOPT | __SNPT)) | saved_flags; @@ -89,7 +89,7 @@ restore_seek_optimization (FILE *fp, int saved_flags) #endif -static inline void +static void update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, off_t pos _GL_UNUSED_PARAMETER) { diff --git a/lib/stat.c b/lib/stat.c index 7599540..c0bcb88 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -42,7 +42,7 @@ # endif #endif -static inline int +static int orig_stat (const char *filename, struct stat *buf) { return stat (filename, buf); diff --git a/m4/fflush.m4 b/m4/fflush.m4 index 13455d1..273d43f 100644 --- a/m4/fflush.m4 +++ b/m4/fflush.m4 @@ -1,4 +1,4 @@ -# fflush.m4 serial 13 +# fflush.m4 serial 14 # Copyright (C) 2007-2012 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -79,8 +79,4 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN], ]) # Prerequisites of lib/fflush.c. -AC_DEFUN([gl_PREREQ_FFLUSH], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_FFLUSH], [:]) diff --git a/m4/stat.m4 b/m4/stat.m4 index a8b79f5..0fd117e 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -# serial 10 +# serial 11 # Copyright (C) 2009-2012 Free Software Foundation, Inc. # @@ -68,8 +68,4 @@ AC_DEFUN([gl_FUNC_STAT], ]) # Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_STAT], [:]) -- 1.7.11.7
