3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed spurious "inline" (was causing linker errors) and fixed broken macOS detection

Browse Source
This commit is contained in:
Phil Nash 2017-07-12 14:52:36 +01:00
parent 878bd140e6
commit e3e6453229
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/catch_debugger.cpp
View File

@ -10,6 +10,7 @@
#include "catch_debugger.h" #include "catch_debugger.h"
#include "catch_errno_guard.h" #include "catch_errno_guard.h"
#include "catch_stream.h" #include "catch_stream.h"
#include "catch_platform.h"
#ifdef CATCH_PLATFORM_MAC #ifdef CATCH_PLATFORM_MAC

9
include/internal/catch_platform.h
View File

@ -9,12 +9,17 @@
#ifndef TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED #ifndef TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED #define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) #ifdef __APPLE__
# include <TargetConditionals.h>
# if TARGET_OS_MAC == 1
# define CATCH_PLATFORM_MAC # define CATCH_PLATFORM_MAC
#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) # elif TARGET_OS_IPHONE == 1
# define CATCH_PLATFORM_IPHONE # define CATCH_PLATFORM_IPHONE
# endif
#elif defined(linux) || defined(__linux) || defined(__linux__) #elif defined(linux) || defined(__linux) || defined(__linux__)
# define CATCH_PLATFORM_LINUX # define CATCH_PLATFORM_LINUX
#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) #elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
# define CATCH_PLATFORM_WINDOWS # define CATCH_PLATFORM_WINDOWS
# if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) # if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)