From d71641db51856bd68b14658c957f21ecc8331e8d Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Fri, 21 Mar 2008 02:41:46 +0000 Subject: [PATCH] s/WIN32/__WINDOWS__/ to stop a define collision with universalchardet. This is a temp solution as the real fix is sorting out universalchardet to build correctly. Originally committed to SVN as r2087. --- aegisub/text_file_reader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/text_file_reader.cpp b/aegisub/text_file_reader.cpp index 18c9f072a..3203fde2e 100644 --- a/aegisub/text_file_reader.cpp +++ b/aegisub/text_file_reader.cpp @@ -110,7 +110,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) { CloseHandle(ifile); #else ifstream ifile; -#ifdef WIN32 +#ifdef __WINDOWS__ ifile.open(_filename.wc_str()); #else ifile.open(wxFNCONV(_filename)); @@ -295,7 +295,7 @@ void TextFileReader::Open() { throw _T("Failed opening file for reading."); } #else -#ifdef WIN32 +#ifdef __WINDOWS__ file.open(filename.wc_str(),std::ios::in | std::ios::binary); #else file.open(wxFNCONV(filename),std::ios::in | std::ios::binary);