pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 07:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uleat 2014-10-16 19:20:49 -04:00
commit f805ddf319
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

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

3
common/unix.h
View File

@ -18,9 +18,6 @@
#ifndef _WINDOWS #ifndef _WINDOWS
#ifndef __UNIX_H__ #ifndef __UNIX_H__
#define __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> #include <unistd.h>
typedef int SOCKET; typedef int SOCKET;

1
luabind/luabind/detail/object_rep.hpp
View File

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

1
zone/raids.cpp
View File

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