msvc: don't #define max and min

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17516 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index e9bfb7964b9fa4e73fb3a8bd59040ed409e75d2c..589d80818451ff1334f8a7d6c3f01e0208a215db 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -109,7 +109,7 @@ message("----- LOCALEDIR     : ${LOCALEDIR}")
 message("")
 
 if(MSVC)
-       ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) 
+       ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)      
        # disable checked iterators for msvc release builds to get maximum speed
        set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
 endif(MSVC)

diff --git a/src/support/docstream.C b/src/support/docstream.C
index cc767c87df57356e9f7b64fd87b60434788a3f20..ac9a8ed23050ac38e91e9c28787dda125151e798 100644 (file)
--- a/src/support/docstream.C
+++ b/src/support/docstream.C
@@ -18,13 +18,6 @@
 #include <iconv.h>
 #include <locale>
 
-#ifdef min
-#undef min
-#endif
-
-#ifdef max
-#undef max
-#endif
 
 using lyx::ucs4_codeset;