- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 72 insertions, 75 deletions

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index a47a7434f..731a8b578 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -59,11 +59,11 @@
 // debug function name
 #ifndef __NETBSD__
 #if __STDC_VERSION__ < 199901L
-#   if __GNUC__ >= 2
-#       define __func__ __FUNCTION__
-#   else
-#       define __func__ ""
-#   endif
+#	if __GNUC__ >= 2
+#		define __func__ __FUNCTION__
+#	else
+#		define __func__ ""
+#	endif
 #endif
 #endif
 
@@ -106,56 +106,56 @@
 // Integers with guaranteed _exact_ size.
 //////////////////////////////////////////////////////////////////////////
 
-typedef int8_t      int8;
-typedef int16_t     int16;
-typedef int32_t     int32;
-typedef int64_t     int64;
+typedef int8_t		int8;
+typedef int16_t		int16;
+typedef int32_t		int32;
+typedef int64_t		int64;
 
-typedef int8_t      sint8;
-typedef int16_t     sint16;
-typedef int32_t     sint32;
-typedef int64_t     sint64;
+typedef int8_t		sint8;
+typedef int16_t		sint16;
+typedef int32_t		sint32;
+typedef int64_t		sint64;
 
-typedef uint8_t     uint8;
-typedef uint16_t    uint16;
-typedef uint32_t    uint32;
-typedef uint64_t    uint64;
+typedef uint8_t		uint8;
+typedef uint16_t	uint16;
+typedef uint32_t	uint32;
+typedef uint64_t	uint64;
 
 #undef UINT8_MIN
 #undef UINT16_MIN
 #undef UINT32_MIN
 #undef UINT64_MIN
-#define UINT8_MIN   ((uint8) UINT8_C(0x00))
-#define UINT16_MIN  ((uint16)UINT16_C(0x0000))
-#define UINT32_MIN  ((uint32)UINT32_C(0x00000000))
-#define UINT64_MIN  ((uint64)UINT64_C(0x0000000000000000))
+#define UINT8_MIN	((uint8) UINT8_C(0x00))
+#define UINT16_MIN	((uint16)UINT16_C(0x0000))
+#define UINT32_MIN	((uint32)UINT32_C(0x00000000))
+#define UINT64_MIN	((uint64)UINT64_C(0x0000000000000000))
 
 #undef UINT8_MAX
 #undef UINT16_MAX
 #undef UINT32_MAX
 #undef UINT64_MAX
-#define UINT8_MAX   ((uint8) UINT8_C(0xFF))
-#define UINT16_MAX  ((uint16)UINT16_C(0xFFFF))
-#define UINT32_MAX  ((uint32)UINT32_C(0xFFFFFFFF))
-#define UINT64_MAX  ((uint64)UINT64_C(0xFFFFFFFFFFFFFFFF))
+#define UINT8_MAX	((uint8) UINT8_C(0xFF))
+#define UINT16_MAX	((uint16)UINT16_C(0xFFFF))
+#define UINT32_MAX	((uint32)UINT32_C(0xFFFFFFFF))
+#define UINT64_MAX	((uint64)UINT64_C(0xFFFFFFFFFFFFFFFF))
 
 #undef SINT8_MIN
 #undef SINT16_MIN
 #undef SINT32_MIN
 #undef SINT64_MIN
-#define SINT8_MIN   ((sint8) INT8_C(0x80))
-#define SINT16_MIN  ((sint16)INT16_C(0x8000))
-#define SINT32_MIN  ((sint32)INT32_C(0x80000000))
-#define SINT64_MIN  ((sint32)INT64_C(0x8000000000000000))
+#define SINT8_MIN	((sint8) INT8_C(0x80))
+#define SINT16_MIN	((sint16)INT16_C(0x8000))
+#define SINT32_MIN	((sint32)INT32_C(0x80000000))
+#define SINT64_MIN	((sint32)INT64_C(0x8000000000000000))
 
 #undef SINT8_MAX
 #undef SINT16_MAX
 #undef SINT32_MAX
 #undef SINT64_MAX
-#define SINT8_MAX   ((sint8) INT8_C(0x7F))
-#define SINT16_MAX  ((sint16)INT16_C(0x7FFF))
-#define SINT32_MAX  ((sint32)INT32_C(0x7FFFFFFF))
-#define SINT64_MAX  ((sint64)INT64_C(0x7FFFFFFFFFFFFFFF))
+#define SINT8_MAX	((sint8) INT8_C(0x7F))
+#define SINT16_MAX	((sint16)INT16_C(0x7FFF))
+#define SINT32_MAX	((sint32)INT32_C(0x7FFFFFFF))
+#define SINT64_MAX	((sint64)INT64_C(0x7FFFFFFFFFFFFFFF))
 
 //////////////////////////////////////////////////////////////////////////
 // Integers with guaranteed _minimum_ size.
@@ -180,10 +180,10 @@ typedef unsigned long int   ppuint32;
 
 #if defined(WIN32) && !defined(MINGW) // does not have a signed size_t
 //////////////////////////////
-#if defined(_WIN64) // naive 64bit windows platform
-typedef __int64         ssize_t;
+#if defined(_WIN64)	// naive 64bit windows platform
+typedef __int64			ssize_t;
 #else
-typedef int             ssize_t;
+typedef int				ssize_t;
 #endif
 //////////////////////////////
 #endif
@@ -201,23 +201,23 @@ typedef uintptr_t uintptr;
 // Add a 'sysint' Type which has the width of the platform we're compiled for.
 //////////////////////////////////////////////////////////////////////////
 #if defined(__GNUC__)
-#if defined(__x86_64__)
-typedef int64 sysint;
-typedef uint64 usysint;
-#else
-typedef int32 sysint;
-typedef uint32 usysint;
-#endif
+	#if defined(__x86_64__)
+		typedef int64 sysint;
+		typedef uint64 usysint;
+	#else
+		typedef int32 sysint;
+		typedef uint32 usysint;
+	#endif
 #elif defined(_MSC_VER)
-#if defined(_M_X64)
-typedef int64 sysint;
-typedef uint64 usysint;
-#else
-typedef int32 sysint;
-typedef uint32 usysint;
-#endif
+	#if defined(_M_X64)
+		typedef int64 sysint;
+		typedef uint64 usysint;
+	#else
+		typedef int32 sysint;
+		typedef uint32 usysint;
+	#endif
 #else
-#error Compiler / Platform is unsupported.
+	#error Compiler / Platform is unsupported.
 #endif
 
 
@@ -225,21 +225,21 @@ typedef uint32 usysint;
 // some redefine of function redefines for some Compilers
 //////////////////////////////////////////////////////////////////////////
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-#define strcasecmp          stricmp
-#define strncasecmp         strnicmp
-#define strncmpi            strnicmp
-#define snprintf            _snprintf
+#define strcasecmp			stricmp
+#define strncasecmp			strnicmp
+#define strncmpi			strnicmp
+#define snprintf			_snprintf
 #if defined(_MSC_VER) && _MSC_VER < 1400
-#define vsnprintf           _vsnprintf
+#define vsnprintf			_vsnprintf
 #endif
 #else
-#define strcmpi             strcasecmp
-#define stricmp             strcasecmp
-#define strncmpi            strncasecmp
-#define strnicmp            strncasecmp
+#define strcmpi				strcasecmp
+#define stricmp				strcasecmp
+#define strncmpi			strncasecmp
+#define strnicmp			strncasecmp
 #endif
 #if defined(_MSC_VER) && _MSC_VER > 1200
-#define strtoull            _strtoui64
+#define strtoull			_strtoui64
 #endif
 
 // keyword replacement
@@ -262,8 +262,8 @@ typedef uint32 usysint;
 
 // boolean types for C
 typedef char bool;
-#define false   (1==0)
-#define true    (1==1)
+#define false	(1==0)
+#define true	(1==1)
 
 //////////////////////////////
 #endif // not __cplusplus
@@ -276,7 +276,7 @@ typedef char bool;
 #undef swap
 #endif
 // hmm only ints?
-//#define swap(a,b) { int temp=a; a=b; b=temp;}
+//#define swap(a,b) { int temp=a; a=b; b=temp;} 
 // if using macros then something that is type independent
 //#define swap(a,b) ((a == b) || ((a ^= b), (b ^= a), (a ^= b)))
 // Avoid "value computed is not used" warning and generates the same assembly code
@@ -299,7 +299,7 @@ typedef char bool;
 //////////////////////////////////////////////////////////////////////////
 // number of bits in a byte
 #ifndef NBBY
-#define NBBY 8
+#define	NBBY 8
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -383,20 +383,17 @@ typedef char bool;
 // Set a pointer variable to a pointer value.
 #ifdef __cplusplus
 template <typename T1, typename T2>
-void SET_POINTER(T1 *&var, T2 *p)
+void SET_POINTER(T1*&var, T2* p)
 {
-    var = static_cast<T1 *>(p);
+	var = static_cast<T1*>(p);
 }
 template <typename T1, typename T2>
-void SET_FUNCPOINTER(T1 &var, T2 p)
+void SET_FUNCPOINTER(T1& var, T2 p)
 {
-    char ASSERT_POINTERSIZE[sizeof(T1) == sizeof(void *) && sizeof(T2) == sizeof(void *)?1:-1]; // 1 if true, -1 if false
-    union {
-        T1 out;
-        T2 in;
-    } tmp;// /!\ WARNING casting a pointer to a function pointer is against the C++ standard
-    tmp.in = p;
-    var = tmp.out;
+	char ASSERT_POINTERSIZE[sizeof(T1) == sizeof(void*) && sizeof(T2) == sizeof(void*)?1:-1];// 1 if true, -1 if false
+	union{ T1 out; T2 in; } tmp;// /!\ WARNING casting a pointer to a function pointer is against the C++ standard
+	tmp.in = p;
+	var = tmp.out;
 }
 #else
 #define SET_POINTER(var,p) (var) = (p)