aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-23 13:22:59 +0300
committerEli Zaretskii2012-06-23 13:22:59 +0300
commit388cdec072a52e1b647dec159433fd0ffe240be4 (patch)
treeefd6a04f97a631114fd093b4414a9242486e04a5 /nt
parentf199cab1a97da8c46b719bb73af58acdcb6243c1 (diff)
downloademacs-388cdec072a52e1b647dec159433fd0ffe240be4.tar.gz
emacs-388cdec072a52e1b647dec159433fd0ffe240be4.zip
Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu.
nt/inc/sys/time.h (struct timespec): Define. lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/dtotimespec.$(O), $(BLD)/gettime.$(O), $(BLD)/timespec-add.$(O), and $(BLD)/timespec-sub.$(O). ($(BLD)/dtotimespec.$(O)): ($(BLD)/gettime.$(O)): ($(BLD)/timespec-add.$(O)): ($(BLD)/timespec-sub.$(O)): New dependencies. lib/stat-time.h: lib/timespec.h: lib/utimens.h: Include sys/time.h src/w32.c (fdutimens): New function. src/w32proc.c (sys_select): Adapt to change in the EMACS_TIME type. src/s/ms-w32.h (pselect): Redirect to sys_select. src/sysselect.h [WINDOWSNT]: Don't include sys/select.h. Fixes: debbugs:9000
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/sys/time.h23
2 files changed, 20 insertions, 8 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index cc5fda97755..11109da92f2 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12012-06-23 Eli Zaretskii <eliz@gnu.org>
2
3 Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu.
4 * inc/sys/time.h (struct timespec): Define.
5
12012-06-16 Eli Zaretskii <eliz@gnu.org> 62012-06-16 Eli Zaretskii <eliz@gnu.org>
2 7
3 * makefile.w32-in (install-addpm): New target. 8 * makefile.w32-in (install-addpm): New target.
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index c90d1fd62f5..583b966b760 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -6,15 +6,22 @@
6 */ 6 */
7 7
8struct timeval 8struct timeval
9 { 9{
10 long tv_sec; /* seconds */ 10 long tv_sec; /* seconds */
11 long tv_usec; /* microseconds */ 11 long tv_usec; /* microseconds */
12 }; 12};
13
13struct timezone 14struct timezone
14 { 15{
15 int tz_minuteswest; /* minutes west of Greenwich */ 16 int tz_minuteswest; /* minutes west of Greenwich */
16 int tz_dsttime; /* type of dst correction */ 17 int tz_dsttime; /* type of dst correction */
17 }; 18};
19
20struct timespec
21{
22 time_t tv_sec; /* seconds */
23 long int tv_nsec; /* nanoseconds */
24};
18 25
19void gettimeofday (struct timeval *, struct timezone *); 26void gettimeofday (struct timeval *, struct timezone *);
20 27