procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #9960 with MSVC build on MS-Windows.

Browse source 
src/s/ms-w32.h (tzname): Include time.h before redirecting to
 _tzname.  Fixes the MSVC build.
This commit is contained in:
Eli Zaretskii 2012-03-24 15:43:21 +02:00
parent 6e7e90fa24
commit 8a0c01dd25
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-24 Eli Zaretskii <eliz@gnu.org>
* s/ms-w32.h (tzname): Include time.h before redirecting to
_tzname. Fixes the MSVC build. (Bug#9960)
2012-03-24 Andreas Schwab <schwab@linux-m68k.org>
* xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6

6
src/s/ms-w32.h
View file

@ -286,6 +286,12 @@ typedef int pid_t;
#define stricmp _stricmp
#define tzset _tzset
/* Include time.h before redirecting tzname, since MSVC's time.h
defines _tzname to call a function, but also declares tzname a
2-element array. Having the redirection before including the
header thus has the effect of declaring a function that returns an
array, and triggers an error message. */
#include <time.h>
#define tzname _tzname
#if !defined (_MSC_VER) || (_MSC_VER < 1400)
#undef utime