From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 21 Apr 2014 06:37:21 +0000 (+0300)
Subject: Fix redefinition warning in MinGW64 build.
X-Git-Tag: emacs-24.3.91~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3188b2df1b2acfef33c32ca2c25248541bfcbc0;p=emacs.git

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 38e5512043d..97d42701c3c 100644
--- 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 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