[PATCH 13/16] unistd: avoid 'static inline'

[Paul Eggert]

* lib/unistd.in.h (rpl_environ, getpagesize): Now static, not
static inline.
* m4/unistd_h.m4 (gl_UNISTD_H): Do not require AC_C_INLINE.
---
 ChangeLog       |    5 +++++
 lib/unistd.in.h |    4 ++--
 m4/unistd_h.m4  |    3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32a04a3..d6d1b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-18  Paul Eggert  <address@hidden>
 
+       unistd: avoid 'static inline'
+       * lib/unistd.in.h (rpl_environ, getpagesize): Now static, not
+       static inline.
+       * m4/unistd_h.m4 (gl_UNISTD_H): Do not require AC_C_INLINE.
+
        sys_stat: avoid 'static inline'
        * lib/sys_stat.in.h (rpl_mkdir): Now static, not static inline.
        * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Do not require AC_C_INLINE.
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 450d0be..2bd191d 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -404,7 +404,7 @@ extern char **environ;
 # endif
 #elif defined GNULIB_POSIXCHECK
 # if HAVE_RAW_DECL_ENVIRON
-static inline char ***
+static char ***
 rpl_environ (void)
 {
   return &environ;
@@ -862,7 +862,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
 #     define getpagesize() _gl_getpagesize ()
 #    else
 #     if !GNULIB_defined_getpagesize_function
-static inline int
+static int
 getpagesize ()
 {
   return _gl_getpagesize ();
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 7e7651b..f68fbff 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 65
+# unistd_h.m4 serial 66
 dnl Copyright (C) 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,
@@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H],
   dnl Use AC_REQUIRE here, so that the default behavior below is expanded
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_C_INLINE])
 
   gl_CHECK_NEXT_HEADERS([unistd.h])
   if test $ac_cv_header_unistd_h = yes; then
-- 
1.7.6.5