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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index cedd9ab89659ab8971c7ac5540e434dfbb1e22a1..d7c755e67f066a658b3f539017c30f7b55478c4c 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * ntlib.h (lseek): Don't redirect to _lseek.
+
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix rcs2log problems with CVS.

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index dbb0195a30b137eeb48464fd0d1c13bc17480626..40ef9fa982d4d054f27533f7ed80eb0184864530 100644 (file)
--- 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 ff471ae90f94dccc69edd1abbee9ce3a25d94d69..247ec1c34b4fb5aa97d39ff35500b33ed7106a00 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if
+       undefined.
+
 2014-05-26  Ken Brown  <kbrown@cornell.edu>
 
        * w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,

diff --git a/src/w32.c b/src/w32.c
index 371cae9cb9bd9f132be095cbe46137bfcea8297a..4643fc7fbec042731e763f26fa4fd475ba8d1226 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -73,9 +73,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <grp.h>
 
 /* 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 <windows.h>
 /* Some versions of compiler define MEMORYSTATUSEX, some don't, so we