summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Schulz <arny@ats.s.bawue.de>2011-06-06 14:59:54 +0000
committerTim Angus <tim@ngus.net>2013-01-09 22:38:48 +0000
commit83a9bacbe185ccd6b21e5fd18085b8fdce306cc9 (patch)
tree1897fad9419b58eae97097391f3c2c39c5026b56
parenta73af207d3c20cb8eafe68c3bcad805891f18ddd (diff)
OpenBSD compile fixes, patch provided by Jonathan Gray (#4994)
-rw-r--r--Makefile5
-rw-r--r--src/qcommon/net_ip.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 03691b67..56d56864 100644
--- a/Makefile
+++ b/Makefile
@@ -637,11 +637,10 @@ else # ifeq freebsd
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 =
diff --git a/src/qcommon/net_ip.c b/src/qcommon/net_ip.c
index 682f4689..d7dc8b5f 100644
--- a/src/qcommon/net_ip.c
+++ b/src/qcommon/net_ip.c
@@ -64,11 +64,11 @@ static qboolean winsockInitialized = qfalse;
# 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>