include/cppunit/plugin/TestPlugIn.h | 2 ++ include/msvc6/testrunner/TestPlugInInterface.h | 2 ++ src/cppunit/Win32DynamicLibraryManager.cpp | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit 5ee5394ccec1e9fa07f2a84d73209472c8a1daab Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Apr 2 23:17:19 2018 +0200 tdf#116653, avoid NOMINMAX redefinition warnings with mingw diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h index 52b5b35..4c57093 100644 --- a/include/cppunit/plugin/TestPlugIn.h +++ b/include/cppunit/plugin/TestPlugIn.h @@ -146,7 +146,9 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #define BLENDFUNCTION void // for mingw & gcc #include <windows.h> #endif diff --git a/include/msvc6/testrunner/TestPlugInInterface.h b/include/msvc6/testrunner/TestPlugInInterface.h index 7b35a08..79c128d 100644 --- a/include/msvc6/testrunner/TestPlugInInterface.h +++ b/include/msvc6/testrunner/TestPlugInInterface.h @@ -10,7 +10,9 @@ #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #include <windows.h> #endif diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp b/src/cppunit/Win32DynamicLibraryManager.cpp index acadf46..5dac4fa 100644 --- a/src/cppunit/Win32DynamicLibraryManager.cpp +++ b/src/cppunit/Win32DynamicLibraryManager.cpp @@ -8,7 +8,9 @@ #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #define BLENDFUNCTION void // for mingw & gcc #include <windows.h> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits