Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert w3seek's changes from r27978, mkhive segfaults with them on 64-bit systems

Browse source 
svn path=/trunk/; revision=28047
This commit is contained in:
Colin Finck 2007-07-30 16:02:00 +00:00
parent ac648888c7
commit a98c23a440
5 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/include/psdk/basetyps.h
View file

@ -77,11 +77,7 @@
#include <guiddef.h> #include <guiddef.h>
#ifndef _ERROR_STATUS_T_DEFINED #ifndef _ERROR_STATUS_T_DEFINED
#if defined(__NO_LLP64__)
typedef unsigned int error_status_t;
#else
typedef unsigned long error_status_t; typedef unsigned long error_status_t;
#endif
#define _ERROR_STATUS_T_DEFINED #define _ERROR_STATUS_T_DEFINED
#endif #endif

8
reactos/include/psdk/winnt.h
View file

@ -102,13 +102,8 @@ typedef char CHAR;
typedef short SHORT; typedef short SHORT;
#ifndef LONG_DEFINED #ifndef LONG_DEFINED
#define LONG_DEFINED #define LONG_DEFINED
#if defined(__NO_LLP64__)
typedef int LONG;
typedef unsigned int ULONG,*PULONG;
#else
typedef long LONG; typedef long LONG;
typedef unsigned long ULONG,*PULONG; typedef unsigned long ULONG,*PULONG;
#endif
#endif//LONG_DEFINED #endif//LONG_DEFINED
typedef char CCHAR, *PCCHAR; typedef char CCHAR, *PCCHAR;
typedef unsigned char UCHAR,*PUCHAR; typedef unsigned char UCHAR,*PUCHAR;
@ -3849,10 +3844,9 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
ULONG MaxIdleState; ULONG MaxIdleState;
ULONG CurrentIdleState; ULONG CurrentIdleState;
} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
typedef DWORD EXECUTION_STATE;
#endif #endif
typedef DWORD EXECUTION_STATE;
typedef enum _POWER_INFORMATION_LEVEL { typedef enum _POWER_INFORMATION_LEVEL {
SystemPowerPolicyAc, SystemPowerPolicyAc,
SystemPowerPolicyDc, SystemPowerPolicyDc,

2
reactos/lib/cmlib/cmlib.mak
View file

@ -33,7 +33,7 @@ CMLIB_HOST_OBJECTS = \
CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
-D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -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 \ -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) $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
$(ECHO_AR) $(ECHO_AR)

1
reactos/lib/cmlib/cmlib.rbuild
View file

@ -4,7 +4,6 @@
<define name="_NTOSKRNL_" /> <define name="_NTOSKRNL_" />
<define name="_NTSYSTEM_" /> <define name="_NTSYSTEM_" />
<define name="NASSERT" /> <define name="NASSERT" />
<define name="__NO_LLP64__" />
<pch>cmlib.h</pch> <pch>cmlib.h</pch>
<library>rtl</library> <library>rtl</library>
<file>cminit.c</file> <file>cminit.c</file>

2
reactos/tools/mkhive/mkhive.mak
View file

@ -31,7 +31,7 @@ MKHIVE_OBJECTS = \
$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ 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 -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3
MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3