From a98c23a4406785853a1c76383ca5a041b769c951 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Mon, 30 Jul 2007 16:02:00 +0000
Subject: [PATCH] Revert w3seek's changes from r27978, mkhive segfaults with
 them on 64-bit systems

svn path=/trunk/; revision=28047
---
 reactos/include/psdk/basetyps.h | 4 ----
 reactos/include/psdk/winnt.h    | 8 +-------
 reactos/lib/cmlib/cmlib.mak     | 2 +-
 reactos/lib/cmlib/cmlib.rbuild  | 1 -
 reactos/tools/mkhive/mkhive.mak | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/reactos/include/psdk/basetyps.h b/reactos/include/psdk/basetyps.h
index 73071b9fb09..f3dd56105e4 100644
--- a/reactos/include/psdk/basetyps.h
+++ b/reactos/include/psdk/basetyps.h
@@ -77,11 +77,7 @@
 #include <guiddef.h>
 
 #ifndef _ERROR_STATUS_T_DEFINED
-#if defined(__NO_LLP64__)
-typedef unsigned int error_status_t;
-#else
 typedef unsigned long error_status_t;
-#endif
 #define _ERROR_STATUS_T_DEFINED
 #endif
 
diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 2ad43dc9225..b8e37620d60 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -102,13 +102,8 @@ typedef char CHAR;
 typedef short SHORT;
 #ifndef LONG_DEFINED
 #define LONG_DEFINED
-#if defined(__NO_LLP64__)
-    typedef int LONG;
-    typedef unsigned int ULONG,*PULONG;
-#else
     typedef long LONG;
     typedef unsigned long ULONG,*PULONG;
-#endif
 #endif//LONG_DEFINED
 typedef char CCHAR, *PCCHAR;
 typedef unsigned char UCHAR,*PUCHAR;
@@ -3849,10 +3844,9 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
 	ULONG MaxIdleState;
 	ULONG CurrentIdleState;
 } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
-
-typedef DWORD EXECUTION_STATE;
 #endif
 
+typedef DWORD EXECUTION_STATE;
 typedef enum _POWER_INFORMATION_LEVEL {
 	SystemPowerPolicyAc,
 	SystemPowerPolicyDc,
diff --git a/reactos/lib/cmlib/cmlib.mak b/reactos/lib/cmlib/cmlib.mak
index d0c8dbf41fc..c947a310c95 100644
--- a/reactos/lib/cmlib/cmlib.mak
+++ b/reactos/lib/cmlib/cmlib.mak
@@ -33,7 +33,7 @@ CMLIB_HOST_OBJECTS = \
 CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
   -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \
   -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \
-  -D__NO_CTYPE_INLINES -D__NO_LLP64__
+  -D__NO_CTYPE_INLINES
 
 $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
 	$(ECHO_AR)
diff --git a/reactos/lib/cmlib/cmlib.rbuild b/reactos/lib/cmlib/cmlib.rbuild
index 26fe585955e..5a63265f34c 100644
--- a/reactos/lib/cmlib/cmlib.rbuild
+++ b/reactos/lib/cmlib/cmlib.rbuild
@@ -4,7 +4,6 @@
 	<define name="_NTOSKRNL_" />
 	<define name="_NTSYSTEM_" />
 	<define name="NASSERT" />
-	<define name="__NO_LLP64__" />
 	<pch>cmlib.h</pch>
     <library>rtl</library>
 	<file>cminit.c</file>
diff --git a/reactos/tools/mkhive/mkhive.mak b/reactos/tools/mkhive/mkhive.mak
index d78b057a24e..4cbc4d11645 100644
--- a/reactos/tools/mkhive/mkhive.mak
+++ b/reactos/tools/mkhive/mkhive.mak
@@ -31,7 +31,7 @@ MKHIVE_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
 
 MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
-  -D_NTOSKRNL_ -D_NTSYSTEM_ -D__NO_LLP64__ \
+  -D_NTOSKRNL_ -D_NTSYSTEM_ \
   -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3
 
 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3