diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-06-24 20:21:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-06-24 20:21:20 +0300 |
| commit | 696056c280e0e4a03e12d8d53f692c015ff19217 (patch) | |
| tree | 251de12b5ca47d0d5f6de907cb070d54f8283250 /lib | |
| parent | bbf908bc692846db442374a5a91ec9e243390e3d (diff) | |
| download | emacs-696056c280e0e4a03e12d8d53f692c015ff19217.tar.gz | |
Improve port of struct timespec to MS-Windows.
lib/makefile.w32-in ($(BLD)/dtotimespec.$(O)):
($(BLD)/timespec-add.$(O)):
($(BLD)/timespec-sub.$(O)): Don't depend on
$(EMACS_ROOT)/nt/inc/sys/time.h.
lib/stat-time.h:
lib/timespec.h:
lib/utimens.h: Revert last change.
src/makefile.w32-in (TIMESPEC_H): Remove nt/inc/sys/time.h.
(SYSTIME_H): Add nt/inc/sys/time.h.
src/systime.h [WINDOWSNT]: Include sys/time.h.
src/s/ms-w32.h (struct timespec): Definition moved from
nt/inc/sys/time.h. Suggested by Paul Eggert <eggert@cs.ucla.edu>.
nt/inc/sys/time.h (struct timespec): Don't define it here, it is
now defined in src/s/ms-w32.h.
Fixes: debbugs:9000
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/makefile.w32-in | 3 | ||||
| -rw-r--r-- | lib/stat-time.h | 1 | ||||
| -rw-r--r-- | lib/timespec.h | 1 | ||||
| -rw-r--r-- | lib/utimens.h | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 35745f647b2..b7ce6dd3b01 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -77,7 +77,6 @@ $(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 @@ -126,7 +125,6 @@ $(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 @@ -135,7 +133,6 @@ $(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 diff --git a/lib/stat-time.h b/lib/stat-time.h index 03d49977945..30c2acdab63 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -22,7 +22,6 @@ #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 51b85d050da..388ddb83a76 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -20,7 +20,6 @@ # 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 dfcbae1909d..8c47cf93f88 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,5 +1,4 @@ #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]); |