Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16274:2c5c6ce1dba4
strptime: fix regression on mingw
The previous change lost the side effect of skipping past a
time-zone offset sign. Instead, fix things to rely on the
fact that _GL_UNUSED can be applied to any variable, even if
some compilation paths use it, to silence gcc on the paths
where it is not used.
* lib/strptime.c (__strptime_internal) [!_LIBC && !HAVE_TM_GMTOFF]:
Fix regression. Reported by Bruno Haible.
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Thu, 12 Jan 2012 08:39:07 -0700 |
| parents | d50152d6b5d2 |
| children | 053f5a861da8 |
| files | ChangeLog lib/strptime.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-12 Eric Blake <eblake@redhat.com> + + strptime: fix regression on mingw + * lib/strptime.c (__strptime_internal) [!_LIBC && !HAVE_TM_GMTOFF]: + Fix regression. Reported by Bruno Haible. + 2012-01-11 Reuben Thomas <rrt@sc3d.org> Bruno Haible <bruno@clisp.org>
--- a/lib/strptime.c +++ b/lib/strptime.c @@ -674,9 +674,7 @@ specify hours. If fours digits are used, minutes are also specified. */ { -#if defined _LIBC || HAVE_TM_GMTOFF - bool neg; -#endif + bool neg _GL_UNUSED; int n; val = 0; @@ -684,9 +682,7 @@ ++rp; if (*rp != '+' && *rp != '-') return NULL; -#if defined _LIBC || HAVE_TM_GMTOFF neg = *rp++ == '-'; -#endif n = 0; while (n < 4 && *rp >= '0' && *rp <= '9') {