From cd15de4ab5ef12987ef10571c2788ab802140baa Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Aug 2012 15:34:37 -0700 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ lib/mktime.c | 4 ++-- m4/mktime.m4 | 7 ++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f841c6279..61142905d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-19 Paul Eggert + + 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. + 2012-08-19 Bruno Haible gnulib-tool: Improve coding style. diff --git a/lib/mktime.c b/lib/mktime.c index e1fbf9ea1..bef1134ca 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 00ee2dabe..f509bc4da 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], [:]) -- 2.11.0