mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-02-17 01:11:45 +00:00
net_udp.c:
header shuffle net_udp6.c: get compiling under mingw. some icky hacks (and the version of the tpipv6 headers I managed to get had some errors), but it compiles cleanly.
This commit is contained in:
parent
dda09dabd9
commit
4901dd0a53
2 changed files with 23 additions and 8 deletions
|
@ -68,13 +68,13 @@
|
|||
# include <libc.h>
|
||||
#endif
|
||||
|
||||
#include "compat.h"
|
||||
#include "QF/console.h"
|
||||
#include "QF/cvar.h"
|
||||
#include "QF/msg.h"
|
||||
#include "QF/sys.h"
|
||||
#include "QF/qargs.h"
|
||||
|
||||
#include "compat.h"
|
||||
#include "net.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
|
|
|
@ -33,10 +33,30 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
# undef EWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef HAVE_IPV6
|
||||
# include <winsock2.h>
|
||||
# define _DEF_BYTE_
|
||||
# undef IP_MULTICAST_IF
|
||||
# undef IP_MULTICAST_TTL
|
||||
# undef IP_MULTICAST_LOOP
|
||||
# undef IP_ADD_MEMBERSHIP
|
||||
# undef IP_DROP_MEMBERSHIP
|
||||
# define ip_mreq ip_mreq_icky_hack
|
||||
# include <ws2tcpip.h>
|
||||
# undef ip_mreq
|
||||
# ifndef WINSOCK_API_LINKAGE
|
||||
# define WINSOCK_API_LINKAGE
|
||||
# endif
|
||||
# ifndef _WINSOCK2API_
|
||||
# define _WINSOCK2API_
|
||||
# endif
|
||||
# include <tpipv6.h>
|
||||
# define _WINSOCKAPI_
|
||||
# define HAVE_SOCKLEN_T
|
||||
|
@ -49,12 +69,6 @@
|
|||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
#define model_t quakeforgemodel_t
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
# undef EWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
|
||||
#ifndef _WIN32
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
@ -94,11 +108,12 @@
|
|||
|
||||
#include "QF/console.h"
|
||||
#include "QF/msg.h"
|
||||
#include "net.h"
|
||||
#include "QF/qargs.h"
|
||||
#include "QF/qtypes.h"
|
||||
#include "QF/sys.h"
|
||||
|
||||
#include "net.h"
|
||||
|
||||
#ifndef MAXHOSTNAMELEN
|
||||
# define MAXHOSTNAMELEN 512
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue