Merge branch 'master' of https://github.com/EQEmu/Server

CMakeLists.txt

@@ -126,6 +126,7 @@ ENDIF(MSVC)
 IF(UNIX)
 	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 		ADD_DEFINITIONS(-DFREEBSD)
+		ADD_DEFINITIONS(-D_GLIBCXX_USE_C99)
 		SET(FREEBSD TRUE)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")

common/unix.h

@@ -18,9 +18,6 @@
 #ifndef _WINDOWS
 #ifndef __UNIX_H__
 #define __UNIX_H__
-	#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-		#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER}
-	#endif
 #include <unistd.h>
 
 typedef int SOCKET;

luabind/luabind/detail/object_rep.hpp

@@ -28,6 +28,7 @@
 #include <luabind/config.hpp>
 #include <luabind/detail/instance_holder.hpp>
 #include <luabind/detail/ref.hpp>
+#include <cstdlib>
 
 namespace luabind { namespace detail
 {

zone/raids.cpp

@@ -262,7 +262,6 @@ void Raid::SaveRaidLeaderAA()
 {
 	char *queryBuffer = new char[sizeof(RaidLeadershipAA_Struct) * 2 + 1];
 	database.DoEscapeString(queryBuffer, (char*)&raid_aa, sizeof(RaidLeadershipAA_Struct));
-	_hex(NET__ERROR, queryBuffer, sizeof(RaidLeadershipAA_Struct));
 
 	std::string query = "UPDATE raid_leaders SET leadershipaa = '";
 	query += queryBuffer;