xserver: Branch 'master' - 2 commits
Jeremy C. Reed
reed at kemper.freedesktop.org
Tue Nov 14 04:36:32 EET 2006
hw/xfree86/utils/xorgcfg/text-mode.c | 2 +-
hw/xfree86/utils/xorgconfig/xorgconfig.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
diff-tree a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf (from parents)
Merge: 6facd958c2e7098cb68eac2810a88b8cd40f19c0 f80a8ae6e6820378ea70ac0849cee8bf3055e0e8
Author: Jeremy C. Reed <reed at glacier.reedmedia.net>
Date: Mon Nov 13 20:32:26 2006 -0600
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
diff-tree 6facd958c2e7098cb68eac2810a88b8cd40f19c0 (from 8382234a7f318057de66490299d63807cefb5201)
Author: Jeremy C. Reed <reed at glacier.reedmedia.net>
Date: Mon Nov 13 20:23:06 2006 -0600
On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 10f4b69..0430a54 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -551,7 +551,7 @@ MouseConfig(void)
if (str == NULL)
#ifdef WSCONS_SUPPORT
str = "/dev/wsmouse";
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
str = "/dev/sysmouse";
#elif defined(__UNIXOS2__)
str = "mouse$";
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index f00eea0..091b2db 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -490,7 +490,7 @@ struct {
#ifdef WSCONS_SUPPORT
# define DEF_MOUSEDEV "/dev/wsmouse";
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define DEF_MOUSEDEV "/dev/sysmouse";
#elif defined(__linux__)
# define DEF_MOUSEDEV "/dev/input/mice";
More information about the xorg-commit
mailing list