diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-12 22:27:34 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:46:36 +0100 |
| commit | 4ab02b27c2a8ba0e913e0a3319360c3feacb59e3 (patch) | |
| tree | 061ed6fa01c9bf16dbec1d150dbfcc3ed77c1c3e /nx-X11 | |
| parent | 89cea600a076608bbcb59cc207ca4ab60ca9f0ee (diff) | |
| download | nx-libs-4ab02b27c2a8ba0e913e0a3319360c3feacb59e3.tar.gz nx-libs-4ab02b27c2a8ba0e913e0a3319360c3feacb59e3.tar.bz2 nx-libs-4ab02b27c2a8ba0e913e0a3319360c3feacb59e3.zip | |
undef Lynx
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/lib/xtrans/Xtrans.h | 8 | ||||
| -rw-r--r-- | nx-X11/lib/xtrans/Xtransint.h | 4 | ||||
| -rw-r--r-- | nx-X11/lib/xtrans/Xtranslcl.c | 6 | ||||
| -rw-r--r-- | nx-X11/lib/xtrans/Xtranssock.c | 8 |
4 files changed, 5 insertions, 21 deletions
diff --git a/nx-X11/lib/xtrans/Xtrans.h b/nx-X11/lib/xtrans/Xtrans.h index e68657ef5..25979673a 100644 --- a/nx-X11/lib/xtrans/Xtrans.h +++ b/nx-X11/lib/xtrans/Xtrans.h @@ -56,11 +56,7 @@ from The Open Group. #include <nx-X11/Xos.h> #ifndef WIN32 -#ifndef Lynx #include <sys/socket.h> -#else -#include <socket.h> -#endif #endif @@ -210,11 +206,7 @@ struct iovec { }; #else -#ifndef Lynx #include <sys/uio.h> -#else -#include <uio.h> -#endif #endif typedef struct _XtransConnInfo *XtransConnInfo; diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/xtrans/Xtransint.h index ef4483313..d4e736d49 100644 --- a/nx-X11/lib/xtrans/Xtransint.h +++ b/nx-X11/lib/xtrans/Xtransint.h @@ -87,11 +87,7 @@ from The Open Group. #include <errno.h> #ifndef WIN32 -# ifndef Lynx # include <sys/socket.h> -# else -# include <socket.h> -# endif # include <netinet/in.h> # include <arpa/inet.h> diff --git a/nx-X11/lib/xtrans/Xtranslcl.c b/nx-X11/lib/xtrans/Xtranslcl.c index f504338aa..71f19a19f 100644 --- a/nx-X11/lib/xtrans/Xtranslcl.c +++ b/nx-X11/lib/xtrans/Xtranslcl.c @@ -155,7 +155,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path) return 0; } strcpy (sunaddr->sun_path, sun_path); -#if defined(BSD44SOCKETS) && !defined(Lynx) +#if defined(BSD44SOCKETS) sunaddr->sun_len = strlen (sunaddr->sun_path); #endif @@ -182,7 +182,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path) return 0; } 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); #endif @@ -616,7 +616,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status) sunaddr->sun_family=AF_UNIX; strcpy(sunaddr->sun_path,buf); -#if defined(BSD44SOCKETS) && !defined(Lynx) +#if defined(BSD44SOCKETS) sunaddr->sun_len=strlen(sunaddr->sun_path); #endif diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index 748340c0f..3e4896fce 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -108,11 +108,7 @@ from the copyright holders. #ifdef UNIXCONN #ifndef X_NO_SYS_UN -#ifndef Lynx #include <sys/un.h> -#else -#include <un.h> -#endif #endif #include <sys/stat.h> #endif @@ -1720,7 +1716,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port, #endif } -#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx) +#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) sockname.sun_len = strlen(sockname.sun_path); namelen = SUN_LEN(&sockname); #else @@ -2632,7 +2628,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) return TRANS_CONNECT_FAILED; } -#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) && !defined(Lynx) +#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__)) sockname.sun_len = strlen (sockname.sun_path); namelen = SUN_LEN (&sockname); #else |