fix more Mac errors for new UDP/IP
This commit is contained in:
parent
4f0ab045ff
commit
82a39224b9
|
@ -3,6 +3,7 @@ D2X-Rebirth Changelog
|
|||
20070610
|
||||
--------
|
||||
arch/carbon/conf.h, SConstruct: fix Mac errors involving use of 'VERSION'
|
||||
arch/linux/arch_ip.cpp, main/ip_base.cpp, main/ipclient.cpp, main/netmisc.h: fix more Mac errors for new UDP/IP
|
||||
|
||||
20070601
|
||||
--------
|
||||
|
|
|
@ -3,6 +3,10 @@
|
|||
* added 2000/02/07 Matt Mueller (some code borrowed from ipx_udp.c)
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "conf.h"
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <netinet/in.h> /* for htons & co. */
|
||||
#include <unistd.h>
|
||||
|
@ -20,6 +24,10 @@ extern "C" {
|
|||
#include "ip_base.h"
|
||||
#include "ipclient.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
# define ifr_netmask ifr_addr
|
||||
#endif
|
||||
|
||||
static int mysock=-1;
|
||||
extern int nm_messagebox(char *title, int nchoices, ...);
|
||||
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
* ip_base.cpp - base for NAT-compatible udp/ip code.
|
||||
* added 2000/02/07 Matt Mueller
|
||||
*/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "conf.h"
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "timer.h"
|
||||
#include "mono.h"
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
* ipclient.cpp - udp/ip client code
|
||||
* added 2000/02/07 Matt Mueller
|
||||
*/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "conf.h"
|
||||
#endif
|
||||
|
||||
extern "C"{
|
||||
#include <stdlib.h>
|
||||
#ifdef __WINDOWS__
|
||||
|
|
|
@ -61,8 +61,8 @@ void send_netgame_packet(ubyte *server, ubyte *node, ubyte *net_address, int lit
|
|||
send_netgame_packet(server, node, net_address, 1)
|
||||
#define send_internetwork_full_netgame_packet(server, node) \
|
||||
send_netgame_packet(server, node, NULL, 0)
|
||||
#define send_internetwork_lite_netgame_packet(server, node) \
|
||||
send_netgame_packet(server, node, NULL, 1)
|
||||
#define send_internetwork_lite_netgame_packet(server, node, extended) \
|
||||
send_netgame_packet(server, node, NULL, !extended)
|
||||
#define send_broadcast_full_netgame_packet() \
|
||||
send_netgame_packet(NULL, NULL, NULL, 0)
|
||||
#define send_broadcast_lite_netgame_packet() \
|
||||
|
|
Loading…
Reference in a new issue