Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17049:eaa24b775e15
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.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 18 Aug 2012 15:34:37 -0700 |
parents | 50a1774e83e0 |
children | 5a5080681d6c |
files | ChangeLog lib/mktime.c m4/mktime.m4 |
diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-19 Paul Eggert <eggert@cs.ucla.edu> + + 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 <bruno@clisp.org> gnulib-tool: Improve coding style.
--- a/lib/mktime.c +++ b/lib/mktime.c @@ -142,7 +142,7 @@ 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 @@ 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) {
--- 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 @@ ]) # Prerequisites of lib/mktime.c. -AC_DEFUN([gl_PREREQ_MKTIME], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_MKTIME], [:])