diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
| commit | 8190ef87547b704848231bde10b1cdffc6442790 (patch) | |
| tree | 29cb6d5bdefcee879d103953a140373635726f17 /os | |
| parent | 179a082c26f9e562492ee2e59e7f44f949f39f9c (diff) | |
| parent | 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
Diffstat (limited to 'os')
| -rw-r--r-- | os/WaitFor.c | 6 | ||||
| -rw-r--r-- | os/connection.c | 3 | ||||
| -rw-r--r-- | os/utils.c | 12 |
3 files changed, 1 insertions, 20 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 36e01ca38..da12976ca 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -332,13 +332,9 @@ WaitForSomething(int *pClientsReady) if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) break; -#ifdef WIN32 - /* Windows keyboard and mouse events are added to the input queue - in Block- and WakupHandlers. There is no device to check if - data is ready. So check here if new input is available */ + /* check here for DDXes that queue events during Block/Wakeup */ if (*checkForInput[0] != *checkForInput[1]) return 0; -#endif } } diff --git a/os/connection.c b/os/connection.c index 1ae50fef0..396593698 100644 --- a/os/connection.c +++ b/os/connection.c @@ -139,9 +139,6 @@ SOFTWARE. #include <X11/Xpoll.h> #include "opaque.h" #include "dixstruct.h" -#ifdef XAPPGROUP -#include "appgroup.h" -#endif #include "xace.h" #ifdef X_NOT_POSIX diff --git a/os/utils.c b/os/utils.c index d2b567484..d1bc1a18a 100644 --- a/os/utils.c +++ b/os/utils.c @@ -149,9 +149,6 @@ _X_EXPORT Bool noDbeExtension = FALSE; #ifdef DPMSExtension _X_EXPORT Bool noDPMSExtension = FALSE; #endif -#ifdef EVI -_X_EXPORT Bool noEVIExtension = FALSE; -#endif #ifdef FONTCACHE _X_EXPORT Bool noFontCacheExtension = FALSE; #endif @@ -165,9 +162,6 @@ _X_EXPORT Bool noScreenSaverExtension = FALSE; #ifdef MITSHM _X_EXPORT Bool noMITShmExtension = FALSE; #endif -#ifdef MITMISC -_X_EXPORT Bool noMITMiscExtension = FALSE; -#endif #ifdef MULTIBUFFER _X_EXPORT Bool noMultibufferExtension = FALSE; #endif @@ -186,15 +180,9 @@ _X_EXPORT Bool noSecurityExtension = FALSE; #ifdef XSYNC _X_EXPORT Bool noSyncExtension = FALSE; #endif -#ifdef TOGCUP -_X_EXPORT Bool noXcupExtension = FALSE; -#endif #ifdef RES _X_EXPORT Bool noResExtension = FALSE; #endif -#ifdef XAPPGROUP -_X_EXPORT Bool noXagExtension = FALSE; -#endif #ifdef XCMISC _X_EXPORT Bool noXCMiscExtension = FALSE; #endif |