Fix redefinition warning in MinGW64 build.

 nt/inc/ms-w32.h (lseek): Define only if not already a macro.
 Suggested by Fabrice Popineau <fabrice.popineau@gmail.com>.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 38e5512043d7d59183e238be0959c6131199bfc4..97d42701c3c71ca9dca13ba6dadbe217a89c5c71 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * inc/ms-w32.h (lseek): Define only if not already a macro.
+       Suggested by Fabrice Popineau <fabrice.popineau@gmail.com>.
+
 2014-04-09  Ken Brown  <kbrown@cornell.edu>
 
        * emacs.rc: Revert last change.

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index dca3476b2b626686036dae533bc663ac0681f3b0..8f7c36ab1eef70daeae05cfae00bf8cc59bb152d 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -276,7 +276,10 @@ typedef int pid_t;
 #endif
 #define isatty    _isatty
 #define _longjmp  longjmp
+/* MinGW64 defines lseek to invoke lseek64.  */
+#ifndef lseek
 #define lseek     _lseek
+#endif
 #define popen     _popen
 #define pclose    _pclose
 #define strdup    _strdup