diff options
| author | Neo2003 <none@none> | 2008-10-04 06:17:19 -0500 |
|---|---|---|
| committer | Neo2003 <none@none> | 2008-10-04 06:17:19 -0500 |
| commit | 5651828bf74edb760d67700942fc65d51c816e0a (patch) | |
| tree | 1631f319bbc293794109f990beaccfd5b6cee8fe /src/shared/Common.h | |
| parent | ca7a4bf1a78a1ddc6eb21238cc2a1633194a11cc (diff) | |
[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
--HG--
branch : trunk
rename : 6700-670 => 6721-676
Diffstat (limited to 'src/shared/Common.h')
| -rw-r--r-- | src/shared/Common.h | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/src/shared/Common.h b/src/shared/Common.h index 4e93ad71eb2..36d6bc5e5ae 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -19,6 +19,44 @@ #ifndef MANGOSSERVER_COMMON_H #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" #if COMPILER == COMPILER_MICROSOFT @@ -43,10 +81,6 @@ #endif // __SHOW_STUPID_WARNINGS__ #endif // __GNUC__ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "Utilities/HashMap.h" #include <stdio.h> #include <stdlib.h> @@ -76,8 +110,8 @@ #include <zthread/Thread.h> #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 //#define _WIN32_WINNT 0x0501 |