diff options
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/strftime.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 2b5ec2d44..8c4b5bcaf 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-01-04 Paul Eggert <eggert@cs.ucla.edu> + + * strftime.c (tzname): Don't declare if it is already #defined. + Problem reported for Mingw by Mark Junker. + 2006-01-04 Jim Meyering <jim@meyering.net> Merge from glibc. diff --git a/lib/strftime.c b/lib/strftime.c index d740ae018..13c8acc85 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005 Free Software +/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. @@ -47,7 +47,7 @@ # include <time.h> # endif #endif -#if HAVE_TZNAME +#if HAVE_TZNAME && ! defined tzname extern char *tzname[]; #endif |