diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/Makefile | 10 | ||||
| -rw-r--r-- | time/private.h | 15 | ||||
| -rw-r--r-- | time/scheck.c | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/time/Makefile b/time/Makefile index 044f15486d..cf0ac6a89d 100644 --- a/time/Makefile +++ b/time/Makefile @@ -179,14 +179,20 @@ CFLAGS-tzset.c = $(tz-cflags) # We have to make sure the data for testing the tz functions is available. .PHONY: install-test-data -install-test-data: northamerica $(objpfx)zic $(leapseconds) yearistype \ - etcetera simplebackw +install-test-data: $(addprefx $(objpfx)testdata/, America/New_York \ + Etc/UTC UTC) + +$(objpfx)testdata/America/New_York: $(objpfx)zic $(leapseconds) yearistype $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ -y yearistype northamerica +$(objpfx)testdata/Etc/UTC: $(objpfx)zic $(leapseconds) yearistype $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ -y yearistype etcetera +$(objpfx)testdata/UTC: $(objpfx)testdata/Etc/UTC $(objpfx)zic \ + $(leapseconds) yearistype $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ -y yearistype simplebackw + test-tz-ENV = TZDIR=$(objpfx)testdata diff --git a/time/private.h b/time/private.h index 5a5b516d0f..5502aa8c98 100644 --- a/time/private.h +++ b/time/private.h @@ -176,14 +176,13 @@ extern int errno; ** Private function declarations. */ char * icalloc P((int nelem, int elsize)); -char * icatalloc P((char * old, const char * new)); -char * icpyalloc P((const char * string)); -char * imalloc P((int n)); -void * irealloc P((void * pointer, int size)); -void icfree P((char * pointer)); -void ifree P((char * pointer)); -char * scheck P((const char *string, char *format)); - +char * icatalloc P((char * old, const char * const new)); +char * icpyalloc P((const char * const string)); +char * imalloc P((const int n)); +void * irealloc P((void * const pointer, const int size)); +void icfree P((char * const pointer)); +void ifree P((char * const pointer)); +char * scheck P((const char * const string, const char * const format)); /* ** Finally, some convenience items. diff --git a/time/scheck.c b/time/scheck.c index b51f58d042..52b4ff51fd 100644 --- a/time/scheck.c +++ b/time/scheck.c @@ -11,7 +11,7 @@ static char elsieid[] = "@(#)scheck.c 8.14"; char * scheck(string, format) const char * const string; -char * const format; +const char * const format; { register char * fbuf; register const char * fp; |