From e0b6c1865e2e6425f860cf9dd5892396f53d0fa4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Thu, 22 Mar 2007 23:42:21 +0000 Subject: [PATCH] msvc: don't #define max and min git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17516 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 2 +- src/support/docstream.C | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index e9bfb7964b..589d808184 100644 --- 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 cc767c87df..ac9a8ed230 100644 --- a/src/support/docstream.C +++ b/src/support/docstream.C @@ -18,13 +18,6 @@ #include #include -#ifdef min -#undef min -#endif - -#ifdef max -#undef max -#endif using lyx::ucs4_codeset; -- 2.39.2