diff options
| author | Ken Brown | 2012-05-21 09:35:40 -0400 |
|---|---|---|
| committer | Ken Brown | 2012-05-21 09:35:40 -0400 |
| commit | ff23cd9f452b6d2b5001a67d7b14e0af7f61b194 (patch) | |
| tree | 98e6c1bddef3b36ea89e9e27ed238778295c0086 /src | |
| parent | e1939eb1e4576b653c42c92497f795bea7c12084 (diff) | |
| download | emacs-ff23cd9f452b6d2b5001a67d7b14e0af7f61b194.tar.gz emacs-ff23cd9f452b6d2b5001a67d7b14e0af7f61b194.zip | |
* src/xgselect.c (xg_select): Fix first argument in call to 'select' (bug#11508).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xgselect.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ea898893073..b9e91d308cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-05-21 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * xgselect.c (xg_select): Fix first argument in call to 'select' | ||
| 4 | (bug#11508). | ||
| 5 | |||
| 1 | 2012-05-20 Ken Brown <kbrown@cornell.edu> | 6 | 2012-05-20 Ken Brown <kbrown@cornell.edu> |
| 2 | 7 | ||
| 3 | * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) | 8 | * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) |
diff --git a/src/xgselect.c b/src/xgselect.c index 69ad93b3127..9d6a3ba774a 100644 --- a/src/xgselect.c +++ b/src/xgselect.c | |||
| @@ -33,7 +33,7 @@ static GPollFD *gfds; | |||
| 33 | static ptrdiff_t gfds_size; | 33 | static ptrdiff_t gfds_size; |
| 34 | 34 | ||
| 35 | int | 35 | int |
| 36 | xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, | 36 | xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
| 37 | EMACS_TIME *timeout) | 37 | EMACS_TIME *timeout) |
| 38 | { | 38 | { |
| 39 | SELECT_TYPE all_rfds, all_wfds; | 39 | SELECT_TYPE all_rfds, all_wfds; |
| @@ -41,11 +41,11 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, | |||
| 41 | 41 | ||
| 42 | GMainContext *context; | 42 | GMainContext *context; |
| 43 | int have_wfds = wfds != NULL; | 43 | int have_wfds = wfds != NULL; |
| 44 | int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0; | 44 | int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0, max_fds = fds_lim - 1; |
| 45 | int i, nfds, fds_lim, tmo_in_millisec; | 45 | int i, nfds, tmo_in_millisec; |
| 46 | 46 | ||
| 47 | if (!x_in_use) | 47 | if (!x_in_use) |
| 48 | return select (max_fds, rfds, wfds, efds, timeout); | 48 | return select (fds_lim, rfds, wfds, efds, timeout); |
| 49 | 49 | ||
| 50 | if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds)); | 50 | if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds)); |
| 51 | else FD_ZERO (&all_rfds); | 51 | else FD_ZERO (&all_rfds); |