[Winmerge-svn] SF.net SVN: winmerge: [4978] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-01-30 19:33:26
|
Revision: 4978 http://winmerge.svn.sourceforge.net/winmerge/?rev=4978&view=rev Author: kimmov Date: 2008-01-30 11:33:24 -0800 (Wed, 30 Jan 2008) Log Message: ----------- Remove MFC/stdafx.h dependency from TempFile.cpp. Modified Paths: -------------- trunk/Src/Merge.dsp trunk/Src/TempFile.cpp Modified: trunk/Src/Merge.dsp =================================================================== --- trunk/Src/Merge.dsp 2008-01-30 17:26:30 UTC (rev 4977) +++ trunk/Src/Merge.dsp 2008-01-30 19:33:24 UTC (rev 4978) @@ -940,6 +940,7 @@ # Begin Source File SOURCE=.\TempFile.cpp +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File Modified: trunk/Src/TempFile.cpp =================================================================== --- trunk/Src/TempFile.cpp 2008-01-30 17:26:30 UTC (rev 4977) +++ trunk/Src/TempFile.cpp 2008-01-30 19:33:24 UTC (rev 4978) @@ -7,8 +7,7 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" // Required by paths.cpp :( -//#include "Windows.h" +#include "Windows.h" #include "UnicodeString.h" #include "TempFile.h" #include "paths.h" @@ -40,12 +39,12 @@ String temp = env_GetTempPath(NULL); if (temp.empty()) { - return _T(""); + return L""; } String pref = prefix; if (pref.empty()) - pref = _T("wmtmp"); + pref = L"wmtmp"; temp = env_GetTempFileName(temp.c_str(), pref.c_str(), NULL); if (!temp.empty()) @@ -67,12 +66,12 @@ String temp = env_GetTempPath(NULL); if (temp.empty()) { - return _T(""); + return L""; } String pref = prefix; if (pref.empty()) - pref = _T("wmtmp"); + pref = L"wmtmp"; temp = env_GetTempFileName(temp.c_str(), pref.c_str(), NULL); if (!temp.empty()) @@ -106,6 +105,6 @@ if (!m_path.empty()) success = DeleteFile(m_path.c_str()); if (success) - m_path = _T(""); + m_path = L""; return !!success; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |