aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-04-05 14:28:57 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-04-05 14:28:57 +0000
commit524ae69d527e2ce41f2e7dc3050b2fcc17264878 (patch)
tree867be76fedde994326a523ae6bf2230c7caaf14b /code
parent3d25e1b33c420b410fc8514732cfa8cc304b10cd (diff)
downloadioquake3-aero-524ae69d527e2ce41f2e7dc3050b2fcc17264878.tar.gz
ioquake3-aero-524ae69d527e2ce41f2e7dc3050b2fcc17264878.zip
- include Winsock2.h for windows
- add a __BSD__ define for all bsd platforms if it doesn't exist. git-svn-id: svn://svn.icculus.org/quake3/trunk@1292 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/qcommon/net_ip.c2
-rw-r--r--code/qcommon/q_platform.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
index 0002a6a..41918e9 100644
--- a/code/qcommon/net_ip.c
+++ b/code/qcommon/net_ip.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/qcommon.h"
#ifdef _WIN32
-// #include <winsock.h>
+#include <Winsock2.h>
#include <Ws2tcpip.h>
#include <Wspiapi.h>
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index be57ef7..1152fdf 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -175,6 +175,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <sys/types.h>
#include <machine/endian.h>
+#ifndef __BSD__
+ #define __BSD__
+#endif
+
#if defined(__FreeBSD__)
#define OS_STRING "freebsd"
#elif defined(__OpenBSD__)