libXt/libXt-1.1.2-git.patch
2012-03-15 17:30:24 -04:00

41 lines
1.2 KiB
Diff

From 75bef5b488245467b6638e25cd22006b306e8536 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue, 13 Mar 2012 01:36:52 +0000
Subject: Revert "Treat unexpected returned events from poll as errors"
This commit caused regressions:
https://bugs.freedesktop.org/show_bug.cgi?id=47203
https://bugs.freedesktop.org/show_bug.cgi?id=47216
This reverts commit 70bb9e28d37fff4ead4d0a2c672af77059765fa4.
---
diff --git a/src/NextEvent.c b/src/NextEvent.c
index c8c9dd5..b1f7bc7 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -356,21 +356,7 @@ static int IoWait (
return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
wt->wait_time_ptr);
#else
- int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
- /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
- * it as if it failed. */
- if(ret >= 0) {
- nfds_t i;
- for (i=0; i < wf->fdlistlen; i++) {
- struct pollfd *fd = &wf->fdlist[i];
- if (fd->revents & ~fd->events) {
- ret = -1;
- errno = EIO;
- break;
- }
- }
- }
- return ret;
+ return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
#endif
}
--
cgit v0.9.0.2-2-gbebe