From 11810e05e40e24de14a3f0213f978853ba632e9f Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 9 Mar 2012 09:39:48 +0000 Subject: Using the _DEBUG macro for *nix debug builds as well; trying to force 8-byte alignment on critical sections ( http://forum.mc-server.org/showthread.php?tid=384 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@387 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- WebServer/Globals.h | 96 +---------------------------------------------------- 1 file changed, 1 insertion(+), 95 deletions(-) (limited to 'WebServer/Globals.h') diff --git a/WebServer/Globals.h b/WebServer/Globals.h index 2ef0b70ac..fd31ba703 100644 --- a/WebServer/Globals.h +++ b/WebServer/Globals.h @@ -8,101 +8,7 @@ -// Compiler-dependent stuff: -#ifndef _MSC_VER - // Non-MS compilers don't know the override keyword - #define override -#else - // MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether - #pragma warning(disable:4481) -#endif // _MSC_VER - - - - - -// A macro to disallow the copy constructor and operator= functions -// This should be used in the private: declarations for any class that shouldn't allow copying itself -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName &); \ - void operator=(const TypeName &) - - - - - -// OS-dependent stuff: -#ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - #include - #include -#else - #include - #include // for mkdir - #include - #include - #include - #include - #include - #include - #include - #include - #include - - #include - #include - #include - #include - #include - #include - #include -#endif - - - - - -// CRT stuff: -#include -#include -#include - - - - - -// STL stuff: -#include -#include -#include -#include -#include -#include - - - - - -// Common headers: -#include "../source/StringUtils.h" -#include "../source/cCriticalSection.h" -#include "../source/cMCLogger.h" - - - - - -// Common definitions: - -/// Evaluates to the number of elements in an array (compile-time!) -#define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X))) - -// sprintf_s is the preferred call in MSVC ("secure"); make it *nix-compatible: -#ifndef _WIN32 - #define sprintf_s(dst, size, format, ...) sprintf(dst, format, __VA_ARGS__ ) - #define vsnprintf_s(buffer, buffer_size, maxcount, stringbuffer, ...) (vsnprintf(buffer, maxcount, stringbuffer, __VA_ARGS__)) -#endif // _WIN32 - +#include "../source/Globals.h" -- cgit v1.2.3