From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Nov 2012 06:25:09 +0000 (-0800)
Subject: error, filevercmp: no 'static inline'
X-Git-Tag: v0.1~343
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=13e58d5dc1d7649902f96365d295a6f1737d3630;p=gnulib.git

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
index 3898e331d..3a4e90b36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+	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
index dc8c65fa7..7d2bc71fc 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -121,7 +121,7 @@ extern char *program_name;
 
 #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 @@ is_open (int fd)
 }
 #endif
 
-static inline void
+static void
 flush_stdout (void)
 {
 #if !_LIBC
diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index bc1cc07d8..c477e2fd4 100644
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -57,7 +57,7 @@ match_suffix (const char **str)
 }
 
 /* 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
index 5d9c70a47..1190e32c3 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -23,6 +23,5 @@ AC_DEFUN([gl_ERROR],
 AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_FUNC_STRERROR_R])
-  AC_REQUIRE([AC_C_INLINE])
   :
 ])
diff --git a/modules/filevercmp b/modules/filevercmp
index dd6b0a6b6..373dfd00e 100644
--- a/modules/filevercmp
+++ b/modules/filevercmp
@@ -11,7 +11,6 @@ stdbool
 string
 
 configure.ac:
-AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
 lib_SOURCES += filevercmp.c