4 files changed, 45 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 382968420..d56ba8fc5 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -221,6 +221,7 @@ KdProcessSwitch(void)
         KdEnableScreens();
 }
 
+#ifndef _MSC_VER
 void
 AbortDDX(enum ExitCode error)
 {
@@ -242,6 +243,7 @@ ddxGiveUp(enum ExitCode error)
 {
     AbortDDX(error);
 }
+#endif
 
 Bool kdDumbDriver;
 Bool kdSoftCursor;
@@ -1105,6 +1107,7 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
     OsRegisterSigWrapper(KdSignalWrapper);
 }
 
+#ifndef _MSC_VER
 void
 OsVendorFatalError(const char *f, va_list args)
 {
@@ -1121,3 +1124,4 @@ DPMSSupported(void)
 {
     return FALSE;
 }
+#endif
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 296d611ed..f52072003 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -52,7 +52,7 @@
 #define KD_DPMS_POWERDOWN   3
 #define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
 
-#define Status int
+typedef int Status;
 
 typedef struct _KdCardInfo {
     struct _KdCardFuncs *cfuncs;
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index a9a9fa583..d5171a7f7 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -102,6 +102,14 @@ KdSigio(int sig)
         (*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
 }
 
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
 #ifdef DEBUG_SIGIO
 
 void
@@ -145,16 +153,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;
 
@@ -171,11 +186,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;
 
@@ -190,6 +209,7 @@ KdRemoveFd(int fd)
         sigemptyset(&act.sa_mask);
         sigaction(SIGIO, &act, 0);
     }
+#endif
 }
 
 Bool
@@ -526,11 +546,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)
@@ -549,6 +571,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)
 {
@@ -564,7 +587,7 @@ DDXRingBell(int volume, int pitch, int duration)
         }
     }
 }
-
+#endif
 void
 KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration)
 {
@@ -2096,6 +2119,7 @@ miPointerScreenFuncRec kdPointerScreenFuncs = {
     KdWarpCursor
 };
 
+#ifndef _MSC_VER
 void
 ProcessInputEvents(void)
 {
@@ -2104,6 +2128,7 @@ ProcessInputEvents(void)
         KdProcessSwitch();
     KdCheckLock();
 }
+#endif
 
 /* At the moment, absolute/relative is up to the client. */
 int
diff --git a/xorg-server/hw/kdrive/src/makefile b/xorg-server/hw/kdrive/src/makefile
new file mode 100644
index 000000000..e3a826faa
--- /dev/null
+++ b/xorg-server/hw/kdrive/src/makefile
@@ -0,0 +1,14 @@
+LIBRARY = libkdrive
+
+CSRCS =	\
+	kcmap.c		\
+	kcurscol.c	\
+	kdrive.c	\
+	kinfo.c		\
+	kinput.c	\
+	kmap.c		\
+	kmode.c		\
+	kshadow.c
+
+
+