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

4 files changed, 42 insertions, 0 deletions

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 62808f73a74..35745f647b2 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -24,10 +24,14 @@ LOCAL_FLAGS	= -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src
 LIBS            =
 
 GNULIBOBJS = $(BLD)/dtoastr.$(O) \
+             $(BLD)/dtotimespec.$(O)  \
              $(BLD)/getopt.$(O)  \
              $(BLD)/getopt1.$(O) \
+             $(BLD)/gettime.$(O) \
              $(BLD)/strftime.$(O) \
              $(BLD)/time_r.$(O) \
+             $(BLD)/timespec-add.$(O) \
+             $(BLD)/timespec-sub.$(O) \
              $(BLD)/md5.$(O) \
              $(BLD)/sha1.$(O) \
              $(BLD)/sha256.$(O) \
@@ -69,6 +73,15 @@ $(BLD)/dtoastr.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/config.h
 
+$(BLD)/dtotimespec.$(O) : \
+        $(SRC)/dtotimespec.c \
+        $(SRC)/intprops.h \
+        $(SRC)/timespec.h \
+        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
 $(BLD)/getopt.$(O) : \
         $(SRC)/getopt.c \
         $(SRC)/getopt.h \
@@ -87,6 +100,14 @@ $(BLD)/getopt1.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/config.h
 
+$(BLD)/gettime.$(O) : \
+        $(SRC)/gettime.c \
+        $(SRC)/timespec.h \
+        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
 $(BLD)/strftime.$(O) : \
         $(SRC)/strftime.c \
         $(SRC)/strftime.h \
@@ -101,6 +122,24 @@ $(BLD)/time_r.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/config.h
 
+$(BLD)/timespec-add.$(O) : \
+        $(SRC)/timespec-add.c \
+        $(SRC)/intprops.h \
+        $(SRC)/timespec.h \
+        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
+$(BLD)/timespec-sub.$(O) : \
+        $(SRC)/timespec-sub.c \
+        $(SRC)/intprops.h \
+        $(SRC)/timespec.h \
+        $(EMACS_ROOT)/nt/inc/sys/time.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/config.h
+
 $(BLD)/md5.$(O) : \
         $(SRC)/md5.c \
         $(SRC)/md5.h \
diff --git a/lib/stat-time.h b/lib/stat-time.h
index 30c2acdab63..03d49977945 100644
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -22,6 +22,7 @@
 
 #include <sys/stat.h>
 #include <time.h>
+#include <sys/time.h>
 
 /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type
    struct timespec, if available.  If not, then STAT_TIMESPEC_NS (ST,
diff --git a/lib/timespec.h b/lib/timespec.h
index 388ddb83a76..51b85d050da 100644
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -20,6 +20,7 @@
 # define TIMESPEC_H
 
 # include <time.h>
+# include <sys/time.h>
 
 /* Return negative, zero, positive if A < B, A == B, A > B, respectively.
 
diff --git a/lib/utimens.h b/lib/utimens.h
index 8c47cf93f88..dfcbae1909d 100644
--- a/lib/utimens.h
+++ b/lib/utimens.h
@@ -1,4 +1,5 @@
 #include <time.h>
+#include <sys/time.h>
 int fdutimens (int, char const *, struct timespec const [2]);
 int utimens (char const *, struct timespec const [2]);
 int lutimens (char const *, struct timespec const [2]);