mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Undo build error fixes to timezone/private.h, change makefile instead to

Browse Source 
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.
This commit is contained in:
Wilco Dijkstra 2015-09-18 21:40:12 +01:00
parent 94ced920a9
commit 1344384b52
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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]

10
timezone/Makefile
View File

@ -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

10
timezone/private.h
View File

@ -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.