diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
| commit | ad7d3734fae59b63a1afe2d8e11411ac32a40f30 (patch) | |
| tree | 80af4bcc936f46b31ba17a71905f20deeca066f5 /xorg-server/hw/xfree86/common/xf86Events.c | |
| parent | c4583f59d8460f05ee211c2f8ed6208addfe3087 (diff) | |
| parent | 8add148a4cf71b8bdab05a6b7e14824b5062da5e (diff) | |
| download | vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.gz vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.bz2 vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 13 Feb 2013
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Events.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c index 377e936f7..d92174edf 100644 --- a/xorg-server/hw/xfree86/common/xf86Events.c +++ b/xorg-server/hw/xfree86/common/xf86Events.c @@ -272,9 +272,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) } if (err >= 0) { /* we don't want the handlers called if select() */ - IHPtr ih; /* returned with an error condition, do we? */ + IHPtr ih, ih_tmp; /* returned with an error condition, do we? */ - for (ih = InputHandlers; ih; ih = ih->next) { + nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) { if (ih->enabled && ih->fd >= 0 && ih->ihproc && (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) { ih->ihproc(ih->fd, ih->data); |