mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

s/WIN32/__WINDOWS__/ to stop a define collision with universalchardet. This is

Browse source 
a temp solution as the real fix is sorting out universalchardet to build
correctly.

Originally committed to SVN as r2087.
This commit is contained in:
Amar Takhar 2008-03-21 02:41:46 +00:00
parent 2b730ac4fa
commit d71641db51
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/text_file_reader.cpp
View file

@ -110,7 +110,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) {
CloseHandle(ifile); CloseHandle(ifile);
#else #else
ifstream ifile; ifstream ifile;
#ifdef WIN32 #ifdef __WINDOWS__
ifile.open(_filename.wc_str()); ifile.open(_filename.wc_str());
#else #else
ifile.open(wxFNCONV(_filename)); ifile.open(wxFNCONV(_filename));
@ -295,7 +295,7 @@ void TextFileReader::Open() {
throw _T("Failed opening file for reading."); throw _T("Failed opening file for reading.");
} }
#else #else
#ifdef WIN32 #ifdef __WINDOWS__
file.open(filename.wc_str(),std::ios::in | std::ios::binary); file.open(filename.wc_str(),std::ios::in | std::ios::binary);
#else #else
file.open(wxFNCONV(filename),std::ios::in | std::ios::binary); file.open(wxFNCONV(filename),std::ios::in | std::ios::binary);