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/loader | |
| 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/loader')
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 5 | ||||
| -rw-r--r-- | hw/xfree86/loader/os.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/xf86sym.c | 12 |
3 files changed, 2 insertions, 17 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index ea559aaa5..1b5c717fd 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -118,12 +118,7 @@ static char **defaultPathList = NULL; static Bool PathIsAbsolute(const char *path) { -#ifdef __UNIXOS2__ - return (*path == '/' || (strlen(path) > 2 && isalpha(elem[0]) && - elem[1] == ':' && elem[2] == '/')); -#else return (*path == '/'); -#endif } /* diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 83fd24787..fdddce898 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -62,8 +62,6 @@ #define OSNAME "svr5" #elif defined(SVR4) #define OSNAME "svr4" -#elif defined(__UNIXOS2__) -#define OSNAME "os2" #else #define OSNAME "unknown" #endif diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index b4ae42f74..aae362960 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -150,9 +150,7 @@ extern void _Qp_uitoq(unsigned int *, unsigned int); #endif #if defined(__GNUC__) -#ifndef __UNIXOS2__ extern long __div64(long, long); -#endif extern long __divdf3(long, long); extern long __divdi3(long, long); extern long __divsf3(long, long); @@ -160,9 +158,7 @@ extern long __divsi3(long, long); extern long __moddi3(long, long); extern long __modsi3(long, long); -#ifndef __UNIXOS2__ extern long __mul64(long, long); -#endif extern long __muldf3(long, long); extern long __muldi3(long, long); extern long __mulsf3(long, long); @@ -172,18 +168,14 @@ extern long __udivsi3(long, long); extern long __umoddi3(long, long); extern long __umodsi3(long, long); -#ifndef __UNIXOS2__ #pragma weak __div64 -#endif #pragma weak __divdf3 #pragma weak __divdi3 #pragma weak __divsf3 #pragma weak __divsi3 #pragma weak __moddi3 #pragma weak __modsi3 -#ifndef __UNIXOS2__ #pragma weak __mul64 -#endif #pragma weak __muldf3 #pragma weak __muldi3 #pragma weak __mulsf3 @@ -1066,7 +1058,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { # endif #endif #if defined(__GNUC__) -#if !defined(__UNIXOS2__) && !defined(Lynx) +#if !defined(Lynx) SYMFUNC(__div64) #endif #if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */ @@ -1081,7 +1073,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { #if !defined(Lynx) SYMFUNC(__modsi3) #endif -#if !defined(__UNIXOS2__) && !defined(Lynx) +#if !defined(Lynx) SYMFUNC(__mul64) #endif #if !defined(Lynx) |