bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 02/13] c-strtod, memcoll, readutmp: no 'static inline'


From: Paul Eggert
Subject: [PATCH 02/13] c-strtod, memcoll, readutmp: no 'static inline'
Date: Thu, 08 Nov 2012 23:47:47 -0800
User-agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2

* 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.
---
 ChangeLog      | 10 ++++++++++
 lib/c-strtod.c |  2 +-
 lib/memcoll.c  |  2 +-
 lib/readutmp.c |  2 +-
 m4/c-strtod.m4 |  8 +-------
 m4/memcoll.m4  |  7 ++-----
 m4/readutmp.m4 |  3 +--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfd70fb..0b4d720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-11-08  Paul Eggert  <address@hidden>
 
+       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):
diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index a5973d4..576808e 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -52,7 +52,7 @@ static volatile locale_t c_locale_cache;
 
 /* 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)
diff --git a/lib/memcoll.c b/lib/memcoll.c
index eb24463..5751328 100644
--- 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;
diff --git a/lib/readutmp.c b/lib/readutmp.c
index ef6277a..ed8783a 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -61,7 +61,7 @@ extract_trimmed_name (const STRUCT_UTMP *ut)
 
 /* 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);
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index c002e5f..535721c 100644
--- 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_DEFUN([gl_C_STRTOD],
 [
   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_DEFUN([gl_C_STRTOLD],
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_C99_STRTOLD])
   AC_CHECK_FUNCS([strtold_l])
-
-  AC_REQUIRE([AC_C_INLINE])
-  :
 ])
diff --git a/m4/memcoll.m4 b/m4/memcoll.m4
index 6409872..94dd4ad 100644
--- 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], [:])
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 8232823..437ffa6 100644
--- 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_DEFUN([gl_READUTMP],
   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.  */
-- 
1.7.11.7




reply via email to

[Prev in Thread] Current Thread [Next in Thread]