anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvc: don't #define max and min

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17516 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-03-22 23:42:21 +00:00
parent e5a34fb503
commit e0b6c1865e
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/CMakeLists.txt
View File

@ -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)

7
src/support/docstream.C
View File

@ -18,13 +18,6 @@
#include <iconv.h>
#include <locale>
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
using lyx::ucs4_codeset;