diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-04-21 09:37:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-04-21 09:37:21 +0300 |
| commit | e3188b2df1b2acfef33c32ca2c25248541bfcbc0 (patch) | |
| tree | d94608647d08f73b96bc19c349b29c6ba558c9db /nt | |
| parent | 4fa20d8f8d01369a5f783cb2203c908b6bad778b (diff) | |
| download | emacs-e3188b2df1b2acfef33c32ca2c25248541bfcbc0.tar.gz | |
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>.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 3 |
2 files changed, 8 insertions, 0 deletions
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 |