From bdbd067dec0625e2f7eb0dac41a344cd3428904e Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sat, 1 Jun 2019 10:52:05 +0300 Subject: [PATCH] openshadinglanguage: Commit forgoted patch --- .../0010-macros-undef-mingw.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 mingw-w64-openshadinglanguage/0010-macros-undef-mingw.patch diff --git a/mingw-w64-openshadinglanguage/0010-macros-undef-mingw.patch b/mingw-w64-openshadinglanguage/0010-macros-undef-mingw.patch new file mode 100644 index 0000000000..34b1728b1b --- /dev/null +++ b/mingw-w64-openshadinglanguage/0010-macros-undef-mingw.patch @@ -0,0 +1,14 @@ +--- OpenShadingLanguage-Release-1.10.2/src/liboslexec/shadingsys.cpp.orig 2018-12-06 11:41:22.923584600 +0300 ++++ OpenShadingLanguage-Release-1.10.2/src/liboslexec/shadingsys.cpp 2018-12-06 11:41:42.863612500 +0300 +@@ -54,8 +54,10 @@ + using namespace OSL::pvt; + + // avoid naming conflicts with MSVC macros +-#ifdef _MSC_VER ++#ifdef _WIN32 + #undef RGB ++#endif ++#ifdef _MSC_VER + // We use some of the iso646.h macro names later on in this file. For + // some compilers (MSVS, I'm looking at you) this is trouble. I don't know + // how or why that header would have been included here, but it did for at