diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
| commit | 107e72b038bc76953dc97d4ea655c9bde10e5865 (patch) | |
| tree | a5c7cd9dc1857fd972683481fa39f6eba685b32e /nx-X11/programs/Xserver/os/connection.c | |
| parent | a9b145d466f774d0a6948a493df2e9c7bff50d6f (diff) | |
| parent | 6a186b9217e0e3ca10f285f90e5afcdd22dc6c2e (diff) | |
| download | nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.gz nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.bz2 nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.zip | |
Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.x
Attributes GH PR #268: https://github.com/ArcticaProject/nx-libs/pull/268
Diffstat (limited to 'nx-X11/programs/Xserver/os/connection.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 9cba17864..9681ced38 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -112,7 +112,7 @@ SOFTWARE. extern __const__ int _nfiles; #endif -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) # include <netinet/in.h> # include <arpa/inet.h> # if !defined(hpux) @@ -156,10 +156,6 @@ extern __const__ int _nfiles; #define Pid_t pid_t #endif -#ifdef DNETCONN -#include <netdnet/dn.h> -#endif /* DNETCONN */ - int lastfdesc; /* maximum file descriptor */ fd_set WellKnownConnections; /* Listener mask */ @@ -600,12 +596,12 @@ AuthAudit (ClientPtr client, Bool letin, switch (saddr->sa_family) { case AF_UNSPEC: -#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(LOCALCONN) case AF_UNIX: #endif strcpy(out, "local host"); break; -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN) +#if defined(TCPCONN) || defined(MNX_TCPCONN) case AF_INET: sprintf(out, "IP %s", inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr)); @@ -620,12 +616,6 @@ AuthAudit (ClientPtr client, Bool letin, break; #endif #endif -#ifdef DNETCONN - case AF_DECnet: - sprintf(out, "DN %s", - dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add)); - break; -#endif default: strcpy(out, "unknown address"); } |