Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 06:55:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR][NETKVM][ATL_APITEST] Pick the GCC code path for clang in some cases. CORE-17202

Browse source
This commit is contained in:
Thomas Faber 2020-08-15 21:38:31 +02:00
parent a81788e5bf
commit 794d00c303
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boot/freeldr/freeldr/ntldr/arch/i386/winldr.c
View file

@ -676,7 +676,7 @@ WinLdrSetProcessorContext(void)
__lidt(&IdtDesc); __lidt(&IdtDesc);
/* Jump to proper CS and clear prefetch queue */ /* Jump to proper CS and clear prefetch queue */
#if defined(__GNUC__) #if defined(__GNUC__) || defined(__clang__)
asm("ljmp $0x08, $1f\n" asm("ljmp $0x08, $1f\n"
"1:\n"); "1:\n");
#elif defined(_MSC_VER) #elif defined(_MSC_VER)

2
drivers/network/dd/netkvm/Common/ParaNdis-Oid.c
View file

@ -236,7 +236,7 @@ NDIS_STATUS ParaNdis_OidQueryCommon(PARANDIS_ADAPTER *pContext, tOidDesc *pOid)
USHORT us; USHORT us;
NDIS_PNP_CAPABILITIES PMCaps; NDIS_PNP_CAPABILITIES PMCaps;
} u; } u;
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
#define CONCATFIELD(object, field) object.##field #define CONCATFIELD(object, field) object.##field
#else #else
#define CONCATFIELD(object, field) object.field #define CONCATFIELD(object, field) object.field

2
modules/rostests/apitests/atl/CHeapPtrList.cpp
View file

@ -102,7 +102,7 @@ START_TEST(CHeapPtrList)
ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations);
Ptr = test_Alloc(0x22222222); Ptr = test_Alloc(0x22222222);
ok(g_OpenAllocations == 2, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); 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)); heapPtr1.AddTail(CComHeapPtr<DWORD>(Ptr));
#else #else
CComHeapPtr<DWORD> xxx(Ptr); CComHeapPtr<DWORD> xxx(Ptr);