3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 12:17:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linker error in catch_debugger.hpp on iOS on ARM that occurs trying to use assembly for Intel because CATCH_PLATFORM_MAC is defined.

Browse Source 
Define CATCH_PLATFORM_MAC using #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) instead of #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__).

Add new CATCH_PLATFORM_IPHONE defined using #elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED) for future use. The BreakIntoDebugger and isDebuggerActive functions remain without implementations for iOS.
This commit is contained in:
herringbanger@gmail.com
2012-01-14 11:12:58 -08:00
parent fd78e0f6df
commit aa648bd690
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_debugger.hpp
View File

@@ -16,8 +16,10 @@
#include <iostream> #include <iostream>
#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
#define CATCH_PLATFORM_MAC #define CATCH_PLATFORM_MAC
#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#define CATCH_PLATFORM_IPHONE
#elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) #elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
#define CATCH_PLATFORM_WINDOWS #define CATCH_PLATFORM_WINDOWS
#endif #endif