From 3ad924ba1e1c949affba4c5832072e4c5c194202 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 5 Nov 2011 18:30:13 +0200 Subject: [PATCH] Fix MSVC build in lib-src. src/s/ms-w32.h (fstat, stat, utime): Move redirections to "emacs"-only part. Fixes: debbugs:99690 --- src/ChangeLog | 3 +++ src/s/ms-w32.h | 15 ++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 + * 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 #include #include + +/* 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__ -- 2.11.4.GIT