# HG changeset patch # User Paul Eggert # Date 1353479109 28800 # Node ID 84256646069c710da3388c697ec42e7becc0a99c # Parent dd46d4e6beea67ff241cd391b7414b5a3223454b error, filevercmp: no 'static inline' * lib/error.c (is_open, flush_stdout): * lib/filevercmp.c (order): Now static, not static inline. * m4/error.m4 (gl_PREREQ_ERROR): * modules/filevercmp (configure.ac): Do not require AC_C_INLINE. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-11-29 Paul Eggert + error, filevercmp: no 'static inline' + * lib/error.c (is_open, flush_stdout): + * lib/filevercmp.c (order): + Now static, not static inline. + * m4/error.m4 (gl_PREREQ_ERROR): + * modules/filevercmp (configure.ac): + Do not require AC_C_INLINE. + dup, execute, fatal-signal, etc.: no 'static inline' * lib/dup.c (dup_nothrow): * lib/execute.c (nonintr_close, nonintr_open): diff --git a/lib/error.c b/lib/error.c --- a/lib/error.c +++ b/lib/error.c @@ -121,7 +121,7 @@ #if !_LIBC /* Return non-zero if FD is open. */ -static inline int +static int is_open (int fd) { # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -139,7 +139,7 @@ } #endif -static inline void +static void flush_stdout (void) { #if !_LIBC diff --git a/lib/filevercmp.c b/lib/filevercmp.c --- a/lib/filevercmp.c +++ b/lib/filevercmp.c @@ -57,7 +57,7 @@ } /* verrevcmp helper function */ -static inline int +static int order (unsigned char c) { if (c_isdigit (c)) diff --git a/m4/error.m4 b/m4/error.m4 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -23,6 +23,5 @@ AC_DEFUN([gl_PREREQ_ERROR], [ AC_REQUIRE([AC_FUNC_STRERROR_R]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/modules/filevercmp b/modules/filevercmp --- a/modules/filevercmp +++ b/modules/filevercmp @@ -11,7 +11,6 @@ string configure.ac: -AC_REQUIRE([AC_C_INLINE]) Makefile.am: lib_SOURCES += filevercmp.c