[Emacs-diffs] /srv/bzr/emacs/trunk r107670: Fix bug #9960 with MSVC build on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107670
fixes bug(s): http://debbugs.gnu.org/9960
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-03-24 15:43:21 +0200
message:
  Fix bug #9960 with MSVC build on MS-Windows.
  
   src/s/ms-w32.h (tzname): Include time.h before redirecting to
   _tzname.  Fixes the MSVC build.
modified:
  src/ChangeLog
  src/s/ms-w32.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-24 09:29:00 +0000
+++ b/src/ChangeLog     2012-03-24 13:43:21 +0000
@@ -1,3 +1,8 @@
+2012-03-24  Eli Zaretskii  <address@hidden>
+
+       * s/ms-w32.h (tzname): Include time.h before redirecting to
+       _tzname.  Fixes the MSVC build.  (Bug#9960)
+
 2012-03-24  Andreas Schwab  <address@hidden>
 
        * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2012-01-19 07:21:25 +0000
+++ b/src/s/ms-w32.h    2012-03-24 13:43:21 +0000
@@ -286,6 +286,12 @@
 #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