[Winmerge-svn] SF.net SVN: winmerge:[7167] trunk/Src/Common
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2010-05-16 13:15:41
|
Revision: 7167 http://winmerge.svn.sourceforge.net/winmerge/?rev=7167&view=rev Author: jtuc Date: 2010-05-16 13:15:33 +0000 (Sun, 16 May 2010) Log Message: ----------- Relate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of VS2010 Express in conjunction with MFC71 Modified Paths: -------------- trunk/Src/Common/scbarg.h trunk/Src/Common/sizecbar.h Modified: trunk/Src/Common/scbarg.h =================================================================== --- trunk/Src/Common/scbarg.h 2010-05-16 12:05:13 UTC (rev 7166) +++ trunk/Src/Common/scbarg.h 2010-05-16 13:15:33 UTC (rev 7167) @@ -35,7 +35,7 @@ // MFC 8/VS.NET 2005 has breaking change in OnNcHitTest return value #ifndef NCHITTEST_RESULT -#if _MSC_VER >= 1400 +#if _MFC_VER >= 0x0800 #define NCHITTEST_RESULT LRESULT #else #define NCHITTEST_RESULT UINT Modified: trunk/Src/Common/sizecbar.h =================================================================== --- trunk/Src/Common/sizecbar.h 2010-05-16 12:05:13 UTC (rev 7166) +++ trunk/Src/Common/sizecbar.h 2010-05-16 13:15:33 UTC (rev 7167) @@ -38,7 +38,7 @@ // MFC 8/VS.NET 2005 has breaking change in OnNcHitTest return value #ifndef NCHITTEST_RESULT -#if _MSC_VER >= 1400 +#if _MFC_VER >= 0x0800 #define NCHITTEST_RESULT LRESULT #else #define NCHITTEST_RESULT UINT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |