Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6505:88297b0a69c6
* strftime.c (tzname): Don't declare if it is already #defined.
Problem reported for Mingw by Mark Junker.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 04 Jan 2006 18:55:42 +0000 |
| parents | 6038e8590f76 |
| children | a199553cf8b5 |
| files | lib/ChangeLog lib/strftime.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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