diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
| commit | 67599026d01692c52276df6ff5e8332d2413c18f (patch) | |
| tree | b93b8d6643dd6438f0844d48008d6cb9ffee405f /nx-X11/programs/Xserver/os/xdmcp.c | |
| parent | 5a8f1e921b4cafedc9efac22d5fbd2ce05e45ba9 (diff) | |
| parent | cf8797c3c0e9623e5092a2c9f5ea7cb31bc11657 (diff) | |
| download | nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.gz nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.bz2 nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.zip | |
Merge branch 'uli42-pr/various3' into 3.6.x
Attributes GH PR #880: https://github.com/ArcticaProject/nx-libs/pull/880
Diffstat (limited to 'nx-X11/programs/Xserver/os/xdmcp.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/xdmcp.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 3a077d8f4..8da1131ed 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -17,22 +17,13 @@ #include <dix-config.h> #endif -#ifdef WIN32 -#include <nx-X11/Xwinsock.h> -#define XSERV_t -#define TRANS_SERVER -#define TRANS_REOPEN -#include <nx-X11/Xtrans/Xtrans.h> -#endif #include <nx-X11/Xos.h> -#if !defined(WIN32) #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> -#endif #include <stdio.h> #include <stdlib.h> @@ -1507,9 +1498,6 @@ get_addr_by_name( #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif -#if defined(WIN32) && defined(TCPCONN) - _XSERVTransWSAStartup(); -#endif if (!(hep = _XGethostbyname(namestr, hparams))) { FatalError("Xserver: %s unknown host: %s\n", argtype, namestr); |