diff options
| author | Joakim Verona | 2013-09-10 23:26:38 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-10 23:26:38 +0200 |
| commit | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (patch) | |
| tree | 58fde2f218fa45ee1b2c67184b50137a8fb6e140 /src/w32proc.c | |
| parent | ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (diff) | |
| parent | 43aac990c339c0fc3304aa476ebc8ea8467f107e (diff) | |
| download | emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.tar.gz emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.zip | |
merge from trunk
Conflicts:
src/dispnew.c
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index 84589388cd7..54316a6f80f 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -1916,7 +1916,7 @@ extern int proc_buffered_char[]; | |||
| 1916 | 1916 | ||
| 1917 | int | 1917 | int |
| 1918 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, | 1918 | sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
| 1919 | EMACS_TIME *timeout, void *ignored) | 1919 | struct timespec *timeout, void *ignored) |
| 1920 | { | 1920 | { |
| 1921 | SELECT_TYPE orfds; | 1921 | SELECT_TYPE orfds; |
| 1922 | DWORD timeout_ms, start_time; | 1922 | DWORD timeout_ms, start_time; |