[Emacs-diffs] /srv/bzr/emacs/trunk r106298: Fix MSVC build in lib-src.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106298
fixes bug(s): http://debbugs.gnu.org/99690
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-05 18:30:13 +0200
message:
  Fix MSVC build in lib-src.
  
   src/s/ms-w32.h (fstat, stat, utime): Move redirections to
   "emacs"-only part.
modified:
  src/ChangeLog
  src/s/ms-w32.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-05 16:25:16 +0000
+++ b/src/ChangeLog     2011-11-05 16:30:13 +0000
@@ -1,5 +1,8 @@
 2011-11-05  Eli Zaretskii  <address@hidden>
 
+       * s/ms-w32.h (fstat, stat, utime): Move redirections to
+       "emacs"-only part.
+
        * w32fns.c (x_create_tip_frame, Fx_create_frame): Rearrange
        initialization code to keep similarity to xfns.c after changes
        from 2011-11-05.

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2011-11-05 11:34:56 +0000
+++ b/src/s/ms-w32.h    2011-11-05 16:30:13 +0000
@@ -191,6 +191,11 @@
 #include <sys/timeb.h>
 #include <sys/stat.h>
 #include <signal.h>
+
+/* MSVC gets link-time errors without these redirections.  */
+#define fstat(a, b) sys_fstat(a, b)
+#define stat(a, b)  sys_stat(a, b)
+#define utime       sys_utime
 #endif
 
 /* Calls that are emulated or shadowed.  */
@@ -279,18 +284,10 @@
 
 #if !defined (_MSC_VER) || (_MSC_VER < 1400)
 #define tzname    _tzname
+#undef  utime
 #define utime    _utime
 #endif
 
-#ifdef _MSC_VER
-/* MSVC gets link-time errors without these redirections.  */
-#define fstat(a, b) sys_fstat(a, b)
-#define stat(a, b)  sys_stat(a, b)
-#if _MSC_VER >= 1400
-#define utime       sys_utime
-#endif
-#endif
-
 /* This is hacky, but is necessary to avoid warnings about macro
    redefinitions using the SDK compilers.  */
 #ifndef __STDC__