Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17190:6fa7c7fb76b2
parse-datetime, parse-duration: no 'static inline'
* lib/parse-datetime.y (to_uchar):
* lib/parse-duration.c (str_const_to_ul, str_const_to_l)
(scale_n_add):
Now static, not static inline.
* m4/parse-datetime.m4 (gl_PARSE_DATETIME):
* modules/parse-duration (configure.ac):
Do not require AC_C_INLINE.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 20 Nov 2012 22:25:09 -0800 |
| parents | 83a5829d7fe2 |
| children | d27d22e71282 |
| files | ChangeLog lib/parse-datetime.y lib/parse-duration.c m4/parse-datetime.m4 modules/parse-duration |
| diffstat | 5 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2012-11-29 Paul Eggert <eggert@cs.ucla.edu> + parse-datetime, parse-duration: no 'static inline' + * lib/parse-datetime.y (to_uchar): + * lib/parse-duration.c (str_const_to_ul, str_const_to_l) + (scale_n_add): + Now static, not static inline. + * m4/parse-datetime.m4 (gl_PARSE_DATETIME): + * modules/parse-duration (configure.ac): + Do not require AC_C_INLINE. + getaddrinfo: no 'static inline' * lib/getaddrinfo.c (validate_family): Now static, not static inline.
--- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -116,7 +116,7 @@ /* Convert a possibly-signed character to an unsigned character. This is a bit safer than casting to unsigned char, since it catches some type errors that the cast doesn't. */ -static inline unsigned char to_uchar (char ch) { return ch; } +static unsigned char to_uchar (char ch) { return ch; } /* Lots of this code assumes time_t and time_t-like values fit into long_time_t. */
--- a/lib/parse-duration.c +++ b/lib/parse-duration.c @@ -54,14 +54,14 @@ #define TIME_MAX 0x7FFFFFFF /* Wrapper around strtoul that does not require a cast. */ -static unsigned long inline +static unsigned long str_const_to_ul (cch_t * str, cch_t ** ppz, int base) { return strtoul (str, (char **)ppz, base); } /* Wrapper around strtol that does not require a cast. */ -static long inline +static long str_const_to_l (cch_t * str, cch_t ** ppz, int base) { return strtol (str, (char **)ppz, base); @@ -70,7 +70,7 @@ /* Returns BASE + VAL * SCALE, interpreting BASE = BAD_TIME with errno set as an error situation, and returning BAD_TIME with errno set in an error situation. */ -static time_t inline +static time_t scale_n_add (time_t base, time_t val, int scale) { if (base == BAD_TIME)
--- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,4 +1,4 @@ -# parse-datetime.m4 serial 20 +# parse-datetime.m4 serial 21 dnl Copyright (C) 2002-2006, 2008-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, @@ -32,7 +32,6 @@ dnl Prerequisites of lib/parse-datetime.y. AC_REQUIRE([gl_BISON]) - AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_C_COMPOUND_LITERALS]) AC_STRUCT_TIMEZONE AC_REQUIRE([gl_CLOCK_TIME])