aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-10-14 19:23:10 +0300
committerEli Zaretskii2013-10-14 19:23:10 +0300
commit279066b2b3a56e94c4a5dc994e0349db03a52c09 (patch)
tree5057e475e5ed6286073049dedc01f5da854c9281 /src
parentccd4a7833f341e2c22d6933357282954af6a57b2 (diff)
downloademacs-279066b2b3a56e94c4a5dc994e0349db03a52c09.tar.gz
emacs-279066b2b3a56e94c4a5dc994e0349db03a52c09.zip
Attempt to fix time_t related problems with MinGW 4.0 runtime.
nt/inc/mingw_time.h: New file. nt/inc/ms-w32.h: Include mingw_time.h instead of doing its job. src/w32proc.c: Include mingw_time.h. src/w32.c: Include mingw_time.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32.c2
-rw-r--r--src/w32proc.c1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 018489bdbc2..0349cc8b9b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12013-10-14 Eli Zaretskii <eliz@gnu.org> 12013-10-14 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32proc.c: Include mingw_time.h.
4
5 * w32.c: Include mingw_time.h.
6
3 Implement scrolling of TTY menus when the screen is too short. 7 Implement scrolling of TTY menus when the screen is too short.
4 8
5 * term.c (tty_menu_display): Accept an additional argument, the 9 * term.c (tty_menu_display): Accept an additional argument, the
diff --git a/src/w32.c b/src/w32.c
index 1dcf46b5f4b..c6b8dfed9dc 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -19,6 +19,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19/* 19/*
20 Geoff Voelker (voelker@cs.washington.edu) 7-29-94 20 Geoff Voelker (voelker@cs.washington.edu) 7-29-94
21*/ 21*/
22
23#include <mingw_time.h>
22#include <stddef.h> /* for offsetof */ 24#include <stddef.h> /* for offsetof */
23#include <stdlib.h> 25#include <stdlib.h>
24#include <stdio.h> 26#include <stdio.h>
diff --git a/src/w32proc.c b/src/w32proc.c
index 221b42fb7b2..ea16f26a0ee 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -21,6 +21,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21 Adapted from alarm.c by Tim Fleehart 21 Adapted from alarm.c by Tim Fleehart
22*/ 22*/
23 23
24#include <mingw_time.h>
24#include <stdio.h> 25#include <stdio.h>
25#include <stdlib.h> 26#include <stdlib.h>
26#include <errno.h> 27#include <errno.h>