diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dup.c | 2 | ||||
| -rw-r--r-- | lib/execute.c | 4 | ||||
| -rw-r--r-- | lib/fatal-signal.c | 4 | ||||
| -rw-r--r-- | lib/fopen.c | 2 | ||||
| -rw-r--r-- | lib/freadseek.c | 2 | ||||
| -rw-r--r-- | lib/freopen.c | 2 | ||||
| -rw-r--r-- | lib/fstat.c | 4 | ||||
| -rw-r--r-- | lib/get-rusage-as.c | 8 | ||||
| -rw-r--r-- | lib/get-rusage-data.c | 8 | ||||
| -rw-r--r-- | lib/getdtablesize.c | 2 | ||||
| -rw-r--r-- | lib/isatty.c | 2 | ||||
| -rw-r--r-- | lib/open.c | 2 | ||||
| -rw-r--r-- | lib/read.c | 2 | ||||
| -rw-r--r-- | lib/sigprocmask.c | 2 | ||||
| -rw-r--r-- | lib/spawn-pipe.c | 10 | ||||
| -rw-r--r-- | lib/vasnprintf.c | 2 | ||||
| -rw-r--r-- | lib/wait-process.c | 2 | ||||
| -rw-r--r-- | lib/write.c | 2 |
18 files changed, 32 insertions, 30 deletions
@@ -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 fc7165c5d1..53258cd4a9 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 54ef8c6e63..27e9d821b2 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 c17c73f2f3..3408192570 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -26,7 +26,7 @@ #include <stdio.h> #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 264b95ac71..fd9e014d14 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 c31e30c7fb..ce484b8632 100644 --- a/lib/freopen.c +++ b/lib/freopen.c @@ -26,7 +26,7 @@ #include <stdio.h> #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 6d5f5c2b6f..0418cc63b1 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 68db333a39..d764a91705 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 384862a5ba..358c214827 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 70ba0751b5..f9524fdcde 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 2ecdd5494a..43dd5d7b9d 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 27801b916c..bdfc8db5cf 100644 --- a/lib/open.c +++ b/lib/open.c @@ -27,7 +27,7 @@ #include <sys/types.h> #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 d130e311ce..aa5d16521e 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 be53d54001..aff3b29cda 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 fc7834d00c..e163257f5c 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 6763d03019..597db4235f 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 ed47ad7f32..80ed793909 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 0155309bd8..d2eb2511a7 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; |