changeset 17184:dcca7ac14066

c-strtod, memcoll, readutmp: no 'static inline' * lib/c-strtod.c (c_locale): * lib/memcoll.c (strcoll_loop): * lib/readutmp.c (desirable_utmp_entry): Now static, not static inline. * m4/c-strtod.m4 (gl_C_STRTOD, gl_C_STRTOLD): * m4/memcoll.m4 (gl_MEMCOLL): * m4/readutmp.m4 (gl_READUTMP): Do not require AC_C_INLINE.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 20 Nov 2012 22:25:08 -0800
parents f3fa9d9507c7
children dd46d4e6beea
files ChangeLog lib/c-strtod.c lib/memcoll.c lib/readutmp.c m4/c-strtod.m4 m4/memcoll.m4 m4/readutmp.m4
diffstat 7 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+	c-strtod, memcoll, readutmp: no 'static inline'
+	* lib/c-strtod.c (c_locale):
+	* lib/memcoll.c (strcoll_loop):
+	* lib/readutmp.c (desirable_utmp_entry):
+	Now static, not static inline.
+	* m4/c-strtod.m4 (gl_C_STRTOD, gl_C_STRTOLD):
+	* m4/memcoll.m4 (gl_MEMCOLL):
+	* m4/readutmp.m4 (gl_READUTMP):
+	Do not require AC_C_INLINE.
+
 	arctwo, md4, md5, sha1, sha256, sha512: no 'static inline'
 	* lib/arctwo.c (to_uchar):
 	* lib/md4.c (set_uint32):
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -52,7 +52,7 @@
 
 /* Return the C locale object, or (locale_t) 0 with errno set
    if it cannot be created.  */
-static inline locale_t
+static locale_t
 c_locale (void)
 {
   if (!c_locale_cache)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -31,7 +31,7 @@
    nonzero sizes, and the last byte in each block must be a null byte.
    Set errno to an error number if there is an error, and to zero
    otherwise.  */
-static inline int
+static int
 strcoll_loop (char const *s1, size_t s1size, char const *s2, size_t s2size)
 {
   int diff;
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -61,7 +61,7 @@
 
 /* Is the utmp entry U desired by the user who asked for OPTIONS?  */
 
-static inline bool
+static bool
 desirable_utmp_entry (STRUCT_UTMP const *u, int options)
 {
   bool user_proc = IS_USER_PROCESS (u);
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,4 +1,4 @@
-# c-strtod.m4 serial 14
+# c-strtod.m4 serial 15
 
 # Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -38,9 +38,6 @@
 [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS([strtod_l])
-
-  AC_REQUIRE([AC_C_INLINE])
-  :
 ])
 
 dnl Prerequisites of lib/c-strtold.c.
@@ -49,7 +46,4 @@
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_C99_STRTOLD])
   AC_CHECK_FUNCS([strtold_l])
-
-  AC_REQUIRE([AC_C_INLINE])
-  :
 ])
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,11 +1,8 @@
-# memcoll.m4 serial 9
+# memcoll.m4 serial 10
 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2012 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_MEMCOLL],
-[
-  AC_REQUIRE([AC_C_INLINE])
-])
+AC_DEFUN([gl_MEMCOLL], [:])
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,4 +1,4 @@
-# readutmp.m4 serial 19
+# readutmp.m4 serial 20
 dnl Copyright (C) 2002-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,
@@ -12,7 +12,6 @@
   AC_CHECK_HEADERS_ONCE([utmp.h utmpx.h])
   if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
     dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
-    AC_REQUIRE([AC_C_INLINE])
     AC_CHECK_FUNCS_ONCE([utmpname utmpxname])
     AC_CHECK_DECLS([getutent],,,[[
 /* <sys/types.h> is a prerequisite of <utmp.h> on FreeBSD 8.0, OpenBSD 4.6.  */