[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108325: * src/xgselect.c (xg_select)
From: |
Ken Brown |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108325: * src/xgselect.c (xg_select): Fix first argument in call to 'select' (bug#11508). |
Date: |
Mon, 21 May 2012 09:35:40 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108325
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 09:35:40 -0400
message:
* src/xgselect.c (xg_select): Fix first argument in call to 'select'
(bug#11508).
modified:
src/ChangeLog
src/xgselect.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-05-20 12:19:13 +0000
+++ b/src/ChangeLog 2012-05-21 13:35:40 +0000
@@ -1,3 +1,8 @@
+2012-05-21 Ken Brown <address@hidden>
+
+ * xgselect.c (xg_select): Fix first argument in call to 'select'
+ (bug#11508).
+
2012-05-20 Ken Brown <address@hidden>
* gmalloc.c (_free_internal_nolock, _realloc_internal_nolock)
=== modified file 'src/xgselect.c'
--- a/src/xgselect.c 2012-05-19 21:46:43 +0000
+++ b/src/xgselect.c 2012-05-21 13:35:40 +0000
@@ -33,7 +33,7 @@
static ptrdiff_t gfds_size;
int
-xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE
*efds,
+xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE
*efds,
EMACS_TIME *timeout)
{
SELECT_TYPE all_rfds, all_wfds;
@@ -41,11 +41,11 @@
GMainContext *context;
int have_wfds = wfds != NULL;
- int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
- int i, nfds, fds_lim, tmo_in_millisec;
+ int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0, max_fds = fds_lim - 1;
+ int i, nfds, tmo_in_millisec;
if (!x_in_use)
- return select (max_fds, rfds, wfds, efds, timeout);
+ return select (fds_lim, rfds, wfds, efds, timeout);
if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
else FD_ZERO (&all_rfds);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108325: * src/xgselect.c (xg_select): Fix first argument in call to 'select' (bug#11508).,
Ken Brown <=