Skip to content

Commit

Permalink
fixed a merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
frankseide committed Apr 16, 2016
1 parent 78d10c5 commit 75099e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Source/Common/File.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void File::Init(const wchar_t* filename, int fileOptions)
// (wstring only for now; feel free to make this a template if needed)
/*static*/ wstring File::DirectoryPathOf(wstring path)
{
#if WIN32
#ifdef _WIN32
HRESULT hr;
path = msra::strfun::ReplaceAll<wstring>(path, L"/", L"\\"); // Win32 accepts forward slashes, but it seems that PathRemoveFileSpec() does not
if (IsWindows8OrGreater()) // PathCchRemoveFileSpec() only available on Windows 8+
Expand Down

0 comments on commit 75099e2

Please sign in to comment.