Remove #ifdef Lynx blocks

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

7 files changed, 7 insertions, 38 deletions

diff --git a/choose.c b/choose.c
index 6350e80..bddd820 100644
--- a/choose.c
+++ b/choose.c
@@ -44,11 +44,7 @@ in this Software without prior written authorization from The Open Group.
 # include <arpa/inet.h>
 
 # ifndef X_NO_SYS_UN
-#  ifndef Lynx
-#   include <sys/un.h>
-#  else
-#   include <un.h>
-#  endif
+#  include <sys/un.h>
 # endif
 
 # include <ctype.h>
diff --git a/dm_socket.h b/dm_socket.h
index b56882c..f04517a 100644
--- a/dm_socket.h
+++ b/dm_socket.h
@@ -36,11 +36,7 @@ authorization.
 # include <X11/Xmd.h>
 # include <X11/Xdmcp.h>
 
-# ifndef Lynx
-#  include <sys/socket.h>
-# else
-#  include <socket.h>
-# endif
+# include <sys/socket.h>
 # include <netinet/in.h>
 
 /* ugly, but we need this after socket.h */
diff --git a/netaddr.c b/netaddr.c
index dc97476..0588935 100644
--- a/netaddr.c
+++ b/netaddr.c
@@ -43,11 +43,7 @@ from The Open Group.
 
 # ifdef UNIXCONN
 #  ifndef X_NO_SYS_UN
-#   ifndef Lynx
-#    include <sys/un.h>		/* struct sockaddr_un */
-#   else
-#    include <un.h>			/* struct sockaddr_un */
-#   endif
+#   include <sys/un.h>		/* struct sockaddr_un */
 #  endif
 # endif
 # ifdef DNETCONN
diff --git a/prngc.c b/prngc.c
index d81f611..f0db8eb 100644
--- a/prngc.c
+++ b/prngc.c
@@ -27,11 +27,7 @@
 #include <sys/socket.h>
 #include <X11/Xos.h>
 #ifndef X_NO_SYS_UN
-# ifndef Lynx
-#  include	<sys/un.h>
-# else
-#  include	<un.h>
-# endif
+# include	<sys/un.h>
 #endif
 #include <netinet/in.h>
 #include <errno.h>
diff --git a/session.c b/session.c
index 68eced3..ab10269 100644
--- a/session.c
+++ b/session.c
@@ -974,10 +974,3 @@ systemEnv (struct display *d, char *user, char *home)
 	    env = setEnv (env, "WINDOWPATH", d->windowPath);
     return env;
 }
-
-#if (defined(Lynx) && !defined(HAS_CRYPT))
-char *crypt(char *s1, char *s2)
-{
-	return(s2);
-}
-#endif
diff --git a/socket.c b/socket.c
index 7b113c8..16d43d8 100644
--- a/socket.c
+++ b/socket.c
@@ -44,11 +44,7 @@ from the copyright holder.
 #  include "dm_socket.h"
 
 #  ifndef X_NO_SYS_UN
-#   ifndef Lynx
-#    include <sys/un.h>
-#   else
-#    include <un.h>
-#   endif
+#   include <sys/un.h>
 #  endif
 #  include <netdb.h>
 #  include <arpa/inet.h>
diff --git a/xdmcp.c b/xdmcp.c
index 5026665..35b4de5 100644
--- a/xdmcp.c
+++ b/xdmcp.c
@@ -47,11 +47,7 @@ from The Open Group.
 # include	"dm_socket.h"
 
 # ifndef X_NO_SYS_UN
-#  ifndef Lynx
-#   include	<sys/un.h>
-#  else
-#   include	<un.h>
-#  endif
+#  include	<sys/un.h>
 # endif
 # include	<netdb.h>
 # include	<arpa/inet.h>
@@ -826,7 +822,7 @@ forward_respond (
 		    memmove( un_addr.sun_path, clientAddress.data, clientAddress.length);
 		    un_addr.sun_path[clientAddress.length] = '\0';
 		    client = (struct sockaddr *) &un_addr;
-#  if defined(BSD44SOCKETS) && !defined(Lynx) && defined(UNIXCONN)
+#  if defined(BSD44SOCKETS) && defined(UNIXCONN)
 		    un_addr.sun_len = strlen(un_addr.sun_path);
 		    clientlen = SUN_LEN(&un_addr);
 #  else