xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Thu Jul 17 09:09:23 PDT 2008
Xext/mbuf.c | 2 -
Xext/shm.c | 5 ---
Xext/sync.c | 2 -
Xext/xvmc.c | 5 ---
hw/xfree86/common/compiler.h | 6 +--
hw/xfree86/doc/man/Xorg.man.pre | 2 -
hw/xfree86/loader/loader.c | 2 -
hw/xfree86/loader/loader.h | 2 -
hw/xfree86/loader/os.c | 2 -
hw/xfree86/loader/xf86sym.c | 50 +------------------------------
hw/xfree86/os-support/assyntax.h | 2 -
hw/xfree86/os-support/shared/posix_tty.c | 11 ------
hw/xfree86/os-support/xf86_OSlib.h | 42 --------------------------
hw/xfree86/utils/gtf/gtf.c | 5 ---
include/servermd.h | 5 ---
os/access.c | 8 ----
os/connection.c | 9 -----
os/io.c | 4 --
os/osinit.c | 4 +-
os/utils.c | 6 ---
os/xdmcp.c | 4 --
xkb/xkbAccessX.c | 2 -
22 files changed, 18 insertions(+), 162 deletions(-)
New commits:
commit 47833eef35b20a2eb0a74782edbb0877fd491c4c
Author: Mathieu Bérard <mathieu.berard at crans.org>
Date: Thu Jul 17 11:59:24 2008 -0400
Drop a bunch of #ifdef Lynx.
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index ae0ca17..08b9334 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/multibufst.h>
#include <stdio.h>
-#if !defined(WIN32) && !defined(Lynx)
+#if !defined(WIN32)
#include <sys/time.h>
#endif
diff --git a/Xext/shm.c b/Xext/shm.c
index 00e296d..52e477f 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -34,13 +34,8 @@ in this Software without prior written authorization from The Open Group.
#endif
#include <sys/types.h>
-#ifndef Lynx
#include <sys/ipc.h>
#include <sys/shm.h>
-#else
-#include <ipc.h>
-#include <shm.h>
-#endif
#include <unistd.h>
#include <sys/stat.h>
#define NEED_REPLIES
diff --git a/Xext/sync.c b/Xext/sync.c
index ce04702..63f6fa2 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -72,7 +72,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/syncstr.h>
#include <stdio.h>
-#if !defined(WIN32) && !defined(Lynx)
+#if !defined(WIN32)
#include <sys/time.h>
#endif
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 0c6dbeb..3a77eb6 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -24,14 +24,9 @@
#include "xvmcext.h"
#ifdef HAS_XVMCSHM
-#ifndef Lynx
#include <sys/ipc.h>
#include <sys/types.h>
#include <sys/shm.h>
-#else
-#include <ipc.h>
-#include <shm.h>
-#endif /* Lynx */
#endif /* HAS_XVMCSHM */
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index a20baa3..9e9234f 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -564,9 +564,8 @@ inl(unsigned short port)
return ret;
}
-# elif (defined(linux) || defined(Lynx) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
+# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
-# if !defined(Lynx)
# ifndef ASI_PL
# define ASI_PL 0x88
# endif
@@ -805,7 +804,6 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
: "r" (val), "r" (addr), "i" (ASI_PL));
}
-# endif /* !Lynx */
/*
* EGCS 1.1 knows about arbitrary unaligned loads. Define some
@@ -1067,7 +1065,7 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
# define write_mem_barrier() /* NOP */
# endif /* __arm32__ */
-# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
+# elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
# ifndef MAP_FAILED
# define MAP_FAILED ((void *)-1)
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 405efda..cf13c7e 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -30,7 +30,7 @@ SPARC and PowerPC. The most widely supported operating systems are the
free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,
OpenBSD, and Solaris. Commercial UNIX operating systems such as
UnixWare are also supported. Other supported operating systems include
-LynxOS, and GNU Hurd. Darwin and Mac OS X are supported with the
+GNU Hurd. Darwin and Mac OS X are supported with the
XDarwin(__appmansuffix__) X server. Win32/Cygwin is supported with the
XWin(__appmansuffix__) X server.
.PP
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index c1df446..96d2041 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -76,7 +76,7 @@
#include "compiler.h"
#include "sym.h"
-#if defined(Lynx) && defined(sun)
+#if defined(sun)
/* Cross build machine doesn;t have strerror() */
#define strerror(err) "strerror unsupported"
#endif
diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h
index 46d4c3e..882dcab 100644
--- a/hw/xfree86/loader/loader.h
+++ b/hw/xfree86/loader/loader.h
@@ -53,7 +53,7 @@
#ifndef _LOADER_H
#define _LOADER_H
-#if defined(Lynx) && defined(sun)
+#if defined(sun)
#define const /**/
#endif
#include <X11/Xosdefs.h>
diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c
index 12cf3d8..9b3c964 100644
--- a/hw/xfree86/loader/os.c
+++ b/hw/xfree86/loader/os.c
@@ -48,8 +48,6 @@
#define OSNAME "netbsd"
#elif defined(__OpenBSD__)
#define OSNAME "openbsd"
-#elif defined(Lynx)
-#define OSNAME "lynxos"
#elif defined(__GNU__)
#define OSNAME "hurd"
#elif defined(__SCO__)
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 8a45fe7..0d1b38c 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -187,7 +187,7 @@ extern long __umodsi3(long, long);
#include <sys/io.h>
#endif
-#if defined(__powerpc__) && (defined(Lynx) || defined(linux))
+#if defined(__powerpc__) && defined(linux)
void _restf14();
void _restf17();
void _restf18();
@@ -754,7 +754,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(outb)
SYMFUNC(outw)
SYMFUNC(outl)
-# if defined(NO_INLINE) || defined(Lynx)
+# if defined(NO_INLINE)
SYMFUNC(mem_barrier)
SYMFUNC(ldl_u)
SYMFUNC(eieio)
@@ -769,34 +769,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(stw_u)
SYMFUNC(write_mem_barrier)
# endif
-# if defined(Lynx)
- SYMFUNC(_restf14)
- SYMFUNC(_restf17)
- SYMFUNC(_restf18)
- SYMFUNC(_restf19)
- SYMFUNC(_restf20)
- SYMFUNC(_restf22)
- SYMFUNC(_restf23)
- SYMFUNC(_restf24)
- SYMFUNC(_restf25)
- SYMFUNC(_restf26)
- SYMFUNC(_restf27)
- SYMFUNC(_restf28)
- SYMFUNC(_restf29)
- SYMFUNC(_savef14)
- SYMFUNC(_savef17)
- SYMFUNC(_savef18)
- SYMFUNC(_savef19)
- SYMFUNC(_savef20)
- SYMFUNC(_savef22)
- SYMFUNC(_savef23)
- SYMFUNC(_savef24)
- SYMFUNC(_savef25)
- SYMFUNC(_savef26)
- SYMFUNC(_savef27)
- SYMFUNC(_savef28)
- SYMFUNC(_savef29)
-# endif
# if PPCIO_DEBUG
SYMFUNC(debug_inb)
SYMFUNC(debug_inw)
@@ -807,39 +779,23 @@ _X_HIDDEN void *xfree86LookupTab[] = {
# endif
#endif
#if defined(__GNUC__)
-#if !defined(Lynx)
SYMFUNC(__div64)
-#endif
-#if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */
SYMFUNC(__divdf3)
-#endif
SYMFUNC(__divdi3)
-#if !defined(Lynx)
SYMFUNC(__divsf3)
SYMFUNC(__divsi3)
-#endif
SYMFUNC(__moddi3)
-#if !defined(Lynx)
SYMFUNC(__modsi3)
-#endif
-#if !defined(Lynx)
SYMFUNC(__mul64)
-#endif
-#if !defined(Lynx)
SYMFUNC(__muldf3)
-#endif
SYMFUNC(__muldi3)
-#if !defined(Lynx)
SYMFUNC(__mulsf3)
SYMFUNC(__mulsi3)
SYMFUNC(__udivdi3)
SYMFUNC(__udivsi3)
-#endif
SYMFUNC(__umoddi3)
-#if !defined(Lynx)
SYMFUNC(__umodsi3)
#endif
-#endif
#if defined(__ia64__)
SYMFUNC(outw)
SYMFUNC(outb)
@@ -886,7 +842,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMVAR(res8514Exclusive)
SYMVAR(res8514Shared)
-#if defined(__powerpc__) && (!defined(NO_INLINE) || defined(Lynx))
+#if defined(__powerpc__) && !defined(NO_INLINE)
SYMVAR(ioBase)
#endif
diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h
index d3e96e5..2d7e17f 100644
--- a/hw/xfree86/os-support/assyntax.h
+++ b/hw/xfree86/os-support/assyntax.h
@@ -236,7 +236,7 @@
#endif /* ACK_ASSEMBLER */
-#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
+#if defined(__QNX__) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
#define GLNAME(a) a
#else
#define GLNAME(a) CONCAT(_,a)
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 002e3a2..316526b 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -114,9 +114,6 @@ GetBaud (int baudrate)
_X_EXPORT int
xf86OpenSerial (pointer options)
{
-#ifdef Lynx
- struct sgttyb ms_sgtty;
-#endif
struct termios t;
int fd, i;
char *dev;
@@ -155,12 +152,6 @@ xf86OpenSerial (pointer options)
#endif
}
-#ifdef Lynx
- /* LynxOS does not assert DTR without this */
- ioctl (fd, TIOCGETP, (char *) &ms_sgtty);
- ioctl (fd, TIOCSDTR, (char *) &ms_sgtty);
-#endif
-
/* set up default port parameters */
SYSCALL (tcgetattr (fd, &t));
t.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR\
@@ -343,7 +334,7 @@ xf86SetSerial (int fd, pointer options)
if ((xf86SetBoolOption (options, "ClearDTR", FALSE)))
{
#ifdef CLEARDTR_SUPPORT
-# if !defined(Lynx) || defined(TIOCMBIC)
+# if defined(TIOCMBIC)
val = TIOCM_DTR;
SYSCALL (ioctl(fd, TIOCMBIC, &val));
# else
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 5a0a128..a589461 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -329,46 +329,6 @@
#endif /* __linux__ || __GLIBC__ */
/**************************************************************************/
-/* LynxOS AT */
-/**************************************************************************/
-#if defined(Lynx)
-
-# include <termio.h>
-# include <sys/ioctl.h>
-# include <param.h>
-# include <signal.h>
-# include <kd.h>
-# include <vt.h>
-# include <sys/stat.h>
-
-# include <errno.h>
-extern int errno;
-
-/* smem_create et.al. to access physical memory */
-# include <smem.h>
-
-/* keyboard types */
-# define KB_84 1
-# define KB_101 2
-# define KB_OTHER 3
-
-/* atc drivers ignores argument to VT_RELDISP ioctl */
-# define VT_ACKACQ 2
-
-# include <termios.h>
-# define POSIX_TTY
-# define CLEARDTR_SUPPORT
-
-/* LynxOS 2.5.1 has these */
-# ifdef LED_NUMLOCK
-# define LED_CAP LED_CAPSLOCK
-# define LED_NUM LED_NUMLOCK
-# define LED_SCR LED_SCROLLOCK
-# endif
-
-#endif /* Lynx */
-
-/**************************************************************************/
/* 386BSD and derivatives, BSD/386 */
/**************************************************************************/
@@ -644,7 +604,7 @@ extern int sys_nerr;
# endif /* !strerror */
#endif /* NEED_STRERROR */
-#if defined(ISC) || defined(Lynx)
+#if defined(ISC)
#define rint(x) RInt(x)
double RInt(
double x
diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c
index fd4a4f2..8ce9327 100644
--- a/hw/xfree86/utils/gtf/gtf.c
+++ b/hw/xfree86/utils/gtf/gtf.c
@@ -112,11 +112,6 @@
#include <string.h>
#include <math.h>
-
-#if defined(__Lynx__)
-#define rint(x) floor(x)
-#endif
-
#define MARGIN_PERCENT 1.8 /* % of active vertical image */
#define CELL_GRAN 8.0 /* assumed character cell granularity */
#define MIN_PORCH 1 /* minimum front porch */
diff --git a/include/servermd.h b/include/servermd.h
index 7c8dd58..000056e 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -116,11 +116,6 @@ SOFTWARE.
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
-/* XXX Should this be for Lynx only? */
-#ifdef Lynx
-#define BITMAP_SCANLINE_UNIT 8
-#endif
-
#endif /* PowerPC */
#if defined(__sh__)
diff --git a/os/access.c b/os/access.c
index 6b55afd..de9e35e 100644
--- a/os/access.c
+++ b/os/access.c
@@ -76,11 +76,7 @@ SOFTWARE.
#include <errno.h>
#include <sys/types.h>
#ifndef WIN32
-#ifndef Lynx
#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
#include <sys/ioctl.h>
#include <ctype.h>
@@ -177,11 +173,7 @@ SOFTWARE.
#endif /* WIN32 */
#ifndef PATH_MAX
-#ifndef Lynx
#include <sys/param.h>
-#else
-#include <param.h>
-#endif
#ifndef PATH_MAX
#ifdef MAXPATHLEN
#define PATH_MAX MAXPATHLEN
diff --git a/os/connection.c b/os/connection.c
index ba16044..98bb35b 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -83,11 +83,7 @@ SOFTWARE.
#include <stdlib.h>
#ifndef WIN32
-#if defined(Lynx)
-#include <socket.h>
-#else
#include <sys/socket.h>
-#endif
#ifdef hpux
#include <sys/utsname.h>
@@ -128,11 +124,8 @@ SOFTWARE.
# include <arpa/inet.h>
#endif
-#ifndef Lynx
#include <sys/uio.h>
-#else
-#include <uio.h>
-#endif
+
#endif /* WIN32 */
#include "misc.h" /* for typedef of pointer */
#include "osdep.h"
diff --git a/os/io.c b/os/io.c
index 4f4a109..e1d43e5 100644
--- a/os/io.c
+++ b/os/io.c
@@ -70,11 +70,7 @@ SOFTWARE.
#include <X11/Xmd.h>
#include <errno.h>
#if !defined(WIN32)
-#ifndef Lynx
#include <sys/uio.h>
-#else
-#include <uio.h>
-#endif
#endif
#include <X11/X.h>
#define NEED_REPLIES
diff --git a/os/osinit.c b/os/osinit.c
index 16a45ca..1b58e1a 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -67,11 +67,11 @@ SOFTWARE.
#endif
#endif
-#if defined(Lynx) || defined(__SCO__)
+#if defined(__SCO__)
#include <sys/wait.h>
#endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
#include <sys/resource.h>
#endif
diff --git a/os/utils.c b/os/utils.c
index 11a5702..f547926 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -94,7 +94,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#ifndef WIN32
#include <sys/wait.h>
#endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4)
#include <sys/resource.h>
#endif
#include <sys/stat.h>
@@ -295,11 +295,7 @@ OsSignal(sig, handler)
#endif
#ifndef PATH_MAX
-#ifndef Lynx
#include <sys/param.h>
-#else
-#include <param.h>
-#endif
#ifndef PATH_MAX
#ifdef MAXPATHLEN
#define PATH_MAX MAXPATHLEN
diff --git a/os/xdmcp.c b/os/xdmcp.c
index d896c8b..ba39284 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -24,12 +24,8 @@
#include <X11/Xos.h>
#if !defined(WIN32)
-#ifndef Lynx
#include <sys/param.h>
#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
#include <netinet/in.h>
#include <netdb.h>
#endif
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index d3b585a..3f45e23 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/keysym.h>
#include "inputstr.h"
#include <xkbsrv.h>
-#if !defined(WIN32) && !defined(Lynx)
+#if !defined(WIN32)
#include <sys/time.h>
#endif
More information about the xorg-commit
mailing list