From cc36d0600652085f2c36eaf5fd4cc54e7457e1b6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 14 Sep 2014 15:19:20 +0000 Subject: [PATCH 1/1] [XDK][DDK] * Work around what looks like a bug in GCC's handling of #pragma redefine_extname. Its behavior regarding additional underscore prefixes depends on the order of pragma and symbol declaration with GCC, while it's consistent with Clang. Brought to you by Thomas Faber, reviewed by Timo Kreuzer. CORE-8516 svn path=/trunk/; revision=64148 --- reactos/include/ddk/wdm.h | 6 +++--- reactos/include/xdk/rtltypes.h | 4 ++-- reactos/include/xdk/wdm.template.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index 9c0d6347c63..0f9cb6e8c71 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -139,7 +139,7 @@ extern "C" { #ifdef _M_IX86 #define __SYMBOL(_Name) "_"#_Name #define __IMPORTSYMBOL(_Name) "__imp__"#_Name -#define __IMPORTNAME(_Name) _imp__##_Name +#define __IMPORTNAME(_Name) __imp__##_Name #else #define __SYMBOL(_Name) #_Name #define __IMPORTSYMBOL(_Name) "__imp_"#_Name @@ -586,11 +586,11 @@ extern BOOLEAN NlsMbCodePageTag; extern BOOLEAN NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #else -extern BOOLEAN *NlsMbCodePageTag; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) +extern BOOLEAN *NlsMbCodePageTag; #define NLS_MB_CODE_PAGE_TAG (*NlsMbCodePageTag) -extern BOOLEAN *NlsMbOemCodePageTag; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) +extern BOOLEAN *NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG (*NlsMbOemCodePageTag) #endif diff --git a/reactos/include/xdk/rtltypes.h b/reactos/include/xdk/rtltypes.h index fef0604c5e0..92d4cfdf81b 100644 --- a/reactos/include/xdk/rtltypes.h +++ b/reactos/include/xdk/rtltypes.h @@ -203,11 +203,11 @@ extern BOOLEAN NlsMbCodePageTag; extern BOOLEAN NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #else -extern BOOLEAN *NlsMbCodePageTag; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) +extern BOOLEAN *NlsMbCodePageTag; #define NLS_MB_CODE_PAGE_TAG (*NlsMbCodePageTag) -extern BOOLEAN *NlsMbOemCodePageTag; __CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) +extern BOOLEAN *NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG (*NlsMbOemCodePageTag) #endif diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h index e525303877b..8bc0948f3fd 100644 --- a/reactos/include/xdk/wdm.template.h +++ b/reactos/include/xdk/wdm.template.h @@ -139,7 +139,7 @@ extern "C" { #ifdef _M_IX86 #define __SYMBOL(_Name) "_"#_Name #define __IMPORTSYMBOL(_Name) "__imp__"#_Name -#define __IMPORTNAME(_Name) _imp__##_Name +#define __IMPORTNAME(_Name) __imp__##_Name #else #define __SYMBOL(_Name) #_Name #define __IMPORTSYMBOL(_Name) "__imp_"#_Name -- 2.17.1