diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:29:48 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-27 09:32:36 +0300 |
commit | 4cfec9fbeea49cb5d2583eebb7b0eb878fd068c3 (patch) | |
tree | c84ce10e6f6e09680bcfe6ca8e127dd707034805 /src/Native/Runtime/windows | |
parent | e4806d61608bdb111fb98f25736337d46182f730 (diff) |
Fix build breaks in UWP build
Diffstat (limited to 'src/Native/Runtime/windows')
-rw-r--r-- | src/Native/Runtime/windows/PalRedhawkMinWin.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/Native/Runtime/windows/PalRedhawkMinWin.cpp b/src/Native/Runtime/windows/PalRedhawkMinWin.cpp index 81d7124d6..a8285173c 100644 --- a/src/Native/Runtime/windows/PalRedhawkMinWin.cpp +++ b/src/Native/Runtime/windows/PalRedhawkMinWin.cpp @@ -37,8 +37,6 @@ uint32_t PalEventWrite(REGHANDLE arg1, const EVENT_DESCRIPTOR * arg2, uint32_t a #define REDHAWK_PALEXPORT extern "C" #define REDHAWK_PALAPI __stdcall -extern "C" UInt32 __stdcall NtGetCurrentProcessorNumber(); - // Index for the fiber local storage of the attached thread pointer static UInt32 g_flsIndex = FLS_OUT_OF_INDEXES; @@ -152,11 +150,6 @@ extern "C" bool PalDetachThread(void* thread) return true; } -REDHAWK_PALEXPORT unsigned int REDHAWK_PALAPI PalGetCurrentProcessorNumber() -{ - return GetCurrentProcessorNumber(); -} - #define SUPPRESS_WARNING_4127 \ __pragma(warning(push)) \ __pragma(warning(disable:4127)) /* conditional expression is constant*/ @@ -1309,9 +1302,7 @@ REDHAWK_PALEXPORT _Ret_maybenull_ void* REDHAWK_PALAPI PalSetWerDataBuffer(_In_ return InterlockedExchangePointer(&pBuffer, pNewBuffer); } -typedef uint32_t (WINAPI *GetCurrentProcessorNumber_t)(void); -static GetCurrentProcessorNumber_t g_GetCurrentProcessorNumber = NULL; static LARGE_INTEGER performanceFrequency; // Initialize the interface implementation @@ -1322,11 +1313,6 @@ bool GCToOSInterface::Initialize() return false; } - if (PalHasCapability(GetCurrentProcessorNumberCapability)) - { - g_GetCurrentProcessorNumber = PalGetCurrentProcessorNumber; - } - return true; } @@ -1385,13 +1371,13 @@ bool GCToOSInterface::SetCurrentThreadIdealAffinity(GCThreadAffinity* affinity) uint32_t GCToOSInterface::GetCurrentProcessorNumber() { _ASSERTE(GCToOSInterface::CanGetCurrentProcessorNumber()); - return g_GetCurrentProcessorNumber(); + return GetCurrentProcessorNumber(); } // Check if the OS supports getting current processor number bool GCToOSInterface::CanGetCurrentProcessorNumber() { - return g_GetCurrentProcessorNumber != NULL; + return true; } // Flush write buffers of processors that are executing threads of the current process |