Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

2 files changed, 8 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8a8dcb14abd..9e7773a7421 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  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-11  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 dca3476b2b6..8f7c36ab1ee 100644
--- 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