[quake3-commits] r2008 - in trunk: . code/qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-06 10:59:54 -0400 (Mon, 06 Jun 2011)
New Revision: 2008

Modified:
   trunk/Makefile
   trunk/code/qcommon/net_ip.c
Log:
OpenBSD compile fixes, patch provided by Jonathan Gray (#4994)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-06-06 14:54:18 UTC (rev 2007)
+++ trunk/Makefile	2011-06-06 14:59:54 UTC (rev 2008)
@@ -648,11 +648,10 @@
 
 ifeq ($(PLATFORM),openbsd)
 
-  #default to i386, no tests done on anything else
-  ARCH=i386
+  ARCH=$(shell uname -m)
 
   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-    -DUSE_ICON
+    -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
   CLIENT_CFLAGS = $(SDL_CFLAGS)
   SERVER_CFLAGS = 
 

Modified: trunk/code/qcommon/net_ip.c
===================================================================
--- trunk/code/qcommon/net_ip.c	2011-06-06 14:54:18 UTC (rev 2007)
+++ trunk/code/qcommon/net_ip.c	2011-06-06 14:59:54 UTC (rev 2008)
@@ -63,11 +63,11 @@
 #		define _BSD_SOCKLEN_T_
 #	endif
 
-#	include <arpa/inet.h>
+#	include <sys/socket.h>
 #	include <errno.h>
 #	include <netdb.h>
 #	include <netinet/in.h>
-#	include <sys/socket.h>
+#	include <arpa/inet.h>
 #	include <net/if.h>
 #	include <sys/ioctl.h>
 #	include <sys/types.h>