Mercurial > hg > octave-nkf > gnulib-hg
changeset 17187:4cd6b652c293
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.
* lib/fflush.c (disable_seek_optimization, restore_seek_optimization)
(update_fpos_cache):
Define only if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1).
* m4/fflush.m4 (gl_PREREQ_FFLUSH):
* m4/stat.m4 (gl_PREREQ_STAT):
Do not require AC_C_INLINE.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 20 Nov 2012 22:25:09 -0800 |
parents | 84256646069c |
children | d7a44f0f7a15 |
files | ChangeLog lib/fflush.c lib/stat.c m4/fflush.m4 m4/stat.m4 |
diffstat | 5 files changed, 34 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2012-11-29 Paul Eggert <eggert@cs.ucla.edu> + 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. + * lib/fflush.c (disable_seek_optimization, restore_seek_optimization) + (update_fpos_cache): + Define only if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1). + * 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):
--- 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 @@ #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 */ @@ -71,9 +71,11 @@ #endif -#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -static inline int +# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + +static int disable_seek_optimization (FILE *fp) { int saved_flags = fp_->_flags & (__SOPT | __SNPT); @@ -81,23 +83,23 @@ return saved_flags; } -static inline void +static void restore_seek_optimization (FILE *fp, int saved_flags) { fp_->_flags = (fp_->_flags & ~(__SOPT | __SNPT)) | saved_flags; } -#endif +# else -static inline void +static void update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, off_t pos _GL_UNUSED_PARAMETER) { -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -# if defined __CYGWIN__ +# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if defined __CYGWIN__ /* fp_->_offset is typed as an integer. */ fp_->_offset = pos; -# else +# else /* fp_->_offset is an fpos_t. */ /* Use a union, since on NetBSD, the compilation flags determine whether fpos_t is typedef'd to off_t or a struct containing a @@ -109,10 +111,12 @@ } u; u.o = pos; fp_->_offset = u.f; -# endif +# endif fp_->_flags |= __SOFF; +# endif +} +# endif #endif -} /* Flush all pending data on STREAM according to POSIX rules. Both output and seekable input streams are supported. */
--- 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);
--- 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 @@ ]) # Prerequisites of lib/fflush.c. -AC_DEFUN([gl_PREREQ_FFLUSH], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_FFLUSH], [:])