https://git.reactos.org/?p=reactos.git;a=commitdiff;h=794d00c303d05ecf6475069c2d4468d829f49b02
commit 794d00c303d05ecf6475069c2d4468d829f49b02 Author: Thomas Faber <[email protected]> AuthorDate: Sat Aug 15 21:38:31 2020 +0200 Commit: Thomas Faber <[email protected]> CommitDate: Sun Aug 23 12:07:37 2020 +0200 [FREELDR][NETKVM][ATL_APITEST] Pick the GCC code path for clang in some cases. CORE-17202 --- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- drivers/network/dd/netkvm/Common/ParaNdis-Oid.c | 2 +- modules/rostests/apitests/atl/CHeapPtrList.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index 4f70cf323bf..a87e1a28f91 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -676,7 +676,7 @@ WinLdrSetProcessorContext(void) __lidt(&IdtDesc); /* Jump to proper CS and clear prefetch queue */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) asm("ljmp $0x08, $1f\n" "1:\n"); #elif defined(_MSC_VER) diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c b/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c index 8d54b445dca..0adfc4bc06f 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c @@ -236,7 +236,7 @@ NDIS_STATUS ParaNdis_OidQueryCommon(PARANDIS_ADAPTER *pContext, tOidDesc *pOid) USHORT us; NDIS_PNP_CAPABILITIES PMCaps; } u; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #define CONCATFIELD(object, field) object.##field #else #define CONCATFIELD(object, field) object.field diff --git a/modules/rostests/apitests/atl/CHeapPtrList.cpp b/modules/rostests/apitests/atl/CHeapPtrList.cpp index 41da433b427..43b0d3e21d6 100644 --- a/modules/rostests/apitests/atl/CHeapPtrList.cpp +++ b/modules/rostests/apitests/atl/CHeapPtrList.cpp @@ -102,7 +102,7 @@ START_TEST(CHeapPtrList) ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); Ptr = test_Alloc(0x22222222); ok(g_OpenAllocations == 2, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) heapPtr1.AddTail(CComHeapPtr<DWORD>(Ptr)); #else CComHeapPtr<DWORD> xxx(Ptr);
