mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-17 10:06:13 +00:00
Code Issues Releases Activity

[!WINDOWSNT]: Don't apply Solaris 2.5 work-around on

Browse Source 
Windows.
(my_strftime) <macro>: Don't use macro arg list when redefining as
_strftime_copytm.
(my_strftime) <function>: Supply 0 as ut argument.
This commit is contained in:
Andrew Innes 2000-10-20 14:49:19 +00:00
parent e34850d19f
commit ea456eb4e4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2000-10-20 Andrew Innes <andrewi@gnu.org>
* strftime.c [!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.
2000-10-19 Jason Rumney <jasonr@altavista.net> 2000-10-19 Jason Rumney <jasonr@altavista.net>
* w32console.c: Do not undef HAVE_WINDOW_SYSTEM before * w32console.c: Do not undef HAVE_WINDOW_SYSTEM before

9
src/strftime.c
View File

@ -441,7 +441,7 @@ static CHAR_T const month_name[][10] =
# define ut 0 # define ut 0
#endif #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. /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
Work around this bug by copying *tp before it might be munged. */ Work around this bug by copying *tp before it might be munged. */
size_t _strftime_copytm __P ((char *, size_t, const char *, 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); return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
} }
# undef my_strftime # undef my_strftime
# define my_strftime(S, Maxsize, Format, Tp) \ # define my_strftime _strftime_copytm
_strftime_copytm (S, Maxsize, Format, Tp)
#endif #endif
@ -804,8 +803,8 @@ my_strftime (s, maxsize, format, tp ut_argument)
subformat: subformat:
{ {
CHAR_T *old_start = p; CHAR_T *old_start = p;
size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp); size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp, 0);
add (len, my_strftime (p, maxsize - i, subfmt, tp)); add (len, my_strftime (p, maxsize - i, subfmt, tp, 0));
if (to_uppcase) if (to_uppcase)
while (old_start < p) while (old_start < p)