diff options
Diffstat (limited to 'xorg-server/hw/kdrive/src/kinput.c')
-rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 0e06fd42f..9778d1fee 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -105,21 +105,29 @@ KdSigio(int sig) static void KdBlockSigio(void) { +#ifdef _MSC_VER + __asm int 3; +#else sigset_t set; sigemptyset(&set); sigaddset(&set, SIGIO); sigprocmask(SIG_BLOCK, &set, 0); +#endif } static void KdUnblockSigio(void) { +#ifdef _MSC_VER + __asm int 3; +#else sigset_t set; sigemptyset(&set); sigaddset(&set, SIGIO); sigprocmask(SIG_UNBLOCK, &set, 0); +#endif } #ifdef DEBUG_SIGIO @@ -165,16 +173,23 @@ KdResetInputMachine(void) static void KdNonBlockFd(int fd) { +#ifdef _MSC_VER + __asm int 3; +#else int flags; flags = fcntl(fd, F_GETFL); flags |= FASYNC | NOBLOCK; fcntl(fd, F_SETFL, flags); +#endif } static void KdAddFd(int fd) { +#ifdef _MSC_VER + __asm int 3; +#else struct sigaction act; sigset_t set; @@ -191,11 +206,15 @@ KdAddFd(int fd) sigaction(SIGIO, &act, 0); sigemptyset(&set); sigprocmask(SIG_SETMASK, &set, 0); +#endif } static void KdRemoveFd(int fd) { +#ifdef _MSC_VER + __asm int 3; +#else struct sigaction act; int flags; @@ -210,6 +229,7 @@ KdRemoveFd(int fd) sigemptyset(&act.sa_mask); sigaction(SIGIO, &act, 0); } +#endif } Bool @@ -545,11 +565,13 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff) return BadImplementation; } +#ifndef _MSC_VER Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) { return TRUE; } +#endif static void KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something) @@ -568,6 +590,7 @@ KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something) KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration); } +#ifndef _MSC_VER void DDXRingBell(int volume, int pitch, int duration) { @@ -583,7 +606,7 @@ DDXRingBell(int volume, int pitch, int duration) } } } - +#endif void KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration) { @@ -2128,6 +2151,7 @@ miPointerScreenFuncRec kdPointerScreenFuncs = { KdWarpCursor }; +#ifndef _MSC_VER void ProcessInputEvents(void) { @@ -2136,6 +2160,7 @@ ProcessInputEvents(void) KdProcessSwitch(); KdCheckLock(); } +#endif /* At the moment, absolute/relative is up to the client. */ int |