From bdaf232db994e039e47c1eefb27ff197390ce95e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 20 Nov 2012 22:25:09 -0800 Subject: [PATCH] dup, execute, fatal-signal, etc.: no 'static inline' * lib/dup.c (dup_nothrow): * lib/execute.c (nonintr_close, nonintr_open): * lib/fatal-signal.c (uninstall_handlers, install_handlers): * lib/fopen.c (orig_fopen): * lib/freadseek.c (freadptrinc): * lib/freopen.c (orig_freopen): * lib/fstat.c (orig_fstat, fstat_nothrow): * lib/get-rusage-as.c (get_rusage_as_via_setrlimit) (get_rusage_as_via_iterator): * lib/get-rusage-data.c (get_rusage_data_via_setrlimit): * lib/getdtablesize.c (_setmaxstdio_nothrow): * lib/isatty.c (_isatty_nothrow): * lib/open.c (orig_open): * lib/read.c (read_nothrow): * lib/sigprocmask.c (signal_nothrow): * lib/spawn-pipe.c (nonintr_close, nonintr_open): * lib/vasnprintf.c (MAX_ROOM_NEEDED): * lib/wait-process.c (unregister_slave_subprocess): * lib/write.c (write_nothrow): Now static, not static inline. * lib/spawn-pipe.c (nonintr_open): Define only if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__. * m4/dup.m4 (gl_PREREQ_DUP): * m4/execute.m4 (gl_EXECUTE): * m4/fatal-signal.m4 (gl_FATAL_SIGNAL): * m4/fopen.m4 (gl_PREREQ_FOPEN): * m4/freadseek.m4 (gl_FUNC_FREADSEEK): * m4/freopen.m4 (gl_PREREQ_FREOPEN): * m4/fstat.m4 (gl_PREREQ_FSTAT): * m4/getdtablesize.m4 (gl_PREREQ_GETDTABLESIZE): * m4/isatty.m4 (gl_PREREQ_ISATTY): * m4/open.m4 (gl_PREREQ_OPEN): * m4/read.m4 (gl_PREREQ_READ): * m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): * m4/spawn-pipe.m4 (gl_SPAWN_PIPE): * m4/vasnprintf.m4 (gl_PREREQ_VASNPRINTF): * m4/wait-process.m4 (gl_WAIT_PROCESS): * m4/write.m4 (gl_PREREQ_WRITE): * modules/get-rusage-as, modules/get-rusage-data (configure.ac): Do not require AC_C_INLINE. --- ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/dup.c | 2 +- lib/execute.c | 4 ++-- lib/fatal-signal.c | 4 ++-- lib/fopen.c | 2 +- lib/freadseek.c | 2 +- lib/freopen.c | 2 +- lib/fstat.c | 4 ++-- lib/get-rusage-as.c | 8 ++++---- lib/get-rusage-data.c | 8 ++++---- lib/getdtablesize.c | 2 +- lib/isatty.c | 2 +- lib/open.c | 2 +- lib/read.c | 2 +- lib/sigprocmask.c | 2 +- lib/spawn-pipe.c | 10 ++++++---- lib/vasnprintf.c | 2 +- lib/wait-process.c | 2 +- lib/write.c | 2 +- m4/dup.m4 | 6 ++---- m4/execute.m4 | 3 +-- m4/fatal-signal.m4 | 3 +-- m4/fopen.m4 | 7 ++----- m4/freadseek.m4 | 3 +-- m4/freopen.m4 | 7 ++----- m4/fstat.m4 | 7 ++----- m4/getdtablesize.m4 | 6 ++---- m4/isatty.m4 | 6 ++---- m4/open.m4 | 3 +-- m4/read.m4 | 7 ++----- m4/signalblocking.m4 | 6 ++---- m4/spawn-pipe.m4 | 3 +-- m4/vasnprintf.m4 | 3 +-- m4/wait-process.m4 | 3 +-- m4/write.m4 | 7 ++----- modules/get-rusage-as | 1 - modules/get-rusage-data | 1 - 37 files changed, 99 insertions(+), 87 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17a0554b0..3898e331d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,47 @@ 2012-11-29 Paul Eggert + dup, execute, fatal-signal, etc.: no 'static inline' + * lib/dup.c (dup_nothrow): + * lib/execute.c (nonintr_close, nonintr_open): + * lib/fatal-signal.c (uninstall_handlers, install_handlers): + * lib/fopen.c (orig_fopen): + * lib/freadseek.c (freadptrinc): + * lib/freopen.c (orig_freopen): + * lib/fstat.c (orig_fstat, fstat_nothrow): + * lib/get-rusage-as.c (get_rusage_as_via_setrlimit) + (get_rusage_as_via_iterator): + * lib/get-rusage-data.c (get_rusage_data_via_setrlimit): + * lib/getdtablesize.c (_setmaxstdio_nothrow): + * lib/isatty.c (_isatty_nothrow): + * lib/open.c (orig_open): + * lib/read.c (read_nothrow): + * lib/sigprocmask.c (signal_nothrow): + * lib/spawn-pipe.c (nonintr_close, nonintr_open): + * lib/vasnprintf.c (MAX_ROOM_NEEDED): + * lib/wait-process.c (unregister_slave_subprocess): + * lib/write.c (write_nothrow): + Now static, not static inline. + * lib/spawn-pipe.c (nonintr_open): Define only if + (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__. + * m4/dup.m4 (gl_PREREQ_DUP): + * m4/execute.m4 (gl_EXECUTE): + * m4/fatal-signal.m4 (gl_FATAL_SIGNAL): + * m4/fopen.m4 (gl_PREREQ_FOPEN): + * m4/freadseek.m4 (gl_FUNC_FREADSEEK): + * m4/freopen.m4 (gl_PREREQ_FREOPEN): + * m4/fstat.m4 (gl_PREREQ_FSTAT): + * m4/getdtablesize.m4 (gl_PREREQ_GETDTABLESIZE): + * m4/isatty.m4 (gl_PREREQ_ISATTY): + * m4/open.m4 (gl_PREREQ_OPEN): + * m4/read.m4 (gl_PREREQ_READ): + * m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): + * m4/spawn-pipe.m4 (gl_SPAWN_PIPE): + * m4/vasnprintf.m4 (gl_PREREQ_VASNPRINTF): + * m4/wait-process.m4 (gl_WAIT_PROCESS): + * m4/write.m4 (gl_PREREQ_WRITE): + * modules/get-rusage-as, modules/get-rusage-data (configure.ac): + Do not require AC_C_INLINE. + c-strtod, memcoll, readutmp: no 'static inline' * lib/c-strtod.c (c_locale): * lib/memcoll.c (strcoll_loop): diff --git a/lib/dup.c b/lib/dup.c index 0a0b69ed4..19d5048af 100644 --- a/lib/dup.c +++ b/lib/dup.c @@ -27,7 +27,7 @@ #undef dup #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int dup_nothrow (int fd) { int result; diff --git a/lib/execute.c b/lib/execute.c index fc7165c5d..53258cd4a 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -60,7 +60,7 @@ These functions can return -1/EINTR even though we don't have any signal handlers set up, namely when we get interrupted via SIGSTOP. */ -static inline int +static int nonintr_close (int fd) { int retval; @@ -73,7 +73,7 @@ nonintr_close (int fd) } #define close nonintr_close -static inline int +static int nonintr_open (const char *pathname, int oflag, mode_t mode) { int retval; diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 54ef8c6e6..27e9d821b 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -131,7 +131,7 @@ static struct sigaction saved_sigactions[64]; /* Uninstall the handlers. */ -static inline void +static void uninstall_handlers (void) { size_t i; @@ -176,7 +176,7 @@ fatal_signal_handler (int sig) /* Install the handlers. */ -static inline void +static void install_handlers (void) { size_t i; diff --git a/lib/fopen.c b/lib/fopen.c index c17c73f2f..340819257 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -26,7 +26,7 @@ #include #undef __need_FILE -static inline FILE * +static FILE * orig_fopen (const char *filename, const char *mode) { return fopen (filename, mode); diff --git a/lib/freadseek.c b/lib/freadseek.c index 264b95ac7..fd9e014d1 100644 --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -30,7 +30,7 @@ /* Increment the in-memory pointer. INCREMENT must be at most the buffer size returned by freadptr(). This is very cheap (no system calls). */ -static inline void +static void freadptrinc (FILE *fp, size_t increment) { /* Keep this code in sync with freadptr! */ diff --git a/lib/freopen.c b/lib/freopen.c index c31e30c7f..ce484b863 100644 --- a/lib/freopen.c +++ b/lib/freopen.c @@ -26,7 +26,7 @@ #include #undef __need_FILE -static inline FILE * +static FILE * orig_freopen (const char *filename, const char *mode, FILE *stream) { return freopen (filename, mode, stream); diff --git a/lib/fstat.c b/lib/fstat.c index 6d5f5c2b6..0418cc63b 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -31,7 +31,7 @@ #endif #undef __need_system_sys_stat_h -static inline int +static int orig_fstat (int fd, struct stat *buf) { return fstat (fd, buf); @@ -51,7 +51,7 @@ orig_fstat (int fd, struct stat *buf) #endif #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int fstat_nothrow (int fd, struct stat *buf) { int result; diff --git a/lib/get-rusage-as.c b/lib/get-rusage-as.c index 68db333a3..d764a9170 100644 --- a/lib/get-rusage-as.c +++ b/lib/get-rusage-as.c @@ -146,7 +146,7 @@ #if HAVE_SETRLIMIT && defined RLIMIT_AS && HAVE_SYS_MMAN_H && HAVE_MPROTECT -static inline uintptr_t +static uintptr_t get_rusage_as_via_setrlimit (void) { uintptr_t result; @@ -310,7 +310,7 @@ get_rusage_as_via_setrlimit (void) #else -static inline uintptr_t +static uintptr_t get_rusage_as_via_setrlimit (void) { return 0; @@ -331,7 +331,7 @@ vma_iterate_callback (void *data, uintptr_t start, uintptr_t end, return 0; } -static inline uintptr_t +static uintptr_t get_rusage_as_via_iterator (void) { uintptr_t total = 0; @@ -343,7 +343,7 @@ get_rusage_as_via_iterator (void) #else -static inline uintptr_t +static uintptr_t get_rusage_as_via_iterator (void) { return 0; diff --git a/lib/get-rusage-data.c b/lib/get-rusage-data.c index 384862a5b..358c21482 100644 --- a/lib/get-rusage-data.c +++ b/lib/get-rusage-data.c @@ -150,7 +150,7 @@ # define errno_expected() (errno == EINVAL) # endif -static inline uintptr_t +static uintptr_t get_rusage_data_via_setrlimit (void) { uintptr_t result; @@ -306,7 +306,7 @@ get_rusage_data_via_setrlimit (void) #else -static inline uintptr_t +static uintptr_t get_rusage_data_via_setrlimit (void) { return 0; @@ -337,7 +337,7 @@ vma_iterate_callback (void *data, uintptr_t start, uintptr_t end, return 0; } -static inline uintptr_t +static uintptr_t get_rusage_data_via_iterator (void) { # if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __BEOS__ || defined __HAIKU__ @@ -372,7 +372,7 @@ get_rusage_data_via_iterator (void) #else -static inline uintptr_t +static uintptr_t get_rusage_data_via_iterator (void) { return 0; diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index 70ba0751b..f9524fdcd 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -27,7 +27,7 @@ #include "msvc-inval.h" #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int _setmaxstdio_nothrow (int newmax) { int result; diff --git a/lib/isatty.c b/lib/isatty.c index 2ecdd5494..43dd5d7b9 100644 --- a/lib/isatty.c +++ b/lib/isatty.c @@ -37,7 +37,7 @@ #define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline int +static int _isatty_nothrow (int fd) { int result; diff --git a/lib/open.c b/lib/open.c index 27801b916..bdfc8db5c 100644 --- a/lib/open.c +++ b/lib/open.c @@ -27,7 +27,7 @@ #include #undef __need_system_fcntl_h -static inline int +static int orig_open (const char *filename, int flags, mode_t mode) { return open (filename, flags, mode); diff --git a/lib/read.c b/lib/read.c index d130e311c..aa5d16521 100644 --- a/lib/read.c +++ b/lib/read.c @@ -34,7 +34,7 @@ # undef read # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline ssize_t +static ssize_t read_nothrow (int fd, void *buf, size_t count) { ssize_t result; diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c index be53d5400..aff3b29cd 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -63,7 +63,7 @@ typedef void (*handler_t) (int); #if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline handler_t +static handler_t signal_nothrow (int sig, handler_t handler) { handler_t result; diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index fc7834d00..e163257f5 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -60,7 +60,7 @@ These functions can return -1/EINTR even though we don't have any signal handlers set up, namely when we get interrupted via SIGSTOP. */ -static inline int +static int nonintr_close (int fd) { int retval; @@ -73,7 +73,8 @@ nonintr_close (int fd) } #define close nonintr_close -static inline int +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +static int nonintr_open (const char *pathname, int oflag, mode_t mode) { int retval; @@ -84,8 +85,9 @@ nonintr_open (const char *pathname, int oflag, mode_t mode) return retval; } -#undef open /* avoid warning on VMS */ -#define open nonintr_open +# undef open /* avoid warning on VMS */ +# define open nonintr_open +#endif #endif diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 6763d0301..597db4235 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1530,7 +1530,7 @@ is_borderline (const char *digits, size_t precision) /* Returns the number of TCHAR_T units needed as temporary space for the result of sprintf or SNPRINTF of a single conversion directive. */ -static inline size_t +static size_t MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion, arg_type type, int flags, size_t width, int has_precision, size_t precision, int pad_ourselves) diff --git a/lib/wait-process.c b/lib/wait-process.c index ed47ad7f3..80ed79390 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -171,7 +171,7 @@ register_slave_subprocess (pid_t child) } /* Unregister a child from the list of slave subprocesses. */ -static inline void +static void unregister_slave_subprocess (pid_t child) { /* The easiest way to remove an entry from a list that can be used by diff --git a/lib/write.c b/lib/write.c index 0155309bd..d2eb2511a 100644 --- a/lib/write.c +++ b/lib/write.c @@ -40,7 +40,7 @@ # undef write # if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static inline ssize_t +static ssize_t write_nothrow (int fd, const void *buf, size_t count) { ssize_t result; diff --git a/m4/dup.m4 b/m4/dup.m4 index bec5880a3..198276fa4 100644 --- a/m4/dup.m4 +++ b/m4/dup.m4 @@ -1,4 +1,4 @@ -# dup.m4 serial 2 +# dup.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, @@ -22,6 +22,4 @@ AC_DEFUN([gl_FUNC_DUP], ]) # Prerequisites of lib/dup.c. -AC_DEFUN([gl_PREREQ_DUP], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_DUP], [:]) diff --git a/m4/execute.m4 b/m4/execute.m4 index 4bdfdec0d..8886ee53d 100644 --- a/m4/execute.m4 +++ b/m4/execute.m4 @@ -1,4 +1,4 @@ -# execute.m4 serial 4 +# execute.m4 serial 5 dnl Copyright (C) 2003, 2008-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,6 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXECUTE], [ dnl Prerequisites of lib/execute.c. - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) ]) diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4 index 9ca5aaf46..d102de713 100644 --- a/m4/fatal-signal.m4 +++ b/m4/fatal-signal.m4 @@ -1,4 +1,4 @@ -# fatal-signal.m4 serial 8 +# fatal-signal.m4 serial 9 dnl Copyright (C) 2003-2004, 2006, 2008-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, @@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FATAL_SIGNAL], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T]) AC_CHECK_HEADERS_ONCE([unistd.h]) gl_PREREQ_SIG_HANDLER_H diff --git a/m4/fopen.m4 b/m4/fopen.m4 index a1cb1848a..d56c783b8 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,4 +1,4 @@ -# fopen.m4 serial 8 +# fopen.m4 serial 9 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, @@ -55,7 +55,4 @@ changequote([,])dnl ]) # Prerequisites of lib/fopen.c. -AC_DEFUN([gl_PREREQ_FOPEN], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FOPEN], [:]) diff --git a/m4/freadseek.m4 b/m4/freadseek.m4 index 6ab839216..09f665f49 100644 --- a/m4/freadseek.m4 +++ b/m4/freadseek.m4 @@ -1,4 +1,4 @@ -# freadseek.m4 serial 1 +# freadseek.m4 serial 2 dnl Copyright (C) 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, @@ -6,6 +6,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FREADSEEK], [ - AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([__freadptrinc]) ]) diff --git a/m4/freopen.m4 b/m4/freopen.m4 index 8b22b8068..92e44ef7a 100644 --- a/m4/freopen.m4 +++ b/m4/freopen.m4 @@ -1,4 +1,4 @@ -# freopen.m4 serial 3 +# freopen.m4 serial 4 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, @@ -16,7 +16,4 @@ AC_DEFUN([gl_FUNC_FREOPEN], ]) # Prerequisites of lib/freopen.c. -AC_DEFUN([gl_PREREQ_FREOPEN], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FREOPEN], [:]) diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 3ab3297b2..a73baa278 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,4 +1,4 @@ -# fstat.m4 serial 3 +# fstat.m4 serial 4 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, @@ -33,7 +33,4 @@ AC_DEFUN([gl_FUNC_FSTAT], ]) # Prerequisites of lib/fstat.c. -AC_DEFUN([gl_PREREQ_FSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_FSTAT], [:]) diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 81488ba57..88a6117e1 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,4 +1,4 @@ -# getdtablesize.m4 serial 3 +# getdtablesize.m4 serial 4 dnl Copyright (C) 2008-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, @@ -14,6 +14,4 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], ]) # Prerequisites of lib/getdtablesize.c. -AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [:]) diff --git a/m4/isatty.m4 b/m4/isatty.m4 index 6f81d18e3..9555dad17 100644 --- a/m4/isatty.m4 +++ b/m4/isatty.m4 @@ -1,4 +1,4 @@ -# isatty.m4 serial 2 +# isatty.m4 serial 3 dnl Copyright (C) 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, @@ -16,6 +16,4 @@ AC_DEFUN([gl_FUNC_ISATTY], ]) # Prerequisites of lib/isatty.c. -AC_DEFUN([gl_PREREQ_ISATTY], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_ISATTY], [:]) diff --git a/m4/open.m4 b/m4/open.m4 index c85971dc1..2577a2280 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,4 +1,4 @@ -# open.m4 serial 13 +# open.m4 serial 14 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, @@ -86,7 +86,6 @@ changequote([,])dnl # Prerequisites of lib/open.c. AC_DEFUN([gl_PREREQ_OPEN], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T]) : ]) diff --git a/m4/read.m4 b/m4/read.m4 index 69aeb0963..13cb831ec 100644 --- a/m4/read.m4 +++ b/m4/read.m4 @@ -1,4 +1,4 @@ -# read.m4 serial 3 +# read.m4 serial 4 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, @@ -23,7 +23,4 @@ AC_DEFUN([gl_FUNC_READ], ]) # Prerequisites of lib/read.c. -AC_DEFUN([gl_PREREQ_READ], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_READ], [:]) diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index ab8035efb..d3cbb8426 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,4 +1,4 @@ -# signalblocking.m4 serial 13 +# signalblocking.m4 serial 14 dnl Copyright (C) 2001-2002, 2006-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, @@ -22,6 +22,4 @@ AC_DEFUN([gl_SIGNALBLOCKING], ]) # Prerequisites of lib/sigprocmask.c. -AC_DEFUN([gl_PREREQ_SIGPROCMASK], [ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:]) diff --git a/m4/spawn-pipe.m4 b/m4/spawn-pipe.m4 index 564132a9c..d598ddd1a 100644 --- a/m4/spawn-pipe.m4 +++ b/m4/spawn-pipe.m4 @@ -1,4 +1,4 @@ -# spawn-pipe.m4 serial 1 +# spawn-pipe.m4 serial 2 dnl Copyright (C) 2004, 2008-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,6 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_SPAWN_PIPE], [ dnl Prerequisites of lib/spawn-pipe.c. - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) ]) diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 0ce11da13..00308c4f5 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,4 +1,4 @@ -# vasnprintf.m4 serial 35 +# vasnprintf.m4 serial 36 dnl Copyright (C) 2002-2004, 2006-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, @@ -55,7 +55,6 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], # Prerequisites of lib/vasnprintf.c. AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], [ - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) AC_REQUIRE([gt_TYPE_WCHAR_T]) diff --git a/m4/wait-process.m4 b/m4/wait-process.m4 index 86c817c87..24524b0ec 100644 --- a/m4/wait-process.m4 +++ b/m4/wait-process.m4 @@ -1,4 +1,4 @@ -# wait-process.m4 serial 5 +# wait-process.m4 serial 6 dnl Copyright (C) 2003, 2008-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_WAIT_PROCESS], [ dnl Prerequisites of lib/wait-process.c. - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T]) AC_CHECK_FUNCS([waitid]) ]) diff --git a/m4/write.m4 b/m4/write.m4 index a6b122982..4d05d7af8 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,4 +1,4 @@ -# write.m4 serial 4 +# write.m4 serial 5 dnl Copyright (C) 2008-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, @@ -29,7 +29,4 @@ AC_DEFUN([gl_FUNC_WRITE], ]) # Prerequisites of lib/write.c. -AC_DEFUN([gl_PREREQ_WRITE], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_WRITE], [:]) diff --git a/modules/get-rusage-as b/modules/get-rusage-as index b415d5ce1..60a886d64 100644 --- a/modules/get-rusage-as +++ b/modules/get-rusage-as @@ -14,7 +14,6 @@ getpagesize vma-iter configure.ac: -AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([setrlimit]) gl_FUNC_MMAP_ANON AC_CHECK_HEADERS_ONCE([sys/mman.h]) diff --git a/modules/get-rusage-data b/modules/get-rusage-data index 2d8d37853..3948dbdd3 100644 --- a/modules/get-rusage-data +++ b/modules/get-rusage-data @@ -14,7 +14,6 @@ getpagesize vma-iter configure.ac: -AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([setrlimit]) gl_FUNC_MMAP_ANON -- 2.11.0