[ros-diffs] [cfinck] 28047: Revert w3seek's changes from r27978, mkhive segfaults with them on 64-bit systems

[cfinck at svn.reactos.org]

Author: cfinck
Date: Mon Jul 30 20:02:00 2007
New Revision: 28047

URL: http://svn.reactos.org/svn/reactos?rev=28047&view=rev
Log:
Revert w3seek's changes from r27978, mkhive segfaults with them on 64-bit systems

Modified:
    trunk/reactos/include/psdk/basetyps.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/lib/cmlib/cmlib.mak
    trunk/reactos/lib/cmlib/cmlib.rbuild
    trunk/reactos/tools/mkhive/mkhive.mak

Modified: trunk/reactos/include/psdk/basetyps.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?rev=28047&r1=28046&r2=28047&view=diff
==============================================================================
--- trunk/reactos/include/psdk/basetyps.h (original)
+++ trunk/reactos/include/psdk/basetyps.h Mon Jul 30 20:02:00 2007
@@ -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
 

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=28047&r1=28046&r2=28047&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h (original)
+++ trunk/reactos/include/psdk/winnt.h Mon Jul 30 20:02:00 2007
@@ -102,13 +102,8 @@
 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 @@
 	ULONG MaxIdleState;
 	ULONG CurrentIdleState;
 } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
+#endif
 
 typedef DWORD EXECUTION_STATE;
-#endif
-
 typedef enum _POWER_INFORMATION_LEVEL {
 	SystemPowerPolicyAc,
 	SystemPowerPolicyDc,

Modified: trunk/reactos/lib/cmlib/cmlib.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=28047&r1=28046&r2=28047&view=diff
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.mak (original)
+++ trunk/reactos/lib/cmlib/cmlib.mak Mon Jul 30 20:02:00 2007
@@ -33,7 +33,7 @@
 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)

Modified: trunk/reactos/lib/cmlib/cmlib.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev=28047&r1=28046&r2=28047&view=diff
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.rbuild (original)
+++ trunk/reactos/lib/cmlib/cmlib.rbuild Mon Jul 30 20:02:00 2007
@@ -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>

Modified: trunk/reactos/tools/mkhive/mkhive.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?rev=28047&r1=28046&r2=28047&view=diff
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.mak (original)
+++ trunk/reactos/tools/mkhive/mkhive.mak Mon Jul 30 20:02:00 2007
@@ -31,7 +31,7 @@
 	$(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