hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-17 19:42:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove the remnants of OS/2 support.

Browse source 
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
This commit is contained in:
Adam Jackson 2007-06-28 18:59:05 -04:00
commit f7f3fe7fe7
50 changed files with 31 additions and 910 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hw/xfree86/parser/scan.c
View file

@ -106,10 +106,6 @@ static int pushToken = LOCK_TOKEN;
static int eol_seen = 0; /* private state to handle comments */
LexRec val;
#ifdef __UNIXOS2__
extern char *__XOS2RedirRoot(char *path);
#endif
/*
* xf86strToUL --
*
@ -523,10 +519,6 @@ xf86pathIsAbsolute(const char *path)
{
if (path && path[0] == '/')
return 1;
#ifdef __UNIXOS2__
if (path && (path[0] == '\\' || (path[1] == ':')))
return 1;
#endif
return 0;
}
@ -571,7 +563,6 @@ xf86pathIsSafe(const char *path)
* %P projroot
* %M major version number
* %% %
* %& UNIXOS2 only: prepend X11ROOT env var
*/
#ifndef XCONFIGFILE
@ -625,9 +616,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
static const char *env = NULL, *home = NULL;
static char *hostname = NULL;
static char majorvers[3] = "";
#ifdef __UNIXOS2__
static char *x11root = NULL;
#endif
if (!template)
return NULL;
@ -744,16 +732,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
result[l++] = '%';
CHECK_LENGTH;
break;
#ifdef __UNIXOS2__
case '&':
if (!x11root)
x11root = getenv("X11ROOT");
if (x11root)
APPEND_STR(x11root);
else
BAIL_OUT;
break;
#endif
default:
fprintf(stderr, "invalid escape %%%c found in path template\n",
template[i]);