diff --git a/IlmBase/Iex/IexBaseExc.cpp b/IlmBase/Iex/IexBaseExc.cpp index cd975c3d10..49721b7afb 100644 --- a/IlmBase/Iex/IexBaseExc.cpp +++ b/IlmBase/Iex/IexBaseExc.cpp @@ -44,7 +44,7 @@ #include "IexBaseExc.h" #include "IexMacros.h" -#ifdef PLATFORM_WINDOWS +#ifdef _WIN32 #include #endif @@ -193,7 +193,7 @@ BaseExc::stackTrace () const IEX_INTERNAL_NAMESPACE_SOURCE_EXIT -#ifdef PLATFORM_WINDOWS +#ifdef _WIN32 #pragma optimize("", off) void diff --git a/IlmBase/Iex/IexThrowErrnoExc.cpp b/IlmBase/Iex/IexThrowErrnoExc.cpp index 32e7fb2fe1..5c22dd9a13 100644 --- a/IlmBase/Iex/IexThrowErrnoExc.cpp +++ b/IlmBase/Iex/IexThrowErrnoExc.cpp @@ -46,7 +46,7 @@ #include #include -#ifdef PLATFORM_WINDOWS +#ifdef _WIN32 #include #endif @@ -55,7 +55,7 @@ IEX_INTERNAL_NAMESPACE_SOURCE_ENTER void throwErrnoExc (const std::string &text, int errnum) { -#ifdef PLATFORM_WINDOWS +#ifdef _WIN32 if (0 != getenv("IEXDEBUGTHROW")) DebugBreak(); #endif diff --git a/OpenEXR/exrmultipart/exrmultipart.cpp b/OpenEXR/exrmultipart/exrmultipart.cpp index 8c4fa66e0d..054bd15203 100644 --- a/OpenEXR/exrmultipart/exrmultipart.cpp +++ b/OpenEXR/exrmultipart/exrmultipart.cpp @@ -85,7 +85,7 @@ using namespace OPENEXR_IMF_NAMESPACE; #if defined(ANDROID) || defined(__ANDROID_API__) #define IMF_PATH_SEPARATOR "/" -#elif defined(_WIN32) || defined(_WIN64) || defined(__MWERKS__) || defined(PLATFORM_WINDOWS) +#elif defined(_WIN32) || defined(_WIN64) || defined(__MWERKS__) #define IMF_PATH_SEPARATOR "\\" #else #define IMF_PATH_SEPARATOR "/" @@ -827,4 +827,3 @@ main (int argc, char * argv[]) return 0; } - diff --git a/OpenEXR_Viewers/exrdisplay/ImageView.cpp b/OpenEXR_Viewers/exrdisplay/ImageView.cpp index dc78225432..add36b4961 100644 --- a/OpenEXR_Viewers/exrdisplay/ImageView.cpp +++ b/OpenEXR_Viewers/exrdisplay/ImageView.cpp @@ -51,7 +51,7 @@ #include #include -#if defined PLATFORM_WINDOWS || defined _WIN32 +#if defined _WIN32 #include #include #include