diff --git a/client/TracyArmCpuTable.hpp b/client/TracyArmCpuTable.hpp index 9e9a73d0..a2220cc9 100644 --- a/client/TracyArmCpuTable.hpp +++ b/client/TracyArmCpuTable.hpp @@ -1,10 +1,8 @@ -#ifdef _MSC_VER -# pragma warning(disable:4996) -#endif - namespace tracy { +#if defined __linux__ && defined __ARM_ARCH + static const char* DecodeArmImplementer( uint32_t v ) { static char buf[16]; @@ -212,6 +210,8 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part ) return buf; } +#elif defined __APPLE__ && TARGET_OS_IPHONE == 1 + static const char* DecodeIosDevice( const char* id ) { static const char* DeviceTable[] = { @@ -325,4 +325,6 @@ static const char* DecodeIosDevice( const char* id ) return id; } +#endif + } diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index 84d6b1a9..042f0d94 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -37,6 +37,10 @@ # include #endif +#if defined __APPLE__ +# include "TargetConditionals.h" +#endif + #include #include #include @@ -93,9 +97,6 @@ extern "C" typedef BOOL (WINAPI *t_GetLogicalProcessorInformationEx)( LOGICAL_PR # include # include #endif -#if defined __APPLE__ -# include "TargetConditionals.h" -#endif #if defined __linux__ # include # include