diff options
| author | Paul Eggert <[email protected]> | 2014-04-22 14:32:51 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2014-04-22 14:32:51 -0700 |
| commit | 42e910349d699ee3f8024371ca1e60e015fc6aa7 (patch) | |
| tree | ba589f3f7c278671f0ae9c5c8f15c241ae8dd674 /nt | |
| parent | 4f96579371290b201a973072a1c2f237755bb954 (diff) | |
| parent | 34e856d5ac828753b7be20e2471f39fb613f7f40 (diff) | |
Merge from emacs-24; up to 2014-04-22T20:19:[email protected]
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 8a8dcb14ab..9e7773a742 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2014-04-22 Eli Zaretskii <[email protected]> + + * inc/ms-w32.h (lseek): Define only if not already a macro. + Suggested by Fabrice Popineau <[email protected]>. + 2014-04-11 Ken Brown <[email protected]> * emacs.rc: Revert last change. diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index dca3476b2b..8f7c36ab1e 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 |