ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/Src/DynamicLibrary.cpp
View File

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

2
Source/Core/VideoCommon/Src/DLCache.cpp
View File

@ -186,7 +186,7 @@ struct CachedDisplayList
{ {
if(Current->hash) 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; return false;
} }

2
Source/Core/VideoCommon/Src/VertexShaderManager.cpp
View File

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