diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-12-08 20:02:30 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-12-08 20:02:30 +0100 |
| commit | a06ae17da2c6eb3c0e53fb3c9de555da71796af0 (patch) | |
| tree | 37b4c248a2c2f51071f6534bf577e20d128fc41e /src | |
| parent | cb576b5cd0d5899b73ce92c2d7d58535c60bb1d2 (diff) | |
| download | emacs-a06ae17da2c6eb3c0e53fb3c9de555da71796af0.tar.gz | |
* nsterm.m (fd_handler:): FD_ZERO fds.
Fixes: debbugs:13103
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f3af852f9e9..9d9c1fdaff5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,13 @@ +2012-12-08 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103). + 2012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com> * w32fns.c (cache_system_info): Cast sysinfo_cache.dwPageSize to DWORD_PTR, for compatibility with 64-bit builds. - * w32.c (_PROCESS_MEMORY_COUNTERS_EX): + * w32.c (_PROCESS_MEMORY_COUNTERS_EX): (GetProcessWorkingSetSize_Proc, get_process_working_set_size) (system_process_attributes): Use SIZE_T rather than DWORD, for compatibility with 64-bit builds. diff --git a/src/nsterm.m b/src/nsterm.m index 9d52bd7f52b..783765fe0b6 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4566,7 +4566,7 @@ not_in_argv (NSString *arg) if (waiting) { SELECT_TYPE fds; - + FD_ZERO (&fds); FD_SET (selfds[0], &fds); result = select (selfds[0]+1, &fds, NULL, NULL, NULL); if (result > 0) |