From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Nov 2011 16:30:13 +0000 (+0200)
Subject: Fix MSVC build in lib-src.
X-Git-Tag: emacs-pretest-24.0.92~218^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ad924ba1e1c949affba4c5832072e4c5c194202;p=emacs.git

Fix MSVC build in lib-src.

 src/s/ms-w32.h (fstat, stat, utime): Move redirections to
 "emacs"-only part.

Fixes: debbugs:99690
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d3e7d9ee21..07f622a2cc5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-05  Eli Zaretskii  <eliz@gnu.org>
 
+	* 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.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 519f6e7bc63..fb0882860d1 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -191,6 +191,11 @@ struct sigaction {
 #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 @@ typedef int pid_t;
 
 #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__