Commit f7f3fe7f authored by Adam Jackson's avatar Adam Jackson

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.
parent 8a06ff9f
...@@ -1285,11 +1285,7 @@ SecurityFreePropertyAccessList(void) ...@@ -1285,11 +1285,7 @@ SecurityFreePropertyAccessList(void)
} }
} /* SecurityFreePropertyAccessList */ } /* SecurityFreePropertyAccessList */
#ifndef __UNIXOS2__
#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') ) #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
#else
#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') )
#endif
static char * static char *
SecuritySkipWhitespace( SecuritySkipWhitespace(
...@@ -1567,11 +1563,7 @@ SecurityLoadPropertyAccessList(void) ...@@ -1567,11 +1563,7 @@ SecurityLoadPropertyAccessList(void)
if (!SecurityPolicyFile) if (!SecurityPolicyFile)
return; return;
#ifndef __UNIXOS2__
f = fopen(SecurityPolicyFile, "r"); f = fopen(SecurityPolicyFile, "r");
#else
f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
#endif
if (!f) if (!f)
{ {
ErrorF("error opening security policy file %s\n", ErrorF("error opening security policy file %s\n",
......
...@@ -71,9 +71,6 @@ printf("/* \$$proj\$ */ ...@@ -71,9 +71,6 @@ printf("/* \$$proj\$ */
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include \"xf86.h\" #include \"xf86.h\"
#include \"xf86Config.h\" #include \"xf86Config.h\"
#include \"xf86Priv.h\" #include \"xf86Priv.h\"
......
...@@ -53,10 +53,6 @@ ...@@ -53,10 +53,6 @@
#include <grp.h> #include <grp.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include "xf86.h" #include "xf86.h"
#include "xf86Parser.h" #include "xf86Parser.h"
#include "xf86tokens.h" #include "xf86tokens.h"
...@@ -181,15 +177,8 @@ xf86ValidateFontPath(char *path) ...@@ -181,15 +177,8 @@ xf86ValidateFontPath(char *path)
while (next != NULL) { while (next != NULL) {
path_elem = xf86GetPathElem(&next); path_elem = xf86GetPathElem(&next);
if (*path_elem == '/') { if (*path_elem == '/') {
#ifndef __UNIXOS2__
dir_elem = xnfcalloc(1, strlen(path_elem) + 1); dir_elem = xnfcalloc(1, strlen(path_elem) + 1);
if ((p1 = strchr(path_elem, ':')) != 0) if ((p1 = strchr(path_elem, ':')) != 0)
#else
/* OS/2 must prepend X11ROOT */
path_elem = (char*)__XOS2RedirRoot(path_elem);
dir_elem = xnfcalloc(1, strlen(path_elem) + 1);
if (p1 = strchr(path_elem+2, ':'))
#endif
dirlen = p1 - path_elem; dirlen = p1 - path_elem;
else else
dirlen = strlen(path_elem); dirlen = strlen(path_elem);
...@@ -213,9 +202,7 @@ xf86ValidateFontPath(char *path) ...@@ -213,9 +202,7 @@ xf86ValidateFontPath(char *path)
if (flag == 0) if (flag == 0)
if (!S_ISREG(stat_buf.st_mode)) if (!S_ISREG(stat_buf.st_mode))
flag = -1; flag = -1;
#ifndef __UNIXOS2__
xfree(p1); xfree(p1);
#endif
if (flag != 0) { if (flag != 0) {
xf86Msg(X_WARNING, xf86Msg(X_WARNING,
"`fonts.dir' not found (or not valid) in \"%s\".\n", "`fonts.dir' not found (or not valid) in \"%s\".\n",
......
...@@ -70,10 +70,7 @@ _X_EXPORT xf86MonPtr ConfiguredMonitor; ...@@ -70,10 +70,7 @@ _X_EXPORT xf86MonPtr ConfiguredMonitor;
Bool xf86DoConfigurePass1 = TRUE; Bool xf86DoConfigurePass1 = TRUE;
static Bool foundMouse = FALSE; static Bool foundMouse = FALSE;
#if defined(__UNIXOS2__) #if defined(__SCO__)
#define DFLT_MOUSE_DEV "mouse$"
#define DFLT_MOUSE_PROTO "OS2Mouse"
#elif defined(__SCO__)
static char *DFLT_MOUSE_PROTO = "OSMouse"; static char *DFLT_MOUSE_PROTO = "OSMouse";
#elif defined(__UNIXWARE__) #elif defined(__UNIXWARE__)
static char *DFLT_MOUSE_PROTO = "OSMouse"; static char *DFLT_MOUSE_PROTO = "OSMouse";
...@@ -872,9 +869,6 @@ DoConfigure() ...@@ -872,9 +869,6 @@ DoConfigure()
if (!(home = getenv("HOME"))) if (!(home = getenv("HOME")))
home = "/"; home = "/";
{ {
#ifdef __UNIXOS2__
#define PATH_MAX 2048
#endif
#if !defined(PATH_MAX) #if !defined(PATH_MAX)
#define PATH_MAX 1024 #define PATH_MAX 1024
#endif #endif
...@@ -1010,13 +1004,11 @@ DoConfigure() ...@@ -1010,13 +1004,11 @@ DoConfigure()
ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"
"Edit the file and correct the Device.\n"); "Edit the file and correct the Device.\n");
} else { } else {
#ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */
ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n" ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"
"Please check your config if the mouse is still not\n" "Please check your config if the mouse is still not\n"
"operational, as by default "__XSERVERNAME__ "operational, as by default "__XSERVERNAME__
" tries to autodetect\n" " tries to autodetect\n"
"the protocol.\n",DFLT_MOUSE_DEV); "the protocol.\n",DFLT_MOUSE_DEV);
#endif
} }
#endif /* !__SCO__ */ #endif /* !__SCO__ */
......
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <X11/X.h> #include <X11/X.h>
......
/* $XFree86$ */
/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
* modeline2c.pl */ * modeline2c.pl */
...@@ -13,9 +11,6 @@ ...@@ -13,9 +11,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include "xf86.h" #include "xf86.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "xf86Priv.h" #include "xf86Priv.h"
......
...@@ -53,10 +53,6 @@ ...@@ -53,10 +53,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xpoll.h> #include <X11/Xpoll.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
...@@ -320,7 +316,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) ...@@ -320,7 +316,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
CloseDownClient(server); CloseDownClient(server);
} }
break; break;
#if !defined(__SOL8__) && !defined(__UNIXOS2__) && !defined(sgi) && \ #if !defined(__SOL8__) && !defined(sgi) && \
(!defined(sun) || defined(i386)) && defined(VT_ACTIVATE) (!defined(sun) || defined(i386)) && defined(VT_ACTIVATE)
case ACTION_SWITCHSCREEN: case ACTION_SWITCHSCREEN:
if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
...@@ -440,7 +436,7 @@ xf86CommonSpecialKey(int key, Bool down, int modifiers) ...@@ -440,7 +436,7 @@ xf86CommonSpecialKey(int key, Bool down, int modifiers)
void void
xf86Wakeup(pointer blockData, int err, pointer pReadmask) xf86Wakeup(pointer blockData, int err, pointer pReadmask)
{ {
#if !defined(__UNIXOS2__) && !defined(__QNX__) #if !defined(__QNX__)
fd_set* LastSelectMask = (fd_set*)pReadmask; fd_set* LastSelectMask = (fd_set*)pReadmask;
fd_set devicesWithInput; fd_set devicesWithInput;
InputInfoPtr pInfo; InputInfoPtr pInfo;
...@@ -467,7 +463,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) ...@@ -467,7 +463,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
} }
} }
} }
#else /* __UNIXOS2__ and __QNX__ */ #else /* __QNX__ */
InputInfoPtr pInfo; InputInfoPtr pInfo;
...@@ -487,7 +483,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) ...@@ -487,7 +483,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
pInfo = pInfo->next; pInfo = pInfo->next;
} }
#endif /* __UNIXOS2__ and __QNX__ */ #endif /* __QNX__ */
if (err >= 0) { /* we don't want the handlers called if select() */ if (err >= 0) { /* we don't want the handlers called if select() */
IHPtr ih; /* returned with an error condition, do we? */ IHPtr ih; /* returned with an error condition, do we? */
...@@ -874,7 +870,6 @@ xf86VTSwitch() ...@@ -874,7 +870,6 @@ xf86VTSwitch()
if (xf86Screens[i]->EnableDisableFBAccess) if (xf86Screens[i]->EnableDisableFBAccess)
(*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE); (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
} }
#if !defined(__UNIXOS2__)
/* /*
* Keep the order: Disable Device > LeaveVT * Keep the order: Disable Device > LeaveVT
...@@ -886,7 +881,6 @@ xf86VTSwitch() ...@@ -886,7 +881,6 @@ xf86VTSwitch()
DisableDevice(pInfo->dev); DisableDevice(pInfo->dev);
pInfo = pInfo->next; pInfo = pInfo->next;
} }
#endif /* !__UNIXOS2__ */
xf86EnterServerState(SETUP); xf86EnterServerState(SETUP);
for (i = 0; i < xf86NumScreens; i++) for (i = 0; i < xf86NumScreens; i++)
xf86Screens[i]->LeaveVT(i, 0); xf86Screens[i]->LeaveVT(i, 0);
...@@ -920,7 +914,6 @@ xf86VTSwitch() ...@@ -920,7 +914,6 @@ xf86VTSwitch()
} }
SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
#if !defined(__UNIXOS2__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
if (pInfo->dev) { if (pInfo->dev) {
...@@ -931,7 +924,6 @@ xf86VTSwitch() ...@@ -931,7 +924,6 @@ xf86VTSwitch()
} }
/* XXX HACK */ /* XXX HACK */
xf86ReleaseKeys(inputInfo.keyboard); xf86ReleaseKeys(inputInfo.keyboard);
#endif /* !__UNIXOS2__ */
for (ih = InputHandlers; ih; ih = ih->next) for (ih = InputHandlers; ih; ih = ih->next)
xf86EnableInputHandler(ih); xf86EnableInputHandler(ih);
...@@ -986,7 +978,6 @@ xf86VTSwitch() ...@@ -986,7 +978,6 @@ xf86VTSwitch()
/* Turn screen saver off when switching back */ /* Turn screen saver off when switching back */
SaveScreens(SCREEN_SAVER_FORCER,ScreenSaverReset); SaveScreens(SCREEN_SAVER_FORCER,ScreenSaverReset);
#if !defined(__UNIXOS2__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
if (pInfo->dev) { if (pInfo->dev) {
...@@ -997,7 +988,6 @@ xf86VTSwitch() ...@@ -997,7 +988,6 @@ xf86VTSwitch()
} }
/* XXX HACK */ /* XXX HACK */
xf86ReleaseKeys(inputInfo.keyboard); xf86ReleaseKeys(inputInfo.keyboard);
#endif /* !__UNIXOS2__ */
for (ih = InputHandlers; ih; ih = ih->next) for (ih = InputHandlers; ih; ih = ih->next)
xf86EnableInputHandler(ih); xf86EnableInputHandler(ih);
......
/* /*
* Loosely based on code bearing the following copyright: * Loosely based on code bearing the following copyright:
* *
...@@ -39,15 +38,12 @@ ...@@ -39,15 +38,12 @@
#include <errno.h> #include <errno.h>
#undef HAS_UTSNAME #undef HAS_UTSNAME
#if !defined(WIN32) && !defined(__UNIXOS2__) #if !defined(WIN32)
#define HAS_UTSNAME 1 #define HAS_UTSNAME 1
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#define NEED_EVENTS #define NEED_EVENTS
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
...@@ -105,10 +101,6 @@ static void xf86PrintDefaultModulePath(void); ...@@ -105,10 +101,6 @@ static void xf86PrintDefaultModulePath(void);
static void xf86PrintDefaultLibraryPath(void); static void xf86PrintDefaultLibraryPath(void);
static void xf86RunVtInit(void); static void xf86RunVtInit(void);
#ifdef __UNIXOS2__
extern void os2ServerVideoAccess();
#endif
#ifdef XF86PM #ifdef XF86PM
void (*xf86OSPMClose)(void) = NULL; void (*xf86OSPMClose)(void) = NULL;
#endif #endif
...@@ -267,10 +259,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) ...@@ -267,10 +259,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
Bool pix24Fail = FALSE; Bool pix24Fail = FALSE;
Bool autoconfig = FALSE; Bool autoconfig = FALSE;
#ifdef __UNIXOS2__
os2ServerVideoAccess(); /* See if we have access to the screen before doing anything */
#endif
xf86Initialising = TRUE; xf86Initialising = TRUE;
/* Do this early? */ /* Do this early? */
...@@ -1065,9 +1053,7 @@ OsVendorInit() ...@@ -1065,9 +1053,7 @@ OsVendorInit()
#ifdef O_NONBLOCK #ifdef O_NONBLOCK
if (!beenHere) { if (!beenHere) {
#if !defined(__EMX__)
if (geteuid() == 0 && getuid() != geteuid()) if (geteuid() == 0 && getuid() != geteuid())
#endif
{ {
int status; int status;
......
...@@ -34,10 +34,6 @@ ...@@ -34,10 +34,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <X11/X.h> #include <X11/X.h>
#include "os.h" #include "os.h"
#include "xf86.h" #include "xf86.h"
......
/* /*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc. * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
* *
...@@ -93,11 +92,7 @@ typedef enum { ...@@ -93,11 +92,7 @@ typedef enum {
#define MODINFOSTRING2 0x10dc023a #define MODINFOSTRING2 0x10dc023a
#ifndef MODULEVENDORSTRING #ifndef MODULEVENDORSTRING
#ifndef __OS2ELF__
#define MODULEVENDORSTRING "X.Org Foundation" #define MODULEVENDORSTRING "X.Org Foundation"
#else
#define MODULEVENDORSTRING "X.Org Foundation - OS2"
#endif
#endif #endif
/* Error return codes for errmaj. New codes must only be added at the end. */ /* Error return codes for errmaj. New codes must only be added at the end. */
......
...@@ -74,13 +74,11 @@ suspend (pmEvent event, Bool undo) ...@@ -74,13 +74,11 @@ suspend (pmEvent event, Bool undo)
if (xf86Screens[i]->EnableDisableFBAccess) if (xf86Screens[i]->EnableDisableFBAccess)
(*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE); (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
} }
#if !defined(__EMX__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
DisableDevice(pInfo->dev); DisableDevice(pInfo->dev);
pInfo = pInfo->next; pInfo = pInfo->next;
} }
#endif
xf86EnterServerState(SETUP); xf86EnterServerState(SETUP);
for (i = 0; i < xf86NumScreens; i++) { for (i = 0; i < xf86NumScreens; i++) {
xf86EnableAccess(xf86Screens[i]); xf86EnableAccess(xf86Screens[i]);
...@@ -119,13 +117,11 @@ resume(pmEvent event, Bool undo) ...@@ -119,13 +117,11 @@ resume(pmEvent event, Bool undo)
(*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE); (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
} }
SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
#if !defined(__EMX__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
EnableDevice(pInfo->dev); EnableDevice(pInfo->dev);
pInfo = pInfo->next; pInfo = pInfo->next;
} }
#endif
xf86inSuspend = FALSE; xf86inSuspend = FALSE;
} }
......
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <misc.h> #include <misc.h>
#include <xf86.h> #include <xf86.h>
#include <xf86Version.h> #include <xf86Version.h>
......
...@@ -118,12 +118,7 @@ static char **defaultPathList = NULL; ...@@ -118,12 +118,7 @@ static char **defaultPathList = NULL;
static Bool static Bool
PathIsAbsolute(const char *path) PathIsAbsolute(const char *path)
{ {
#ifdef __UNIXOS2__
return (*path == '/' || (strlen(path) > 2 && isalpha(elem[0]) &&
elem[1] == ':' && elem[2] == '/'));
#else
return (*path == '/'); return (*path == '/');
#endif
} }
/* /*
......
...@@ -62,8 +62,6 @@ ...@@ -62,8 +62,6 @@
#define OSNAME "svr5" #define OSNAME "svr5"
#elif defined(SVR4) #elif defined(SVR4)
#define OSNAME "svr4" #define OSNAME "svr4"
#elif defined(__UNIXOS2__)
#define OSNAME "os2"
#else #else
#define OSNAME "unknown" #define OSNAME "unknown"
#endif #endif
......
...@@ -150,9 +150,7 @@ extern void _Qp_uitoq(unsigned int *, unsigned int); ...@@ -150,9 +150,7 @@ extern void _Qp_uitoq(unsigned int *, unsigned int);
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#ifndef __UNIXOS2__
extern long __div64(long, long); extern long __div64(long, long);
#endif
extern long __divdf3(long, long); extern long __divdf3(long, long);
extern long __divdi3(long, long); extern long __divdi3(long, long);
extern long __divsf3(long, long); extern long __divsf3(long, long);
...@@ -160,9 +158,7 @@ extern long __divsi3(long, long); ...@@ -160,9 +158,7 @@ extern long __divsi3(long, long);
extern long __moddi3(long, long); extern long __moddi3(long, long);
extern long __modsi3(long, long); extern long __modsi3(long, long);
#ifndef __UNIXOS2__
extern long __mul64(long, long); extern long __mul64(long, long);
#endif
extern long __muldf3(long, long); extern long __muldf3(long, long);
extern long __muldi3(long, long); extern long __muldi3(long, long);
extern long __mulsf3(long, long); extern long __mulsf3(long, long);
...@@ -172,18 +168,14 @@ extern long __udivsi3(long, long); ...@@ -172,18 +168,14 @@ extern long __udivsi3(long, long);
extern long __umoddi3(long, long); extern long __umoddi3(long, long);
extern long __umodsi3(long, long); extern long __umodsi3(long, long);
#ifndef __UNIXOS2__
#pragma weak __div64 #pragma weak __div64
#endif
#pragma weak __divdf3 #pragma weak __divdf3
#pragma weak __divdi3 #pragma weak __divdi3
#pragma weak __divsf3 #pragma weak __divsf3
#pragma weak __divsi3 #pragma weak __divsi3
#pragma weak __moddi3 #pragma weak __moddi3
#pragma weak __modsi3 #pragma weak __modsi3
#ifndef __UNIXOS2__
#pragma weak __mul64 #pragma weak __mul64
#endif
#pragma weak __muldf3 #pragma weak __muldf3
#pragma weak __muldi3 #pragma weak __muldi3
#pragma weak __mulsf3 #pragma weak __mulsf3
...@@ -1066,7 +1058,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { ...@@ -1066,7 +1058,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
# endif # endif
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#if !defined(__UNIXOS2__) && !defined(Lynx) #if !defined(Lynx)
SYMFUNC(__div64) SYMFUNC(__div64)
#endif #endif
#if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */ #if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */
...@@ -1081,7 +1073,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { ...@@ -1081,7 +1073,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
#if !defined(Lynx) #if !defined(Lynx)
SYMFUNC(__modsi3) SYMFUNC(__modsi3)
#endif #endif
#if !defined(__UNIXOS2__) && !defined(Lynx) #if !defined(Lynx)
SYMFUNC(__mul64) SYMFUNC(__mul64)
#endif #endif
#if !defined(Lynx) #if !defined(Lynx)
......
...@@ -38,7 +38,6 @@ have been made in implementation. ...@@ -38,7 +38,6 @@ have been made in implementation.
systems. systems.
bsdi/ OS support for the BSD/386 operating system. bsdi/ OS support for the BSD/386 operating system.
linux/ OS support for the Linux operating system. linux/ OS support for the Linux operating system.
os2/ OS support for OS/2 2.11 and OS/2 Warp
sco/ OS support for the SCO SVR3.x operating system. sco/ OS support for the SCO SVR3.x operating system.
solx86/ OS support for the Solaris x86 operating system. solx86/ OS support for the Solaris x86 operating system.
sysv/ OS support for all SVR4.0 and SVR4.2, and for sysv/ OS support for all SVR4.0 and SVR4.2, and for
......
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <X11/X.h> #include <X11/X.h>
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
......
...@@ -34,9 +34,6 @@ ...@@ -34,9 +34,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef __UNIXOS2__
# define I_NEED_OS2_H
#endif
#include <X11/X.h> #include <X11/X.h>
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
......
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#undef __STRICT_ANSI__ #undef __STRICT_ANSI__
#endif #endif
#include <X11/X.h> #include <X11/X.h>
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xos.h> #include <X11/Xos.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -56,10 +53,6 @@ ...@@ -56,10 +53,6 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef __UNIXOS2__
#define NO_MMAP
#include <sys/param.h>
#endif
#ifdef HAS_SVR3_MMAPDRV #ifdef HAS_SVR3_MMAPDRV
#define NO_MMAP #define NO_MMAP
#ifdef SELF_CONTAINED_WRAPPER #ifdef SELF_CONTAINED_WRAPPER
...@@ -123,9 +116,6 @@ void xf86WrapperInit(void); ...@@ -123,9 +116,6 @@ void xf86WrapperInit(void);
#endif #endif
typedef struct dirent DIRENTRY;