From 11810e05e40e24de14a3f0213f978853ba632e9f Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
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')

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 <Windows.h>
-	#include <Winsock2.h>
-#else
-	#include <sys/types.h>
-	#include <sys/stat.h>   // for mkdir
-	#include <sys/time.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <arpa/inet.h>
-	#include <netdb.h>
-	#include <time.h>
-	#include <dirent.h>
-	#include <errno.h>
-	#include <iostream>
-
-	#include <cstdio>
-	#include <cstring>
-	#include <pthread.h>
-	#include <semaphore.h>
-	#include <errno.h>
-	#include <fcntl.h>
-	#include <tr1/memory>
-#endif
-
-
-
-
-
-// CRT stuff:
-#include <assert.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-
-
-
-
-// STL stuff:
-#include <vector>
-#include <list>
-#include <string>
-#include <map>
-#include <algorithm>
-#include <memory>
-
-
-
-
-
-// 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