diff options
| author | Eli Zaretskii | 2012-06-23 13:22:59 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-06-23 13:22:59 +0300 |
| commit | 388cdec072a52e1b647dec159433fd0ffe240be4 (patch) | |
| tree | efd6a04f97a631114fd093b4414a9242486e04a5 /src/sysselect.h | |
| parent | f199cab1a97da8c46b719bb73af58acdcb6243c1 (diff) | |
| download | emacs-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 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index e1e5839cfe4..328372d427c 100644 --- a/src/sysselect.h +++ b/src/sysselect.h | |||
| @@ -19,7 +19,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 19 | #if defined (DARWIN_OS) | 19 | #if defined (DARWIN_OS) |
| 20 | #undef init_process | 20 | #undef init_process |
| 21 | #endif | 21 | #endif |
| 22 | #ifndef WINDOWSNT | ||
| 22 | #include <sys/select.h> | 23 | #include <sys/select.h> |
| 24 | #endif | ||
| 23 | #if defined (DARWIN_OS) | 25 | #if defined (DARWIN_OS) |
| 24 | #define init_process emacs_init_process | 26 | #define init_process emacs_init_process |
| 25 | #endif | 27 | #endif |