aboutsummaryrefslogtreecommitdiff
path: root/src/shared/Common.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-13 18:22:21 -0500
committermegamage <none@none>2009-05-13 18:22:21 -0500
commit25e5c99dec793dfcc45a41873af1760392ee8844 (patch)
treef79107e9d93dc351f5b4f7b05924eed793f067d3 /src/shared/Common.h
parent9dd5a1c6d7a6656b8ec71ff33659acd2294633ad (diff)
[7810] Moved ZThread related code on ACE framework. Author: Ambal
Remove ZThread source code from mangos. --HG-- branch : trunk
Diffstat (limited to 'src/shared/Common.h')
-rw-r--r--src/shared/Common.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/shared/Common.h b/src/shared/Common.h
index 5cbd7f285f6..37ced4c8e11 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -84,6 +84,7 @@
#include <math.h>
#include <errno.h>
#include <signal.h>
+#include <assert.h>
#if PLATFORM == PLATFORM_WINDOWS
#define STRCASECMP stricmp
@@ -99,10 +100,13 @@
#include <sstream>
#include <algorithm>
-#include <zthread/FastMutex.h>
-#include <zthread/LockedQueue.h>
-#include <zthread/Runnable.h>
-#include <zthread/Thread.h>
+#include "LockedQueue.h"
+#include "Threading.h"
+
+#include <ace/Guard_T.h>
+#include <ace/RW_Thread_Mutex.h>
+#include <ace/Thread_Mutex.h>
+
#if PLATFORM == PLATFORM_WINDOWS
# define FD_SETSIZE 4096