From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001 From: Seline Date: Tue, 14 Oct 2008 11:57:03 -0500 Subject: [svn] * Merge Temp dev SVN with Assembla. * Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk --- src/shared/Mthread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shared/Mthread.cpp') diff --git a/src/shared/Mthread.cpp b/src/shared/Mthread.cpp index 0dfaac4fcf7..8985b9cebc8 100644 --- a/src/shared/Mthread.cpp +++ b/src/shared/Mthread.cpp @@ -20,9 +20,9 @@ #include "Mthread.h" #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE_CC__) -# define MANGOS_PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE +# define TRINITY_PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE #else -# define MANGOS_PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP +# define TRINITY_PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP #endif #if PLATFORM != PLATFORM_WINDOWS @@ -73,7 +73,7 @@ MMutex::MMutex () if (!attr_refcount++) { pthread_mutexattr_init (&attr); - pthread_mutexattr_settype (&attr, MANGOS_PTHREAD_MUTEX_RECURSIVE); + pthread_mutexattr_settype (&attr, TRINITY_PTHREAD_MUTEX_RECURSIVE); } pthread_mutex_init (&mutex, &attr); -- cgit v1.2.3