[Emacs-diffs] emacs-24 r116992: Fix redefinition warning in MinGW64 build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116992
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-04-21 09:37:21 +0300
message:
  Fix redefinition warning in MinGW64 build.
  
   nt/inc/ms-w32.h (lseek): Define only if not already a macro.
   Suggested by Fabrice Popineau <address@hidden>.
modified:
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/inc/ms-w32.h                msw32.h-20091113204419-o5vbwnq5f7feedwu-807

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2014-04-09 21:16:37 +0000
+++ b/nt/ChangeLog      2014-04-21 06:37:21 +0000
@@ -1,3 +1,8 @@
+2014-04-21  Eli Zaretskii  <address@hidden>
+
+       * inc/ms-w32.h (lseek): Define only if not already a macro.
+       Suggested by Fabrice Popineau <address@hidden>.
+
 2014-04-09  Ken Brown  <address@hidden>
 
        * emacs.rc: Revert last change.

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2014-01-11 13:36:06 +0000
+++ b/nt/inc/ms-w32.h   2014-04-21 06:37:21 +0000
@@ -276,7 +276,10 @@
 #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