diff options
| author | Wilco Dijkstra <wdijkstr@arm.com> | 2015-09-18 21:40:12 +0100 |
|---|---|---|
| committer | Wilco Dijkstra <wdijkstr@arm.com> | 2015-09-18 21:43:43 +0100 |
| commit | 1344384b52829a4dcde51ec3a307c4b3d6a713fa (patch) | |
| tree | b37f977aaf87d64bfce4a16f00426d9f306dd351 | |
| parent | 94ced920a951bcab51f2ef955ccd2cc51668e6f3 (diff) | |
| download | glibc-1344384b52829a4dcde51ec3a307c4b3d6a713fa.tar.gz glibc-1344384b52829a4dcde51ec3a307c4b3d6a713fa.tar.xz glibc-1344384b52829a4dcde51ec3a307c4b3d6a713fa.zip | |
Undo build error fixes to timezone/private.h, change makefile instead to
ignore the errors.
2015-09-18 Wilco Dijkstra <wdijkstr@arm.com>
* timezone/Makefile: Ignore unused variable errors due to private.h
(time_t_min) and (time_t_max).
* timezone/private.h (time_t_min): Revert removal. (time_t_max):
Likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | timezone/Makefile | 10 | ||||
| -rw-r--r-- | timezone/private.h | 10 |
3 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index cafe59e3fb..53c6eee1e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-09-18 Wilco Dijkstra <wdijkstr@arm.com> + + * timezone/Makefile: Ignore unused variable errors due to private.h + (time_t_min) and (time_t_max). + * timezone/private.h (time_t_min): Revert removal. (time_t_max): + Likewise. + 2015-09-18 Joseph Myers <joseph@codesourcery.com> [BZ #18981] diff --git a/timezone/Makefile b/timezone/Makefile index bfb3463373..afd9e880b7 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -61,10 +61,12 @@ tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFRULES='"$(posixrules-file)"' \ -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT -CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT -CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT +CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT \ + -Wno-error=unused-const-variable +CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT \ + -Wno-error=unused-const-variable +CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -Wno-error=unused-const-variable +CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT -Wno-error=unused-const-variable # We have to make sure the data for testing the tz functions is available. # Don't add leapseconds here since test-tz made checks that work only without diff --git a/timezone/private.h b/timezone/private.h index ed19e066d9..4e8f4ae7bc 100644 --- a/timezone/private.h +++ b/timezone/private.h @@ -326,6 +326,16 @@ const char * scheck(const char * string, const char * format); #define TYPE_SIGNED(type) (((type) -1) < 0) #endif /* !defined TYPE_SIGNED */ +/* The minimum and maximum finite time values. */ +static time_t const time_t_min = + (TYPE_SIGNED(time_t) + ? (time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1) + : 0); +static time_t const time_t_max = + (TYPE_SIGNED(time_t) + ? - (~ 0 < 0) - ((time_t) -1 << (CHAR_BIT * sizeof (time_t) - 1)) + : -1); + #ifndef INT_STRLEN_MAXIMUM /* ** 302 / 1000 is log10(2.0) rounded up. |