A few compiler warnings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6975 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-29 22:48:33 +00:00
parent c0571ae9de
commit 043e324789
6 changed files with 7 additions and 10 deletions

View File

@ -81,8 +81,7 @@ int DynamicLibrary::Load(const char* filename)
// RTLD_LOCAL: don't resolve symbols for other libraries
library = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
#else
library = RTLD_SELF;
return 1;
library = dlopen(NULL, RTLD_LAZY);
#endif
DEBUG_LOG(COMMON, "DL: LoadLibrary: %s(%p)", filename, library);
@ -120,10 +119,8 @@ int DynamicLibrary::Unload()
library_file.c_str(), library);
#ifdef _WIN32
retval = FreeLibrary(library);
#elif defined __linux__
retval = dlclose(library) ? 0 : 1;
#else
return 1;
retval = dlclose(library) ? 0 : 1;
#endif
if (! retval) {

View File

@ -186,7 +186,7 @@ struct CachedDisplayList
{
if(Current->hash)
{
if(Current->ReferencedArray != -1 && (cached_arraybases[Current->ReferencedArray] != Current->start_address || arraystrides[Current->ReferencedArray] != Current->ReferencedArrayStride))
if(cached_arraybases[Current->ReferencedArray] != Current->start_address || arraystrides[Current->ReferencedArray] != Current->ReferencedArrayStride)
{
return false;
}

View File

@ -92,7 +92,7 @@ void UpdateProjectionHack(int iPhackvalue[], std::string sPhackvalue[])
float fhackvalue1 = 0, fhackvalue2 = 0;
float fhacksign1 = 1.0, fhacksign2 = 1.0;
bool bProjHack3 = false;
char *sTemp[2];
const char *sTemp[2];
if (iPhackvalue[0] == 0)
goto hackDisabled;

View File

@ -407,4 +407,4 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height
*height = m_targetHeight;
}
} // namespace OGL
} // namespace OGL

View File

@ -89,4 +89,4 @@ bool ApplyShader()
} // namespace
} // namespace OGL
} // namespace OGL

View File

@ -473,4 +473,4 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur
} // namespace
} // namespace OGL
} // namespace OGL