From ea456eb4e4549655bb67660b00ec4a574ec82209 Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Fri, 20 Oct 2000 14:49:19 +0000 Subject: [PATCH] [!WINDOWSNT]: Don't apply Solaris 2.5 work-around on Windows. (my_strftime) : Don't use macro arg list when redefining as _strftime_copytm. (my_strftime) : Supply 0 as ut argument. --- src/ChangeLog | 8 ++++++++ src/strftime.c | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c8f3fdf0be6..c390352004b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2000-10-20 Andrew Innes + + * strftime.c [!WINDOWSNT]: Don't apply Solaris 2.5 work-around on + Windows. + (my_strftime) : Don't use macro arg list when redefining as + _strftime_copytm. + (my_strftime) : Supply 0 as ut argument. + 2000-10-19 Jason Rumney * w32console.c: Do not undef HAVE_WINDOW_SYSTEM before diff --git a/src/strftime.c b/src/strftime.c index ef7189e6dda..f6e88e92a72 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -441,7 +441,7 @@ static CHAR_T const month_name[][10] = # define ut 0 #endif -#if !defined _LIBC && HAVE_TZNAME && HAVE_TZSET +#if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. Work around this bug by copying *tp before it might be munged. */ size_t _strftime_copytm __P ((char *, size_t, const char *, @@ -459,8 +459,7 @@ static CHAR_T const month_name[][10] = return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument); } # undef my_strftime -# define my_strftime(S, Maxsize, Format, Tp) \ - _strftime_copytm (S, Maxsize, Format, Tp) +# define my_strftime _strftime_copytm #endif @@ -804,8 +803,8 @@ my_strftime (s, maxsize, format, tp ut_argument) subformat: { CHAR_T *old_start = p; - size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp); - add (len, my_strftime (p, maxsize - i, subfmt, tp)); + size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp, 0); + add (len, my_strftime (p, maxsize - i, subfmt, tp, 0)); if (to_uppcase) while (old_start < p) -- 2.39.5