update for HEAD-2003050101

[reactos.git] / include / ntos / types.h

diff --git a/include/ntos/types.h b/include/ntos/types.h
index 3efeef3..e7739af 100644 (file)
--- a/include/ntos/types.h
+++ b/include/ntos/types.h
@@ -61,28 +61,12 @@ typedef short SHORT;
 
 #endif /*i386*/
 
-#ifdef _WIN64
-
-/* 64-bit architecture */
-
-typedef INT64 INT, *PINT;
-typedef LONG64 LONG, *PLONG;
-typedef DWORD64 DWORD, *PDWORD;
-typedef UINT64 UINT, *PUINT;
-typedef ULONG64 ULONG, *PULONG;
-
-#else /* _WIN64 */
-
-/* 32-bit architecture */
-
 typedef INT32 INT, *PINT;
 typedef LONG32 LONG, *PLONG;
-typedef DWORD32 DWORD, *PDWORD;
+typedef ULONG32 DWORD, *PDWORD;
 typedef UINT32 UINT, *PUINT;
 typedef ULONG32 ULONG, *PULONG;
 
-#endif /* _WIN64 */
-
 #ifndef _WCHAR_T_
 #define _WCHAR_T_
 #define _WCHAR_T
@@ -231,8 +215,12 @@ typedef unsigned short *PRTL_ATOM;
 
 #endif /* __USE_W32API */
 
+#ifndef FALSE
 #define FALSE 0
+#endif
+#ifndef TRUE
 #define TRUE 1
+#endif
 
 #ifndef NULL
 #ifdef __cplusplus