[Emacs-diffs] trunk r117160: Minor fixes for MS-Windows MinGW64 build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117160
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2014-05-26 19:55:28 +0300
message:
  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.
modified:
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/ntlib.h                ntlib.h-20091113204419-o5vbwnq5f7feedwu-971
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32.c                      w32.c-20091113204419-o5vbwnq5f7feedwu-808

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-05-26 02:28:09 +0000
+++ b/lib-src/ChangeLog 2014-05-26 16:55:28 +0000
@@ -1,3 +1,7 @@
+2014-05-26  Eli Zaretskii  <address@hidden>
+
+       * ntlib.h (lseek): Don't redirect to _lseek.
+
 2014-05-26  Paul Eggert  <address@hidden>
 
        Fix rcs2log problems with CVS.

=== modified file 'lib-src/ntlib.h'
--- a/lib-src/ntlib.h   2014-01-01 07:43:34 +0000
+++ b/lib-src/ntlib.h   2014-05-26 16:55:28 +0000
@@ -90,7 +90,6 @@
 #define locking   _locking
 #define logb      _logb
 #define _longjmp  longjmp
-#define lseek     _lseek
 #define popen     _popen
 #define pclose    _pclose
 #define umask    _umask

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-26 12:31:46 +0000
+++ b/src/ChangeLog     2014-05-26 16:55:28 +0000
@@ -1,3 +1,8 @@
+2014-05-26  Eli Zaretskii  <address@hidden>
+
+       * w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if
+       undefined.
+
 2014-05-26  Ken Brown  <address@hidden>
 
        * w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,

=== modified file 'src/w32.c'
--- a/src/w32.c 2014-04-12 19:24:17 +0000
+++ b/src/w32.c 2014-05-26 16:55:28 +0000
@@ -73,9 +73,11 @@
 #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