summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/shared
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/os-support/shared')
-rw-r--r--hw/xfree86/os-support/shared/VTsw_noop.c1
-rw-r--r--hw/xfree86/os-support/shared/VTsw_usl.c1
-rw-r--r--hw/xfree86/os-support/shared/agp_noop.c3
-rw-r--r--hw/xfree86/os-support/shared/bios_devmem.c1
-rw-r--r--hw/xfree86/os-support/shared/bios_mmap.c1
-rw-r--r--hw/xfree86/os-support/shared/ioperm_noop.c1
-rw-r--r--hw/xfree86/os-support/shared/libc_wrapper.c34
-rw-r--r--hw/xfree86/os-support/shared/posix_tty.c2
-rw-r--r--hw/xfree86/os-support/shared/sigiostubs.c3
-rw-r--r--hw/xfree86/os-support/shared/stdPci.c3
-rw-r--r--hw/xfree86/os-support/shared/stdResource.c6
-rw-r--r--hw/xfree86/os-support/shared/vidmem.c3
-rw-r--r--hw/xfree86/os-support/shared/xf86Axp.h2
13 files changed, 0 insertions, 61 deletions
diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c
index fd05f399c..a3cfe40b9 100644
--- a/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 0100ae928..4d473147f 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c
index 0a7844894..5774bc231 100644
--- a/hw/xfree86/os-support/shared/agp_noop.c
+++ b/hw/xfree86/os-support/shared/agp_noop.c
@@ -34,9 +34,6 @@
#include <xorg-config.h>
#endif
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
#include <X11/X.h>
#include "xf86.h"
#include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c
index 86d38292f..7288239be 100644
--- a/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/hw/xfree86/os-support/shared/bios_devmem.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index 40d37e0c3..cccf86a04 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c
index 2427d1923..1d7851a5b 100644
--- a/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: ioperm_noop.c /main/3 1996/02/21 17:53:39 kaleb $ */
/*
* Some platforms don't bother with I/O permissions,
diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c
index a459d5d70..959424110 100644
--- a/hw/xfree86/os-support/shared/libc_wrapper.c
+++ b/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -30,9 +30,6 @@
#undef __STRICT_ANSI__
#endif
#include <X11/X.h>
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
#include <X11/Xmd.h>
#include <X11/Xos.h>
#include <sys/types.h>
@@ -56,10 +53,6 @@
#include <errno.h>
#include <stdio.h>
#include <sys/ioctl.h>
-#ifdef __UNIXOS2__
-#define NO_MMAP
-#include <sys/param.h>
-#endif
#ifdef HAS_SVR3_MMAPDRV
#define NO_MMAP
#ifdef SELF_CONTAINED_WRAPPER
@@ -123,9 +116,6 @@ void xf86WrapperInit(void);
#endif
typedef struct dirent DIRENTRY;
-#ifdef __UNIXOS2__
-#define _POSIX_SOURCE
-#endif
#ifdef ISC202
#include <sys/types.h>
#define WIFEXITED(a) ((a & 0x00ff) == 0) /* LSB will be 0 */
@@ -917,9 +907,7 @@ xf86strerror(int n)
mapnum (ENOTDIR);
mapnum (EPIPE);
mapnum (EROFS);
-#ifndef __UNIXOS2__
mapnum (ETXTBSY); /* not POSIX 1 */
-#endif
mapnum (ENOTTY);
#ifdef ENOSYS
mapnum (ENOSYS);
@@ -1243,7 +1231,6 @@ xf86bsearch(const void *key, const void *base, xf86size_t nmemb,
_X_EXPORT int
xf86execl(const char *pathname, const char *arg, ...)
{
-#ifndef __UNIXOS2__
int i;
pid_t pid;
int exit_status;
@@ -1327,9 +1314,6 @@ xf86execl(const char *pathname, const char *arg, ...)
pathname);
return(1);
}
-#else
- return(1);
-#endif /* __UNIXOS2__ Disable this crazy business for now */
}
_X_EXPORT void
@@ -1435,9 +1419,7 @@ xfToOsChmodMode(xf86mode_t xfmode)
if (xfmode & XF86_S_ISUID) mode |= S_ISUID;
if (xfmode & XF86_S_ISGID) mode |= S_ISGID;
-#ifndef __UNIXOS2__
if (xfmode & XF86_S_ISVTX) mode |= S_ISVTX;
-#endif
if (xfmode & XF86_S_IRUSR) mode |= S_IRUSR;
if (xfmode & XF86_S_IWUSR) mode |= S_IWUSR;
if (xfmode & XF86_S_IXUSR) mode |= S_IXUSR;
@@ -1464,11 +1446,7 @@ xf86chmod(const char *path, xf86mode_t xfmode)
_X_EXPORT int
xf86chown(const char *path, xf86uid_t owner, xf86gid_t group)
{
-#ifndef __UNIXOS2__
int rc = chown(path, owner, group);
-#else
- int rc = 0;
-#endif
xf86errno = xf86GetErrno();
return rc;
}
@@ -1498,9 +1476,7 @@ xfToOsMknodMode(xf86mode_t xfmode)
if (xfmode & XF86_S_IFREG) mode |= S_IFREG;
if (xfmode & XF86_S_IFCHR) mode |= S_IFCHR;
-#ifndef __UNIXOS2__
if (xfmode & XF86_S_IFBLK) mode |= S_IFBLK;
-#endif
if (xfmode & XF86_S_IFIFO) mode |= S_IFIFO;
return mode;
@@ -1509,11 +1485,7 @@ xfToOsMknodMode(xf86mode_t xfmode)
_X_EXPORT int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev)
{
mode_t mode = xfToOsMknodMode(xfmode);
-#ifndef __UNIXOS2__
int rc = mknod(pathname, mode, dev);
-#else
- int rc = 0;
-#endif
xf86errno = xf86GetErrno();
return rc;
}
@@ -1611,12 +1583,8 @@ _X_EXPORT int
xf86finite(double x)
{
#ifndef QNX4
-#ifndef __UNIXOS2__
return(finite(x));
#else
- return(isfinite(x));
-#endif /* __UNIXOS2__ */
-#else
/* XXX Replace this with something that really works. */
return 1;
#endif
@@ -1907,9 +1875,7 @@ xf86GetErrno ()
mapnum (ENOTDIR);
mapnum (EPIPE);
mapnum (EROFS);
-#ifndef __UNIXOS2__
mapnum (ETXTBSY); /* not POSIX 1 */
-#endif
mapnum (ENOTTY);
#ifdef ENOSYS
mapnum (ENOSYS);
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 6e1b54331..002e3a275 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -52,8 +52,6 @@
*
*/
-/* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c
index 1a196cb30..7113968c6 100644
--- a/hw/xfree86/os-support/shared/sigiostubs.c
+++ b/hw/xfree86/os-support/shared/sigiostubs.c
@@ -29,9 +29,6 @@
#include <xorg-config.h>
#endif
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
# include <X11/X.h>
# include "xf86.h"
# include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c
index e55ac77be..6777c6a1f 100644
--- a/hw/xfree86/os-support/shared/stdPci.c
+++ b/hw/xfree86/os-support/shared/stdPci.c
@@ -29,9 +29,6 @@
#include <xorg-config.h>
#endif
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
#include <X11/X.h>
#include "xf86.h"
#include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c
index ad4685605..555f80526 100644
--- a/hw/xfree86/os-support/shared/stdResource.c
+++ b/hw/xfree86/os-support/shared/stdResource.c
@@ -31,9 +31,6 @@
#include <xorg-config.h>
#endif
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
#include <X11/X.h>
#include "xf86.h"
#include "xf86Priv.h"
@@ -43,9 +40,6 @@
#include "xf86_OSlib.h"
#include "xf86Resources.h"
-#ifdef __UNIXOS2__
-# undef ADDRESS
-#endif
/* Avoid Imakefile changes */
#include "bus/Pci.h"
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
index 4d775eb52..0b4411604 100644
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ b/hw/xfree86/os-support/shared/vidmem.c
@@ -30,9 +30,6 @@
#include <xorg-config.h>
#endif
-#ifdef __UNIXOS2__
-# define I_NEED_OS2_H
-#endif
#include <X11/X.h>
#include "input.h"
#include "scrnintstr.h"
diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h
index 4b8b08370..5e9d6284c 100644
--- a/hw/xfree86/os-support/shared/xf86Axp.h
+++ b/hw/xfree86/os-support/shared/xf86Axp.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 05:01:34 +0000