From 9aecbeb30847520f92ba273ec149c9ea5f289c51 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 26 May 2014 19:55:28 +0300 Subject: [PATCH] Minor fixes for MS-Windows MinGW64 build. src/w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if undefined. lib-src/ntlib.h (lseek): Don't redirect to _lseek. --- lib-src/ChangeLog | 4 ++++ lib-src/ntlib.h | 1 - src/ChangeLog | 5 +++++ src/w32.c | 8 +++++--- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cedd9ab8965..d7c755e67f0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2014-05-26 Eli Zaretskii + + * ntlib.h (lseek): Don't redirect to _lseek. + 2014-05-26 Paul Eggert Fix rcs2log problems with CVS. diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index dbb0195a30b..40ef9fa982d 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -90,7 +90,6 @@ int mkostemp (char * template, int flags); #define locking _locking #define logb _logb #define _longjmp longjmp -#define lseek _lseek #define popen _popen #define pclose _pclose #define umask _umask diff --git a/src/ChangeLog b/src/ChangeLog index ff471ae90f9..247ec1c34b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-05-26 Eli Zaretskii + + * w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if + undefined. + 2014-05-26 Ken Brown * w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name, diff --git a/src/w32.c b/src/w32.c index 371cae9cb9b..4643fc7fbec 100644 --- a/src/w32.c +++ b/src/w32.c @@ -73,9 +73,11 @@ along with GNU Emacs. If not, see . */ #include /* MinGW64 (_W64) defines these in its _mingw.h. */ -#if defined(__GNUC__) && !defined(_W64) -#define _ANONYMOUS_UNION -#define _ANONYMOUS_STRUCT +#ifndef _ANONYMOUS_UNION +# define _ANONYMOUS_UNION +#endif +#ifndef _ANONYMOUS_STRUCT +# define _ANONYMOUS_STRUCT #endif #include /* Some versions of compiler define MEMORYSTATUSEX, some don't, so we -- 2.39.2