[XDK][DDK] Take the gcc path for __assert_annotation{A,W} and __CREATE_NTOS_DATA_IMPORT_ALIAS when compiling with clang-cl. Include kdfuncs.h before rtlfuncs.h to have DbgPrint() defined before using it. CORE-11799 (#94)

This commit is contained in:
Amine Khaldi 2017-10-31 15:19:49 +01:00
parent a75904fe66
commit 9556390f8f
No known key found for this signature in database
GPG key ID: DEE3CC0548AE44F1
2 changed files with 3 additions and 3 deletions

View file

@ -3200,7 +3200,7 @@ RtlCheckBit(
#define RtlUlongByteSwap(_x) _byteswap_ulong((_x))
#define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x))
#if defined(_MSC_VER)
#if defined(_MSC_VER) && !defined(__clang__)
# define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg)
# define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg)
#else

View file

@ -150,7 +150,7 @@ $define(USHORT=USHORT)
#define __IMPORTSYMBOL(_Name) "__imp_"#_Name
#define __IMPORTNAME(_Name) __imp_##_Name
#endif
#ifdef _MSC_VER
#if defined(_MSC_VER) && !defined(__clang__)
#define __CREATE_NTOS_DATA_IMPORT_ALIAS(_Name) \
__pragma(comment(linker, "/alternatename:"__SYMBOL(_Name) "=" __IMPORTSYMBOL(_Name)))
#else /* !_MSC_VER */
@ -251,6 +251,7 @@ $include (obtypes.h)
$include (pstypes.h)
$include (wmitypes.h)
$include (kdfuncs.h)
$include (kefuncs.h)
$include (rtlfuncs.h)
$include (mmfuncs.h)
@ -262,7 +263,6 @@ $include (exfuncs.h)
$include (obfuncs.h)
$include (psfuncs.h)
$include (wmifuncs.h)
$include (kdfuncs.h)
$include (halfuncs.h)
$include (nttmapi.h)
$include (zwfuncs.h)