diff options
Diffstat (limited to 'hw/xfree86/common/xf86Events.c')
| -rw-r--r-- | hw/xfree86/common/xf86Events.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index daf53deda..bbb5855ad 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -53,10 +53,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include <X11/X.h> #include <X11/Xpoll.h> #include <X11/Xproto.h> @@ -320,7 +316,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) CloseDownClient(server); } break; -#if !defined(__SOL8__) && !defined(__UNIXOS2__) && !defined(sgi) && \ +#if !defined(__SOL8__) && !defined(sgi) && \ (!defined(sun) || defined(i386)) && defined(VT_ACTIVATE) case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { @@ -440,7 +436,7 @@ xf86CommonSpecialKey(int key, Bool down, int modifiers) void xf86Wakeup(pointer blockData, int err, pointer pReadmask) { -#if !defined(__UNIXOS2__) && !defined(__QNX__) +#if !defined(__QNX__) fd_set* LastSelectMask = (fd_set*)pReadmask; fd_set devicesWithInput; InputInfoPtr pInfo; @@ -467,7 +463,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) } } } -#else /* __UNIXOS2__ and __QNX__ */ +#else /* __QNX__ */ InputInfoPtr pInfo; @@ -487,7 +483,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) pInfo = pInfo->next; } -#endif /* __UNIXOS2__ and __QNX__ */ +#endif /* __QNX__ */ if (err >= 0) { /* we don't want the handlers called if select() */ IHPtr ih; /* returned with an error condition, do we? */ @@ -874,7 +870,6 @@ xf86VTSwitch() if (xf86Screens[i]->EnableDisableFBAccess) (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE); } -#if !defined(__UNIXOS2__) /* * Keep the order: Disable Device > LeaveVT @@ -886,7 +881,6 @@ xf86VTSwitch() DisableDevice(pInfo->dev); pInfo = pInfo->next; } -#endif /* !__UNIXOS2__ */ xf86EnterServerState(SETUP); for (i = 0; i < xf86NumScreens; i++) xf86Screens[i]->LeaveVT(i, 0); @@ -920,7 +914,6 @@ xf86VTSwitch() } SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); -#if !defined(__UNIXOS2__) pInfo = xf86InputDevs; while (pInfo) { if (pInfo->dev) { @@ -931,7 +924,6 @@ xf86VTSwitch() } /* XXX HACK */ xf86ReleaseKeys(inputInfo.keyboard); -#endif /* !__UNIXOS2__ */ for (ih = InputHandlers; ih; ih = ih->next) xf86EnableInputHandler(ih); @@ -986,7 +978,6 @@ xf86VTSwitch() /* Turn screen saver off when switching back */ SaveScreens(SCREEN_SAVER_FORCER,ScreenSaverReset); -#if !defined(__UNIXOS2__) pInfo = xf86InputDevs; while (pInfo) { if (pInfo->dev) { @@ -997,7 +988,6 @@ xf86VTSwitch() } /* XXX HACK */ xf86ReleaseKeys(inputInfo.keyboard); -#endif /* !__UNIXOS2__ */ for (ih = InputHandlers; ih; ih = ih->next) xf86EnableInputHandler(ih); |