Changeset 6 for trunk/src/shared

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Location:

trunk/src/shared

Files:

• Common.h (modified) (3 diffs)
• Database/DBCStructure.h (modified) (1 diff)
• Database/DBCfmt.cpp (modified) (1 diff)
• Database/DatabaseEnv.h (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Timer.h (modified) (1 diff)

trunk/src/shared/Common.h

@@ -20 +20 @@
 #define MANGOSSERVER_COMMON_H
 
+// config.h needs to be included 1st
+// TODO this thingy looks like hack ,but its not, need to
+// make separate header however, because It makes mess here.
+#ifdef HAVE_CONFIG_H
+// Remove Some things that we will define 
+// This is in case including another config.h 
+// before trinity config.h 
+#ifdef PACKAGE
+#undef PACKAGE
+#endif //PACKAGE
+#ifdef PACKAGE_BUGREPORT
+#undef PACKAGE_BUGREPORT
+#endif //PACKAGE_BUGREPORT
+#ifdef PACKAGE_NAME
+#undef PACKAGE_NAME
+#endif //PACKAGE_NAME
+#ifdef PACKAGE_STRING
+#undef PACKAGE_STRING
+#endif //PACKAGE_STRING
+#ifdef PACKAGE_TARNAME
+#undef PACKAGE_TARNAME
+#endif //PACKAGE_TARNAME
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif //PACKAGE_VERSION
+#ifdef VERSION
+#undef VERSION
+#endif //VERSION
+# include "config.h"
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef VERSION
+#endif //HAVE_CONFIG_H
+
 #include "Platform/Define.h"
 
@@ -43 +81 @@
 #endif                                                      // __SHOW_STUPID_WARNINGS__
 #endif                                                      // __GNUC__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include "Utilities/HashMap.h"
@@ -77 +111 @@
 
 #if PLATFORM == PLATFORM_WINDOWS
-#  define FD_SETSIZE 1024
-#  include <winsock2.h>
+#  define FD_SETSIZE 4096
+#  include <ace/config-all.h>
 // XP winver - needed to compile with standard leak check in MemoryLeaks.h
 // uncomment later if needed

trunk/src/shared/Database/DBCStructure.h

@@ -596 +596 @@
     uint32    TargetCreatureType;                           // 15
     uint32    RequiresSpellFocus;                           // 16
-    //uint32    FacingCasterFlags;                          // 17 not used
+    uint32    FacingCasterFlags;                            // 17
     uint32    CasterAuraState;                              // 18
     uint32    TargetAuraState;                              // 19

trunk/src/shared/Database/DBCfmt.cpp

@@ -61 +61 @@
 const char SpellCastTimefmt[]="nixx";
 const char SpellDurationfmt[]="niii";
-const char SpellEntryfmt[]="nixiiiiiiiixiiiiixiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffffffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffixiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiixfffxxxiiii";
+const char SpellEntryfmt[]="nixiiiiiiiixiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffffffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffixiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiixfffxxxiiii";
 const char SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx";
 const char SpellItemEnchantmentfmt[]="niiiiiixxxiiissssssssssssssssxiiii";

trunk/src/shared/Database/DatabaseEnv.h

@@ -35 +35 @@
 #define _LIKE_          "ILIKE"
 #define _TABLE_SIM_     "\""
+#define _CONCAT3_(A,B,C) "( " A " || " B " || " C " )"
 #else
 #include "Database/QueryResultMysql.h"
@@ -44 +45 @@
 #define _LIKE_          "LIKE"
 #define _TABLE_SIM_     "`"
+#define _CONCAT3_(A,B,C) "CONCAT( " A " , " B " , " C " )"
 #endif
 

trunk/src/shared/Makefile.am

@@ -31 +31 @@
 $(POSTGRE_INCLUDES) \
 -I$(top_srcdir)/dep/include \
+-I$(top_srcdir)/dep/ACE_wrappers \
+-I$(top_builddir)/dep/ACE_wrappers \
 -I$(top_srcdir)/src/framework
 

trunk/src/shared/Timer.h

@@ -23 +23 @@
 
 #if PLATFORM == PLATFORM_WINDOWS
-#   include <windows.h>
+#   include <ace/config-all.h>
 #   include <mmsystem.h>
 #   include <time.h>