mirror of
https://github.com/reactos/reactos.git
synced 2024-09-06 10:52:52 +00:00
Make sure LONG/ULONG is correctly defined for both cmlib and mkhive
svn path=/trunk/; revision=27978
This commit is contained in:
parent
ff56fe5fb3
commit
0172ae8384
|
@ -77,7 +77,11 @@
|
|||
#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
|
||||
|
||||
|
|
|
@ -102,8 +102,13 @@ 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;
|
||||
|
@ -3844,9 +3849,10 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
|
|||
ULONG MaxIdleState;
|
||||
ULONG CurrentIdleState;
|
||||
} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
|
||||
#endif
|
||||
|
||||
typedef DWORD EXECUTION_STATE;
|
||||
#endif
|
||||
|
||||
typedef enum _POWER_INFORMATION_LEVEL {
|
||||
SystemPowerPolicyAc,
|
||||
SystemPowerPolicyDc,
|
||||
|
|
|
@ -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_CTYPE_INLINES -D__NO_LLP64__
|
||||
|
||||
$(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
|
||||
$(ECHO_AR)
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
<define name="_NTOSKRNL_" />
|
||||
<define name="_NTSYSTEM_" />
|
||||
<define name="NASSERT" />
|
||||
<define name="__NO_LLP64__" />
|
||||
<pch>cmlib.h</pch>
|
||||
<library>rtl</library>
|
||||
<file>cminit.c</file>
|
||||
|
|
|
@ -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_NTOSKRNL_ -D_NTSYSTEM_ -D__NO_LLP64__ \
|
||||
-Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3
|
||||
|
||||
MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3
|
||||
|
|
Loading…
Reference in a new issue