diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-04 18:55:42 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-04 18:55:42 +0000 |
| commit | b83182a47812798b8980cecc078b8ef21d0c022e (patch) | |
| tree | 843fd22d9d1bde010ae77a585ad4ac8f966ef204 /lib | |
| parent | a951ca4467a9a4fbd5bfef91e3d5ca8f077ad9b2 (diff) | |
| download | gnulib-b83182a47812798b8980cecc078b8ef21d0c022e.tar.gz | |
* strftime.c (tzname): Don't declare if it is already #defined.
Problem reported for Mingw by Mark Junker.
Diffstat (limited to 'lib')
| -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 25b0cdf7c0..00f074a408 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-03 Paul Eggert <eggert@cs.ucla.edu> * xtime.h (xtime_make, xtime_nonnegative_nsec, xtime_nsec): Use diff --git a/lib/strftime.c b/lib/strftime.c index d740ae018d..13c8acc851 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 |