summaryrefslogtreecommitdiff
path: root/src/cppunit
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-04-02 23:17:19 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-04-02 23:18:01 +0200
commit5ee5394ccec1e9fa07f2a84d73209472c8a1daab (patch)
treef9c70f692e87742d14bad7142563e894ad0a8c5f /src/cppunit
parenta412733438e4a589069f4db2ae17bd6e32d07864 (diff)
downloadcppunit-5ee5394ccec1e9fa07f2a84d73209472c8a1daab.tar.gz
tdf#116653, avoid NOMINMAX redefinition warnings with mingw
Diffstat (limited to 'src/cppunit')
-rw-r--r--src/cppunit/Win32DynamicLibraryManager.cpp2
1 files changed, 2 insertions, 0 deletions
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>