Commit 4ab02b27 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

undef Lynx

parent 89cea600
...@@ -56,11 +56,7 @@ from The Open Group. ...@@ -56,11 +56,7 @@ from The Open Group.
#include <nx-X11/Xos.h> #include <nx-X11/Xos.h>
#ifndef WIN32 #ifndef WIN32
#ifndef Lynx
#include <sys/socket.h> #include <sys/socket.h>
#else
#include <socket.h>
#endif
#endif #endif
...@@ -210,11 +206,7 @@ struct iovec { ...@@ -210,11 +206,7 @@ struct iovec {
}; };
#else #else
#ifndef Lynx
#include <sys/uio.h> #include <sys/uio.h>
#else
#include <uio.h>
#endif
#endif #endif
typedef struct _XtransConnInfo *XtransConnInfo; typedef struct _XtransConnInfo *XtransConnInfo;
......
...@@ -87,11 +87,7 @@ from The Open Group. ...@@ -87,11 +87,7 @@ from The Open Group.
#include <errno.h> #include <errno.h>
#ifndef WIN32 #ifndef WIN32
# ifndef Lynx
# include <sys/socket.h> # include <sys/socket.h>
# else
# include <socket.h>
# endif
# include <netinet/in.h> # include <netinet/in.h>
# include <arpa/inet.h> # include <arpa/inet.h>
......
...@@ -155,7 +155,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path) ...@@ -155,7 +155,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
return 0; return 0;
} }
strcpy (sunaddr->sun_path, sun_path); strcpy (sunaddr->sun_path, sun_path);
#if defined(BSD44SOCKETS) && !defined(Lynx) #if defined(BSD44SOCKETS)
sunaddr->sun_len = strlen (sunaddr->sun_path); sunaddr->sun_len = strlen (sunaddr->sun_path);
#endif #endif
...@@ -182,7 +182,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path) ...@@ -182,7 +182,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
return 0; return 0;
} }
strcpy (p_sunaddr->sun_path, peer_sun_path); strcpy (p_sunaddr->sun_path, peer_sun_path);
#if defined(BSD44SOCKETS) && !defined(Lynx) #if defined(BSD44SOCKETS)
p_sunaddr->sun_len = strlen (p_sunaddr->sun_path); p_sunaddr->sun_len = strlen (p_sunaddr->sun_path);
#endif #endif
...@@ -616,7 +616,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status) ...@@ -616,7 +616,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
sunaddr->sun_family=AF_UNIX; sunaddr->sun_family=AF_UNIX;
strcpy(sunaddr->sun_path,buf); strcpy(sunaddr->sun_path,buf);
#if defined(BSD44SOCKETS) && !defined(Lynx) #if defined(BSD44SOCKETS)
sunaddr->sun_len=strlen(sunaddr->sun_path); sunaddr->sun_len=strlen(sunaddr->sun_path);
#endif #endif
......
...@@ -108,11 +108,7 @@ from the copyright holders. ...@@ -108,11 +108,7 @@ from the copyright holders.
#ifdef UNIXCONN #ifdef UNIXCONN
#ifndef X_NO_SYS_UN #ifndef X_NO_SYS_UN
#ifndef Lynx
#include <sys/un.h> #include <sys/un.h>
#else
#include <un.h>
#endif
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
...@@ -1720,7 +1716,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port, ...@@ -1720,7 +1716,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port,
#endif #endif
} }
#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx) #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__))
sockname.sun_len = strlen(sockname.sun_path); sockname.sun_len = strlen(sockname.sun_path);
namelen = SUN_LEN(&sockname); namelen = SUN_LEN(&sockname);
#else #else
...@@ -2632,7 +2628,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) ...@@ -2632,7 +2628,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
return TRANS_CONNECT_FAILED; return TRANS_CONNECT_FAILED;
} }
#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx) #if (defined(BSD44SOCKETS) || defined(__UNIXWARE__))
sockname.sun_len = strlen (sockname.sun_path); sockname.sun_len = strlen (sockname.sun_path);
namelen = SUN_LEN (&sockname); namelen = SUN_LEN (&sockname);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment