Various minor fixes to allow building with clang on OS X.

Fixes issue 3992. 

wxWidgets patch at http://trac.wxwidgets.org/ticket/12332 .


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6929 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-27 05:01:00 +00:00
parent 826e37a279
commit 0288742565
51 changed files with 12147 additions and 12138 deletions

View File

@ -41,8 +41,8 @@ CISOFileReader* CISOFileReader::Create(const char* filename)
{
if (IsCISOBlob(filename))
{
FILE* file_ = fopen(filename, "rb");
return new CISOFileReader(file_);
FILE* f = fopen(filename, "rb");
return new CISOFileReader(f);
}
else
return NULL;

View File

@ -30,9 +30,9 @@ PlainFileReader::PlainFileReader(FILE* file__)
PlainFileReader* PlainFileReader::Create(const char* filename)
{
FILE* file_ = fopen(filename, "rb");
if (file_)
return new PlainFileReader(file_);
FILE* f = fopen(filename, "rb");
if (f)
return new PlainFileReader(f);
else
return NULL;
}