diff options
| author | Keith Packard <keithp@keithp.com> | 2015-12-07 15:12:14 -0800 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:27:51 -0400 |
| commit | be5a513fee6cbf29ef7570e57eb0436d70fbd88c (patch) | |
| tree | 42865b825292f4472d5d8fc9dd9b5a334f262714 /os/WaitFor.c | |
| parent | 9d15912aa475b733bbb20efc367a67dacad63bf1 (diff) | |
Remove AddEnabledDevice and AddGeneralSocket APIs
All uses of these interfaces should instead be using the NotifyFd API
instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'os/WaitFor.c')
| -rw-r--r-- | os/WaitFor.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 24e1afc81..350f61522 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -153,7 +153,6 @@ WaitForSomething(int *pClientsReady) int curclient; int selecterr; static int nready; - fd_set devicesReadable; CARD32 now = 0; Bool someReady = FALSE; Bool someNotifyWriteReady = FALSE; @@ -309,14 +308,13 @@ WaitForSomething(int *pClientsReady) } } - XFD_ANDSET(&devicesReadable, &LastSelectMask, &EnabledDevices); XFD_ANDSET(&clientsReadable, &LastSelectMask, &AllClients); XFD_ANDSET(&tmp_set, &LastSelectMask, &NotifyReadFds); if (XFD_ANYSET(&tmp_set) || someNotifyWriteReady) HandleNotifyFds(); - if (XFD_ANYSET(&devicesReadable) || XFD_ANYSET(&clientsReadable)) + if (XFD_ANYSET(&clientsReadable)) break; /* check here for DDXes that queue events during Block/Wakeup */ if (*checkForInput[0] != *checkForInput[1]) |