forked from mia/Aegisub
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.
This commit is contained in:
parent
2b730ac4fa
commit
d71641db51
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue