Merge branch 'master' of github.com:philsquared/Catch

This commit is contained in:
Phil Nash 2012-02-28 08:38:17 +00:00
commit 97668c76f1

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