summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorMathieu BĂ©rard <mathieu.berard@crans.org>2008-07-17 11:59:24 -0400
committerAdam Jackson <ajax@redhat.com>2008-07-17 11:59:24 -0400
commit47833eef35b20a2eb0a74782edbb0877fd491c4c (patch)
treeaaec5b3d232640f4d1ec97148beda8de4e4dcdb2 /os
parentaf2138bfce34a28312b26106eaf9561d96712ee0 (diff)
Drop a bunch of #ifdef Lynx.
Diffstat (limited to 'os')
-rw-r--r--os/access.c8
-rw-r--r--os/connection.c9
-rw-r--r--os/io.c4
-rw-r--r--os/osinit.c4
-rw-r--r--os/utils.c6
-rw-r--r--os/xdmcp.c4
6 files changed, 4 insertions, 31 deletions
diff --git a/os/access.c b/os/access.c
index 6b55afd84..de9e35e0b 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 ba1604490..98bb35bcd 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 4f4a10903..e1d43e50b 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 16a45caf7..1b58e1afe 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 11a5702f6..f547926fd 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 d896c8ba3..ba39284f1 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