diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:51 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:51 +0000 |
| commit | 9826b83826190e514ed115e15691ca015780f9bc (patch) | |
| tree | e6ede7a76c2edc14ff3025fbc0fb65757327cde0 /os/xdmcp.c | |
| parent | cecb668149e1956fb29bc89855182349122e2f4e (diff) | |
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
Diffstat (limited to 'os/xdmcp.c')
| -rw-r--r-- | os/xdmcp.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/os/xdmcp.c b/os/xdmcp.c index d0f73513a..6cf792937 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.2 2004/04/23 19:54:28 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.3 2004/07/20 15:15:13 ago Exp $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. @@ -17,17 +17,7 @@ /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ #ifdef WIN32 -/* avoid conflicting definitions */ -#define BOOL wBOOL -#define ATOM wATOM -#define FreeResource wFreeResource -#include <winsock.h> -#undef BOOL -#undef ATOM -#undef FreeResource -#undef CreateWindowA -#undef RT_FONT -#undef RT_CURSOR +#include <Xwinsock.h> #endif #include "Xos.h" @@ -1548,7 +1538,9 @@ get_addr_by_name( #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif - +#if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN)) + _XSERVTransWSAStartup(); +#endif if (!(hep = _XGethostbyname(namestr, hparams))) { FatalError("Xserver: %s unknown host: %s\n", argtype, namestr); |