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

@@ -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.

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

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,

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