--- deliantra/server/include/global.h	2006/12/11 19:46:46	1.20
+++ deliantra/server/include/global.h	2006/12/11 21:32:17	1.21
@@ -30,61 +30,17 @@
 
 #include "includes.h"
 
-
-/* Type defines for specific signed/unsigned variables of a certain number
- * of bits.  Not really used anyplace, but if a certain number of bits
- * is required, these type defines should then be used.  This will make
- * porting to systems that have different sized data types easier.
- *
- * Note: The type defines should just mean that the data type has at
- * least that many bits.  if a uint16 is actually 32 bits, no big deal,
- * it is just a waste of space.
- *
- * Note2:  When using something that is normally stored in a character
- * (ie strings), don't use the uint8/sint8 typdefs, use 'char' instead.
- * The signedness for char is probably not universal, and using char
- * will probably be more portable than sint8/unit8
- */
-
- 
-typedef unsigned int	uint32;
-
-#ifndef UINT32_MAX
-#define UINT32_MAX	4294967295U
-#endif
-
-typedef signed int	sint32;
-#define SINT32_MAX	2147483647
-
-typedef unsigned short	uint16;
-#ifndef UINT16_MAX
-#define UINT16_MAX	65535
-#endif
-
-typedef signed short	sint16;
-#define SINT16_MAX	32767
-
-typedef unsigned char	uint8;
-#ifndef UINT8_MAX
-#define UINT8_MAX	255
-#endif
-
-typedef signed char	sint8;
-#define SINT8_MAX	127
+typedef int8_t		sint8;
+typedef uint8_t		uint8;
+typedef int16_t		sint16;
+typedef uint16_t	uint16;
+typedef int32_t		sint32;
+typedef uint32_t	uint32;
+typedef int64_t		sint64;
+typedef uint64_t	uint64;
 
 typedef unsigned short Fontindex;
 
-#if SIZEOF_LONG == 8
-typedef unsigned long	    uint64;
-typedef signed long	    sint64;
-#elif SIZEOF_LONG_LONG == 8
-typedef unsigned long long	uint64;
-typedef signed long long 	sint64;
-#else
-#error do not know how to get a 64 bit value on this system.
-#error correct and send mail to crossfire-devel on how to do this
-#endif
-
 #include <vector>
 
 #define ACC_CLASS(name)