diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-03 16:46:14 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-03 16:46:14 +0000 |
| commit | 6d4b350dee9495e54e6e5492815885f1d8455ac9 (patch) | |
| tree | 7b66d8b4756de9f688080f9de043a0325b3ba049 /hw/xfree86/common | |
| parent | 22b4200b01310e7b4743ef0b3541c3053a2d8279 (diff) | |
Bug #3815 <https://bugs.freedesktop.org/show_bug.cgi?id=3815> Patch #3463
<https://bugs.freedesktop.org/attachment.cgi?id=3463> GNU/kFreeBSD
Xserver support (Robert Millan)
Diffstat (limited to 'hw/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Privstr.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 2b8c2d52b..5d424afff 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -83,7 +83,8 @@ extern DeviceAssocRec mouse_assoc; #endif #if (defined(i386) || defined(__i386__)) && \ - (defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || \ + (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ + defined(__NetBSD__) || defined(linux) || \ (defined(SVR4) && !defined(sun)) || defined(__GNU__)) #define SUPPORT_PC98 #endif diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 41aa10e3b..0f7a334ea 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -84,7 +84,7 @@ static char *DFLT_MOUSE_DEV = "/dev/mouse"; #elif defined(__QNXNTO__) static char *DFLT_MOUSE_PROTO = "OSMouse"; static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0"; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; static char *DFLT_MOUSE_PROTO = "auto"; #else diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index 93d64fd51..2f15e14cb 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -120,7 +120,7 @@ typedef struct { /* graphics part */ Bool sharedMonitor; ScreenPtr currentScreen; -#ifdef CSRG_BASED +#if defined(CSRG_BASED) || defined(__FreeBSD_kernel__) int screenFd; /* fd for memory mapped access to * vga card */ int consType; /* Which console driver? */ @@ -222,7 +222,7 @@ typedef struct _RootWinProp { #define XCOMP ((unsigned long) 0x00008000) /* BSD console driver types (consType) */ -#ifdef CSRG_BASED +#if defined(CSRG_BASED) || defined(__FreeBSD_kernel__) #define PCCONS 0 #define CODRV011 1 #define CODRV01X 2 |