From 00ad9c4760b2d8fe6595f43f9a624d992bc7eb41 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 14 Sep 2014 15:49:35 +0000 Subject: [PATCH] [XDK][DDK] * Handle the rest of cases about the order of pragma and symbol declaration. svn path=/trunk/; revision=64151 --- reactos/include/ddk/ntddk.h | 2 +- reactos/include/ddk/ntifs.h | 4 ++-- reactos/include/ddk/wdm.h | 4 ++-- reactos/include/xdk/fsrtlfuncs.h | 2 +- reactos/include/xdk/haltypes.h | 2 +- reactos/include/xdk/kdfuncs.h | 4 ++-- reactos/include/xdk/ketypes.h | 2 +- reactos/include/xdk/mmtypes.h | 2 +- reactos/include/xdk/ntifs.template.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h index 8cf5a48f28a..3fc66206e24 100644 --- a/reactos/include/ddk/ntddk.h +++ b/reactos/include/ddk/ntddk.h @@ -1670,8 +1670,8 @@ typedef struct { extern HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #else -extern PHAL_DISPATCH HalDispatchTable; __CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) +extern PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH HalDispatchTable #endif diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index 53b2d135915..59759da41e6 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -8396,8 +8396,8 @@ FsRtlRemovePerFileObjectContext( extern const UCHAR * const FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray #else -extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; __CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) +extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) #endif @@ -10993,8 +10993,8 @@ HalGetDmaAlignmentRequirement( extern PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo #else -extern PUSHORT *NlsOemLeadByteInfo; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) +extern PUSHORT *NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) #endif diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index 8b648416237..fec96b17006 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -1661,8 +1661,8 @@ extern NTSYSAPI volatile CCHAR KeNumberProcessors; #elif (NTDDI_VERSION >= NTDDI_WINXP) extern NTSYSAPI CCHAR KeNumberProcessors; #else -extern PCCHAR KeNumberProcessors; __CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) +extern PCCHAR KeNumberProcessors; #endif @@ -1815,8 +1815,8 @@ typedef enum _MM_SYSTEM_SIZE { } MM_SYSTEMSIZE; #ifndef _NTSYSTEM_ -extern PBOOLEAN Mm64BitPhysicalAddress; __CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) +extern PBOOLEAN Mm64BitPhysicalAddress; #endif extern NTKERNELAPI PVOID MmBadPointer; diff --git a/reactos/include/xdk/fsrtlfuncs.h b/reactos/include/xdk/fsrtlfuncs.h index 24465b8e2ea..03fcb464f3e 100644 --- a/reactos/include/xdk/fsrtlfuncs.h +++ b/reactos/include/xdk/fsrtlfuncs.h @@ -1584,8 +1584,8 @@ FsRtlRemovePerFileObjectContext( extern const UCHAR * const FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray #else -extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; __CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) +extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) #endif diff --git a/reactos/include/xdk/haltypes.h b/reactos/include/xdk/haltypes.h index db308060e03..4ba2b36c7b6 100644 --- a/reactos/include/xdk/haltypes.h +++ b/reactos/include/xdk/haltypes.h @@ -273,8 +273,8 @@ typedef struct { extern HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #else -extern PHAL_DISPATCH HalDispatchTable; __CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) +extern PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH HalDispatchTable #endif diff --git a/reactos/include/xdk/kdfuncs.h b/reactos/include/xdk/kdfuncs.h index b5e908ba35a..bad85b0ddbb 100644 --- a/reactos/include/xdk/kdfuncs.h +++ b/reactos/include/xdk/kdfuncs.h @@ -125,11 +125,11 @@ extern BOOLEAN KdDebuggerEnabled; extern BOOLEAN KdDebuggerNotPresent; #define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent #else -extern BOOLEAN *KdDebuggerEnabled; __CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerEnabled) +extern BOOLEAN *KdDebuggerEnabled; #define KD_DEBUGGER_ENABLED (*KdDebuggerEnabled) -extern BOOLEAN *KdDebuggerNotPresent; __CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerNotPresent) +extern BOOLEAN *KdDebuggerNotPresent; #define KD_DEBUGGER_NOT_PRESENT (*KdDebuggerNotPresent) #endif diff --git a/reactos/include/xdk/ketypes.h b/reactos/include/xdk/ketypes.h index 7b14d0ae09b..54675d1848f 100644 --- a/reactos/include/xdk/ketypes.h +++ b/reactos/include/xdk/ketypes.h @@ -986,8 +986,8 @@ extern NTSYSAPI volatile CCHAR KeNumberProcessors; #elif (NTDDI_VERSION >= NTDDI_WINXP) extern NTSYSAPI CCHAR KeNumberProcessors; #else -extern PCCHAR KeNumberProcessors; __CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) +extern PCCHAR KeNumberProcessors; #endif $endif (_WDMDDK_) diff --git a/reactos/include/xdk/mmtypes.h b/reactos/include/xdk/mmtypes.h index ae665cca59a..cc5c69b879d 100644 --- a/reactos/include/xdk/mmtypes.h +++ b/reactos/include/xdk/mmtypes.h @@ -148,8 +148,8 @@ typedef enum _MM_SYSTEM_SIZE { } MM_SYSTEMSIZE; #ifndef _NTSYSTEM_ -extern PBOOLEAN Mm64BitPhysicalAddress; __CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) +extern PBOOLEAN Mm64BitPhysicalAddress; #endif extern NTKERNELAPI PVOID MmBadPointer; diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h index 68957892ec6..af6712bb4db 100644 --- a/reactos/include/xdk/ntifs.template.h +++ b/reactos/include/xdk/ntifs.template.h @@ -1128,8 +1128,8 @@ HalGetDmaAlignmentRequirement( extern PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo #else -extern PUSHORT *NlsOemLeadByteInfo; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) +extern PUSHORT *NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) #endif -- 2.17.1