Index: src/framework/Platform/Define.h
===================================================================
--- src/framework/Platform/Define.h	(revision 5361)
+++ src/framework/Platform/Define.h	(working copy)
@@ -76,15 +76,14 @@
 
 #if COMPILER == COMPILER_MICROSOFT
 typedef __int64            int64;
-typedef long               int32;
-typedef short              int16;
-typedef signed char        int8;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
 typedef unsigned __int64   uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
 #else
-//typedef long long int64;
 typedef __int64_t   int64;
 typedef __int32_t   int32;
 typedef __int16_t   int16;
@@ -93,8 +92,6 @@
 typedef __uint32_t  uint32;
 typedef __uint16_t  uint16;
 typedef __uint8_t   uint8;
-typedef uint16      WORD;
-typedef uint32      DWORD;
 #endif
 typedef uint64      OBJECT_HANDLE;