diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-04-02 23:17:19 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-04-02 23:18:01 +0200 |
| commit | 5ee5394ccec1e9fa07f2a84d73209472c8a1daab (patch) | |
| tree | f9c70f692e87742d14bad7142563e894ad0a8c5f | |
| parent | a412733438e4a589069f4db2ae17bd6e32d07864 (diff) | |
| download | cppunit-5ee5394ccec1e9fa07f2a84d73209472c8a1daab.tar.gz | |
tdf#116653, avoid NOMINMAX redefinition warnings with mingw
| -rw-r--r-- | include/cppunit/plugin/TestPlugIn.h | 2 | ||||
| -rw-r--r-- | include/msvc6/testrunner/TestPlugInInterface.h | 2 | ||||
| -rw-r--r-- | src/cppunit/Win32DynamicLibraryManager.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
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> |