Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 39 insertions, 0 deletions

diff --git a/externals/ace/config-minimal.h b/externals/ace/config-minimal.h
new file mode 100644
index 00000000000..4cf2e8a487b
--- /dev/null
+++ b/externals/ace/config-minimal.h
@@ -0,0 +1,39 @@
+/* -*- C++ -*- */
+// $Id: config-minimal.h 80826 2008-03-04 14:51:23Z wotte $
+
+// This configuration file is designed to build only the minimal
+// ACE_OS adaptation layer.
+
+#ifndef ACE_CONFIG_MINIMAL_H
+#define ACE_CONFIG_MINIMAL_H
+#include /**/ "ace/pre.h"
+
+#define ACE_HAS_MINIMAL_ACE_OS
+
+// Only instantiate the ACE_OS_Object_Manager.
+#define ACE_MAIN_OBJECT_MANAGER \
+  ACE_OS_Object_Manager ace_os_object_manager;
+
+#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER)
+  // To prevent use of ACE_Thread_Exit functions in
+  // ACE_Thread_Adapter::invoke ().
+# define ACE_USE_THREAD_MANAGER_ADAPTER
+#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */
+
+#if defined (ACE_ASSERT)
+# undef ACE_ASSERT
+#endif /* ACE_ASSERT */
+#define ACE_ASSERT(x)
+
+#if defined (ACE_DEBUG)
+# undef ACE_DEBUG
+#endif /* ACE_DEBUG */
+#define ACE_DEBUG(x)
+
+#if defined (ACE_ERROR)
+# undef ACE_ERROR
+#endif /* ACE_ERROR */
+#define ACE_ERROR(x)
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_MINIMAL_H */