diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-28 18:59:05 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-28 18:59:05 -0400 |
| commit | f7f3fe7fe7233a2ffc43106c48f44cbbd82b7c19 (patch) | |
| tree | 84ca56dbddf11442a1acfeeee6ac69afd0701f9e /hw/xfree86/common/xf86Configure.c | |
| parent | 8a06ff9ffa4816d192e58e43e7fe569b97b4dd7c (diff) | |
Remove the remnants of OS/2 support.
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 7b04bd6bd..abe986e22 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -70,10 +70,7 @@ _X_EXPORT xf86MonPtr ConfiguredMonitor; Bool xf86DoConfigurePass1 = TRUE; static Bool foundMouse = FALSE; -#if defined(__UNIXOS2__) -#define DFLT_MOUSE_DEV "mouse$" -#define DFLT_MOUSE_PROTO "OS2Mouse" -#elif defined(__SCO__) +#if defined(__SCO__) static char *DFLT_MOUSE_PROTO = "OSMouse"; #elif defined(__UNIXWARE__) static char *DFLT_MOUSE_PROTO = "OSMouse"; @@ -872,9 +869,6 @@ DoConfigure() if (!(home = getenv("HOME"))) home = "/"; { -#ifdef __UNIXOS2__ -#define PATH_MAX 2048 -#endif #if !defined(PATH_MAX) #define PATH_MAX 1024 #endif @@ -1010,13 +1004,11 @@ DoConfigure() ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" "Edit the file and correct the Device.\n"); } else { -#ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */ ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n" "Please check your config if the mouse is still not\n" "operational, as by default "__XSERVERNAME__ " tries to autodetect\n" "the protocol.\n",DFLT_MOUSE_DEV); -#endif } #endif /* !__SCO__ */ |