diff options
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 687730ea5..3dde4ba7d 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.78 2003/01/18 07:27:13 paulo Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * @@ -46,7 +46,7 @@ #include "Configint.h" #include "vbe.h" #include "xf86DDC.h" -#ifdef __sparc__ +#if defined(__sparc__) && !defined(__OpenBSD__) #include "xf86Bus.h" #include "xf86Sbus.h" #endif @@ -55,7 +55,7 @@ typedef struct _DevToConfig { GDevRec GDev; pciVideoPtr pVideo; -#ifdef __sparc__ +#if defined(__sparc__) && !defined(__OpenBSD__) sbusDevicePtr sVideo; #endif int iDriver; @@ -280,6 +280,8 @@ configureInputSection (void) DFLT_MOUSE_DEV = "/dev/wsmouse"; DFLT_MOUSE_PROTO = "wsmouse"; close(fd); + } else { + ErrorF("cannot open /dev/wsmouse\n"); } #endif @@ -868,7 +870,7 @@ DoConfigure() xf86DoConfigurePass1 = FALSE; /* Try to get DDC information filled in */ xf86ConfigFile = filename; - if (!xf86HandleConfigFile()) { + if (xf86HandleConfigFile(FALSE) != CONFIG_OK) { goto bail; } @@ -990,7 +992,7 @@ DoConfigure() ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename); bail: - OsCleanup(); + OsCleanup(TRUE); AbortDDX(); fflush(stderr); exit(0); |