diff options
| author | Eli Zaretskii | 2014-05-26 19:55:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-05-26 19:55:28 +0300 |
| commit | 9aecbeb30847520f92ba273ec149c9ea5f289c51 (patch) | |
| tree | e054e92b1966bbd5e062fe5367b3df251229146a /lib-src | |
| parent | 86c72932a19129b1afa8f02f7ff1d412d7d10fc9 (diff) | |
| download | emacs-9aecbeb30847520f92ba273ec149c9ea5f289c51.tar.gz emacs-9aecbeb30847520f92ba273ec149c9ea5f289c51.zip | |
Minor fixes for MS-Windows MinGW64 build.
src/w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if undefined.
lib-src/ntlib.h (lseek): Don't redirect to _lseek.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/ntlib.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cedd9ab8965..d7c755e67f0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-26 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * ntlib.h (lseek): Don't redirect to _lseek. | ||
| 4 | |||
| 1 | 2014-05-26 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-05-26 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Fix rcs2log problems with CVS. | 7 | Fix rcs2log problems with CVS. |
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index dbb0195a30b..40ef9fa982d 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h | |||
| @@ -90,7 +90,6 @@ int mkostemp (char * template, int flags); | |||
| 90 | #define locking _locking | 90 | #define locking _locking |
| 91 | #define logb _logb | 91 | #define logb _logb |
| 92 | #define _longjmp longjmp | 92 | #define _longjmp longjmp |
| 93 | #define lseek _lseek | ||
| 94 | #define popen _popen | 93 | #define popen _popen |
| 95 | #define pclose _pclose | 94 | #define pclose _pclose |
| 96 | #define umask _umask | 95 | #define umask _umask |