diff options
| author | Martin Hořeňovský | 2022-09-02 07:09:28 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-09-02 07:10:38 +0200 |
| commit | 3ca5cf32e59f77b3af106367fe725c336034667b (patch) | |
| tree | a6e1ec09ce36555647f2e949b883650297c36aba /src/catch2 | |
| parent | dc001fa935d71b4b77f263fce405c9dbdfcbfe28 (diff) | |
| download | catch3-3ca5cf32e59f77b3af106367fe725c336034667b.tar.gz | |
Add CATCH_PLATFORM_WINDOWS_UWP detection macro
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/internal/catch_compiler_capabilities.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_platform.hpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp index fffe59e7..85477ec2 100644 --- a/src/catch2/internal/catch_compiler_capabilities.hpp +++ b/src/catch2/internal/catch_compiler_capabilities.hpp @@ -174,7 +174,7 @@ // Universal Windows platform does not support SEH // Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +# if defined(CATCH_PLATFORM_WINDOWS_UWP) # define CATCH_INTERNAL_CONFIG_NO_COLOUR_WIN32 # else # define CATCH_INTERNAL_CONFIG_WINDOWS_SEH diff --git a/src/catch2/internal/catch_platform.hpp b/src/catch2/internal/catch_platform.hpp index 8ecf01ad..01ee6cd9 100644 --- a/src/catch2/internal/catch_platform.hpp +++ b/src/catch2/internal/catch_platform.hpp @@ -24,6 +24,10 @@ #elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) # define CATCH_PLATFORM_WINDOWS + +# if defined( WINAPI_FAMILY ) && ( WINAPI_FAMILY == WINAPI_FAMILY_APP ) +# define CATCH_PLATFORM_WINDOWS_UWP +# endif #endif #endif // CATCH_PLATFORM_HPP_INCLUDED |