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/utils.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/utils.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 8c69b1346..9584dadd3 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -131,7 +131,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <stdlib.h> /* for malloc() */ -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) # ifndef WIN32 # include <netdb.h> # endif @@ -1285,7 +1285,7 @@ int set_font_authorizations(char **authorizations, int *authlen, void * client) { #define AUTHORIZATION_NAME "hp-hostname-1" -#if defined(TCPCONN) || defined(STREAMSCONN) +#if defined(TCPCONN) static char *result = NULL; static char *p = NULL; |