[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/16] mktime: avoid 'static inline'
From: |
Paul Eggert |
Subject: |
[PATCH 05/16] mktime: avoid 'static inline' |
Date: |
Sat, 18 Aug 2012 17:52:25 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 |
* lib/mktime.c (leapyear, ydhms_diff): Now static, not static inline.
* m4/mktime.m4 (gl_PREREQ_MKTIME): Do not require AC_C_INLINE.
---
ChangeLog | 4 ++++
lib/mktime.c | 4 ++--
m4/mktime.m4 | 7 ++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 890941d..1f3e5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-08-18 Paul Eggert <address@hidden>
+ mktime: avoid 'static inline'
+ * lib/mktime.c (leapyear, ydhms_diff): Now static, not static inline.
+ * m4/mktime.m4 (gl_PREREQ_MKTIME): Do not require AC_C_INLINE.
+
crypto/md5: avoid 'static inline'
* lib/md5.c (set_uint32): Now static, not static inline.
* m4/md5.m4 (gl_MD5): Do not require AC_C_INLINE.
diff --git a/lib/mktime.c b/lib/mktime.c
index e1fbf9e..bef1134 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -142,7 +142,7 @@ verify (twos_complement_arithmetic,
verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
/* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */
-static inline int
+static int
leapyear (long_int year)
{
/* Don't add YEAR to TM_YEAR_BASE, as that might overflow.
@@ -196,7 +196,7 @@ isdst_differ (int a, int b)
The result may overflow. It is the caller's responsibility to
detect overflow. */
-static inline time_t
+static time_t
ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1,
int year0, int yday0, int hour0, int min0, int sec0)
{
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 00ee2da..f509bc4 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,4 +1,4 @@
-# serial 23
+# serial 24
dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -247,7 +247,4 @@ AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [
])
# Prerequisites of lib/mktime.c.
-AC_DEFUN([gl_PREREQ_MKTIME],
-[
- AC_REQUIRE([AC_C_INLINE])
-])
+AC_DEFUN([gl_PREREQ_MKTIME], [:])
--
1.7.6.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 05/16] mktime: avoid 'static inline',
Paul Eggert <=