From 82a39224b9a35ebc0c2905a206e8c2b450491710 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sun, 10 Jun 2007 04:52:39 +0000
Subject: [PATCH] fix more Mac errors for new UDP/IP

---
 CHANGELOG.txt          | 1 +
 arch/linux/arch_ip.cpp | 8 ++++++++
 main/ip_base.cpp       | 4 ++++
 main/ipclient.cpp      | 4 ++++
 main/netmisc.h         | 4 ++--
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4bd3180e3..57adb778f 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -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
 --------
diff --git a/arch/linux/arch_ip.cpp b/arch/linux/arch_ip.cpp
index 49b50fc69..aec230688 100755
--- a/arch/linux/arch_ip.cpp
+++ b/arch/linux/arch_ip.cpp
@@ -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, ...);
 
diff --git a/main/ip_base.cpp b/main/ip_base.cpp
index 9f8d472b1..56c187eb8 100755
--- a/main/ip_base.cpp
+++ b/main/ip_base.cpp
@@ -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"
diff --git a/main/ipclient.cpp b/main/ipclient.cpp
index 54e18d447..b28810dcf 100755
--- a/main/ipclient.cpp
+++ b/main/ipclient.cpp
@@ -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__
diff --git a/main/netmisc.h b/main/netmisc.h
index f7e7c5a02..10cef2632 100755
--- a/main/netmisc.h
+++ b/main/netmisc.h
@@ -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() \