aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2012-12-08 20:02:30 +0100
committerJan Djärv2012-12-08 20:02:30 +0100
commita06ae17da2c6eb3c0e53fb3c9de555da71796af0 (patch)
tree37b4c248a2c2f51071f6534bf577e20d128fc41e /src
parentcb576b5cd0d5899b73ce92c2d7d58535c60bb1d2 (diff)
downloademacs-a06ae17da2c6eb3c0e53fb3c9de555da71796af0.tar.gz
emacs-a06ae17da2c6eb3c0e53fb3c9de555da71796af0.zip
* nsterm.m (fd_handler:): FD_ZERO fds.
Fixes: debbugs:13103
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/nsterm.m2
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 @@
12012-12-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103).
4
12012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com> 52012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com>
2 6
3 * w32fns.c (cache_system_info): Cast sysinfo_cache.dwPageSize to 7 * w32fns.c (cache_system_info): Cast sysinfo_cache.dwPageSize to
4 DWORD_PTR, for compatibility with 64-bit builds. 8 DWORD_PTR, for compatibility with 64-bit builds.
5 9
6 * w32.c (_PROCESS_MEMORY_COUNTERS_EX): 10 * w32.c (_PROCESS_MEMORY_COUNTERS_EX):
7 (GetProcessWorkingSetSize_Proc, get_process_working_set_size) 11 (GetProcessWorkingSetSize_Proc, get_process_working_set_size)
8 (system_process_attributes): Use SIZE_T rather than DWORD, for 12 (system_process_attributes): Use SIZE_T rather than DWORD, for
9 compatibility with 64-bit builds. 13 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)
4566 if (waiting) 4566 if (waiting)
4567 { 4567 {
4568 SELECT_TYPE fds; 4568 SELECT_TYPE fds;
4569 4569 FD_ZERO (&fds);
4570 FD_SET (selfds[0], &fds); 4570 FD_SET (selfds[0], &fds);
4571 result = select (selfds[0]+1, &fds, NULL, NULL, NULL); 4571 result = select (selfds[0]+1, &fds, NULL, NULL, NULL);
4572 if (result > 0) 4572 if (result > 0)