summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorveider <veider@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 21:51:46 +0000
committerveider <veider@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 21:51:46 +0000
commitbb2bdd9bca136495ab3a4b31755d58f97548f279 (patch)
treea76b56ac31831b1a6cee1059c3aad5cd2c7d78b3
parent3fa3357e7646c4f60bedd5cd343f6abcb1a3cb6e (diff)
downloadhercules-bb2bdd9bca136495ab3a4b31755d58f97548f279.tar.gz
hercules-bb2bdd9bca136495ab3a4b31755d58f97548f279.tar.bz2
hercules-bb2bdd9bca136495ab3a4b31755d58f97548f279.tar.xz
hercules-bb2bdd9bca136495ab3a4b31755d58f97548f279.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1339 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Makefile2
-rw-r--r--src/common/socket.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 65b191e50..07d7a54b2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ CC = gcc -pipe
GCLIB =
# GCLIB = -ldmalloc
-PACKETDEF = -DPACKETVER=6 -DNEW_006b -DSO_REUSEPORT
+PACKETDEF = -DPACKETVER=6 -DNEW_006b
#PACKETDEF = -DPACKETVER=5 -DNEW_006b
#PACKETDEF = -DPACKETVER=4 -DNEW_006b
#PACKETDEF = -DPACKETVER=3 -DNEW_006b
diff --git a/src/common/socket.h b/src/common/socket.h
index 130c33d0c..a78b71ad1 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -14,6 +14,10 @@
#include <netinet/in.h>
#endif
#include <time.h>
+// SO_REUSEPORT is predefined in FreeBSD in sys/socket.h so we only have to define if it's not
+#ifndef SO_REUSEPORT
+#define SO_REUSEPORT
+#endif
#include "malloc.h"