diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | lib/ftruncate.c | 2 | ||||
| -rw-r--r-- | lib/fts.c | 4 | ||||
| -rw-r--r-- | lib/lstat.c | 2 | ||||
| -rw-r--r-- | lib/openat.c | 2 | ||||
| -rw-r--r-- | lib/raise.c | 2 | ||||
| -rw-r--r-- | m4/ftruncate.m4 | 3 | ||||
| -rw-r--r-- | m4/fts.m4 | 3 | ||||
| -rw-r--r-- | m4/lstat.m4 | 8 | ||||
| -rw-r--r-- | m4/openat.m4 | 3 | ||||
| -rw-r--r-- | m4/raise.m4 | 6 |
11 files changed, 27 insertions, 22 deletions
@@ -1,5 +1,19 @@ 2012-11-29 Paul Eggert <eggert@cs.ucla.edu> + ftruncate, fts, lstat, openat, raise: no 'static inline' + * lib/ftruncate.c (chsize_nothrow): + * lib/fts.c (opendirat, diropen): + * lib/lstat.c (orig_lstat): + * lib/openat.c (orig_openat): + * lib/raise.c (raise_nothrow): + Now static, not static inline. + * m4/ftruncate.m4 (gl_PREREQ_FTRUNCATE): + * m4/fts.m4 (gl_FUNC_FTS_CORE): + * m4/lstat.m4 (gl_PREREQ_LSTAT): + * m4/openat.m4 (gl_PREREQ_OPENAT): + * m4/raise.m4 (gl_PREREQ_RAISE): + Do not require AC_C_INLINE. + fflush, stat: no 'static inline' * lib/fflush.c (clear_ungetc_buffer_preserving_position) (clear_ungetc_buffer, disable_seek_optimization) diff --git a/lib/ftruncate.c b/lib/ftruncate.c index e243adda60..b7b525caad 100644 --- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -157,7 +157,7 @@ ftruncate (int fd, off_t length) # if HAVE_MSVC_INVALID_PARAMETER_HANDLER # include "msvc-inval.h" -static inline int +static int chsize_nothrow (int fd, long length) { int result; @@ -290,7 +290,7 @@ fts_set_stat_required (FTSENT *p, bool required) /* file-descriptor-relative opendir. */ /* FIXME: if others need this function, move it into lib/openat.c */ -static inline DIR * +static DIR * internal_function opendirat (int fd, char const *dir, int extra_flags, int *pdir_fd) { @@ -360,7 +360,7 @@ restore_initial_cwd (FTS *sp) descriptor. Return -1 and set errno on failure. It doesn't matter whether the file descriptor has read or write access. */ -static inline int +static int internal_function diropen (FTS const *sp, char const *dir) { diff --git a/lib/lstat.c b/lib/lstat.c index db119a10d3..97fe6bb2d5 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -35,7 +35,7 @@ typedef int dummy; # include <sys/stat.h> # undef __need_system_sys_stat_h -static inline int +static int orig_lstat (const char *filename, struct stat *buf) { return lstat (filename, buf); diff --git a/lib/openat.c b/lib/openat.c index ac2496e907..4374d7684b 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -28,7 +28,7 @@ #undef __need_system_fcntl_h #if HAVE_OPENAT -static inline int +static int orig_openat (int fd, char const *filename, int flags, mode_t mode) { return openat (fd, filename, flags, mode); diff --git a/lib/raise.c b/lib/raise.c index 7f32b091ad..f975dcd313 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -32,7 +32,7 @@ # undef raise # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int raise_nothrow (int sig) { int result; diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index 969eb0412d..9f6c69063d 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,4 +1,4 @@ -# serial 19 +# serial 20 # See if we need to emulate a missing ftruncate function using chsize. @@ -36,6 +36,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS([chsize]) ]) @@ -1,4 +1,4 @@ -#serial 19 +#serial 20 dnl Copyright (C) 2005-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, @@ -12,7 +12,6 @@ AC_DEFUN([gl_FUNC_FTS], AC_DEFUN([gl_FUNC_FTS_CORE], [ dnl Prerequisites of lib/fts.c. - AC_REQUIRE([AC_C_INLINE]) gl_FUNC_OPENAT AC_CHECK_FUNCS_ONCE([fstatfs]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index b7335bda1b..01b4eb953d 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -# serial 25 +# serial 26 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. # @@ -27,11 +27,7 @@ AC_DEFUN([gl_FUNC_LSTAT], ]) # Prerequisites of lib/lstat.c. -AC_DEFUN([gl_PREREQ_LSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_LSTAT], [:]) AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [ diff --git a/m4/openat.m4 b/m4/openat.m4 index 0040040b74..e844ae5e01 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,4 +1,4 @@ -# serial 44 +# serial 45 # See if we need to use our replacement for Solaris' openat et al functions. dnl Copyright (C) 2004-2012 Free Software Foundation, Inc. @@ -31,7 +31,6 @@ AC_DEFUN([gl_FUNC_OPENAT], # Prerequisites of lib/openat.c. AC_DEFUN([gl_PREREQ_OPENAT], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T]) : ]) diff --git a/m4/raise.m4 b/m4/raise.m4 index 18eb8b9148..95e9fc40ec 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,4 +1,4 @@ -# raise.m4 serial 2 +# raise.m4 serial 3 dnl Copyright (C) 2011-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, @@ -31,6 +31,4 @@ AC_DEFUN([gl_FUNC_RAISE], ]) # Prerequisites of lib/raise.c. -AC_DEFUN([gl_PREREQ_RAISE], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_RAISE], [:]) |