diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
| commit | 1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8 (patch) | |
| tree | 5ff2d27dc0c94b02beedeb4551f677691e606352 /xorg-server/hw/kdrive/ephyr/ephyrinit.c | |
| parent | d5ac51b006c039894e4e35102a8e182d21a52efc (diff) | |
| parent | 91a30d5622174febaa2107b010effcf2fb5b9a2e (diff) | |
| download | vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.gz vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.bz2 vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrinit.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrinit.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c index 0c638e98d..d0a4d8540 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c @@ -40,17 +40,18 @@ extern Bool noGlxVisualInit; #endif
extern Bool ephyrNoXV;
+#ifdef KDRIVE_EVDEV
+extern KdPointerDriver LinuxEvdevMouseDriver;
+extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
+#endif
+
void processScreenArg (char *screen_size, char *parent_id) ;
void
InitCard (char *name)
{
- KdCardAttr attr;
-
EPHYR_DBG("mark");
-
-
- KdCardInfoAdd (&ephyrFuncs, &attr, 0);
+ KdCardInfoAdd (&ephyrFuncs, 0);
}
#ifndef _MSC_VER
@@ -67,11 +68,11 @@ InitInput (int argc, char **argv) KdPointerInfo *pi;
KdAddKeyboardDriver(&EphyrKeyboardDriver);
-#ifdef linux
+#ifdef KDRIVE_EVDEV
KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
#endif
KdAddPointerDriver(&EphyrMouseDriver);
-#ifdef linux
+#ifdef KDRIVE_EVDEV
KdAddPointerDriver(&LinuxEvdevMouseDriver);
#endif
|