Mercurial > emacs
changeset 32687:52117f9867f2
[!WINDOWSNT]: Don't apply Solaris 2.5 work-around on
Windows.
(my_strftime) <macro>: Don't use macro arg list when redefining as
_strftime_copytm.
(my_strftime) <function>: Supply 0 as ut argument.
| author | Andrew Innes <andrewi@gnu.org> |
|---|---|
| date | Fri, 20 Oct 2000 14:48:58 +0000 |
| parents | 1fd66092f06a |
| children | 40878cdc6a2a |
| files | src/strftime.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/strftime.c Fri Oct 20 12:23:37 2000 +0000 +++ b/src/strftime.c Fri Oct 20 14:48:58 2000 +0000 @@ -441,7 +441,7 @@ # 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 @@ 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 @@ 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)