diff options
| author | Eli Zaretskii | 2013-03-27 10:40:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-27 10:40:24 +0200 |
| commit | e0c3eb8913d82ab60279acda8113bfe4ace483cb (patch) | |
| tree | e9149cf5f8ea017666b4452858650b211cb96fc2 | |
| parent | 849e8b01604f1fba278e010a18754bc4812681c6 (diff) | |
| download | emacs-e0c3eb8913d82ab60279acda8113bfe4ace483cb.tar.gz emacs-e0c3eb8913d82ab60279acda8113bfe4ace483cb.zip | |
Avoid MinGW64 compiler warnings.
nt/inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
avoid MinGW64 compiler warnings in editfns.c.
| -rw-r--r-- | nt/ChangeLog | 3 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 6a9c35c13ae..398d04e52a0 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-03-27 Eli Zaretskii <eliz@gnu.org> | 1 | 2013-03-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to | ||
| 4 | avoid MinGW64 compiler warnings in editfns.c. | ||
| 5 | |||
| 3 | Fix rules for parallel builds. | 6 | Fix rules for parallel builds. |
| 4 | * makefile.w32-in (ALL): Depend on *.exe files, not on phony names | 7 | * makefile.w32-in (ALL): Depend on *.exe files, not on phony names |
| 5 | without the .exe suffix. | 8 | without the .exe suffix. |
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index a2111da6f3e..cd183c917c4 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h | |||
| @@ -161,6 +161,10 @@ extern char *getenv (); | |||
| 161 | /* Make sure 'struct timespec' and 'struct timezone' are defined. */ | 161 | /* Make sure 'struct timespec' and 'struct timezone' are defined. */ |
| 162 | #include <sys/types.h> | 162 | #include <sys/types.h> |
| 163 | #include <time.h> | 163 | #include <time.h> |
| 164 | /* This prototype avoids MinGW64 compiler warnings due to the fact | ||
| 165 | that time.h is included before localtime is redirected to | ||
| 166 | sys_localtime below. */ | ||
| 167 | extern struct tm * sys_localtime (const time_t *); | ||
| 164 | /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to | 168 | /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to |
| 165 | supply the 2nd arg correctly, so don't use _setjmp directly in that | 169 | supply the 2nd arg correctly, so don't use _setjmp directly in that |
| 166 | case. */ | 170 | case. */ |