Merged in rokups/tracy/fix-winver-targetting-2 (pull request #17)

Fix targetting lower windows versions when using W10 SDK that is older than redstone2.
This commit is contained in:
Rokas Kupstys 2018-07-19 08:56:30 +00:00 committed by Bartosz Taudul
commit 812c4d7085
2 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,7 @@ void SetThreadName( std::thread& thread, const char* name )
void SetThreadName( std::thread::native_handle_type handle, const char* name )
{
#ifdef _WIN32
# if defined NTDDI_VERSION && NTDDI_VERSION >= NTDDI_WIN10_RS2
# if defined NTDDI_WIN10_RS2 && NTDDI_VERSION >= NTDDI_WIN10_RS2
wchar_t buf[256];
mbstowcs( buf, name, 256 );
SetThreadDescription( static_cast<HANDLE>( handle ), buf );
@ -121,7 +121,7 @@ const char* GetThreadName( uint64_t id )
}
#else
# ifdef _WIN32
# if defined NTDDI_VERSION && NTDDI_VERSION >= NTDDI_WIN10_RS2
# if defined NTDDI_WIN10_RS2 && NTDDI_VERSION >= NTDDI_WIN10_RS2
auto hnd = OpenThread( THREAD_QUERY_LIMITED_INFORMATION, FALSE, (DWORD)id );
if( hnd != 0 )
{

View File

@ -2,7 +2,7 @@
#define __TRACYSYSTEM_HPP__
#ifdef TRACY_ENABLE
# if defined __ANDROID__ || defined __CYGWIN__ || defined __APPLE__ || defined _GNU_SOURCE || ( defined _WIN32 && ( !defined NTDDI_VERSION || NTDDI_VERSION < NTDDI_WIN10_RS2 ) )
# if defined __ANDROID__ || defined __CYGWIN__ || defined __APPLE__ || defined _GNU_SOURCE || ( defined _WIN32 && ( !defined NTDDI_WIN10_RS2 || NTDDI_VERSION < NTDDI_WIN10_RS2 ) )
# define TRACY_COLLECT_THREAD_NAMES
# endif
#endif