Remove some unnecessary includes, clean some ////////

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1961 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-01-20 18:45:43 +00:00
parent 1dcd036b9e
commit 8f0ca9998b
3 changed files with 12 additions and 75 deletions

View File

@ -15,19 +15,12 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
//////////////////////////////////////////////////////////////////////////////////////////
// File description
/*
All plugins from Core > Plugins are loaded and unloaded with this class when Dolpin is started
and stopped.
//////////////////////////////////////*/
//////////////////////////////////////////////////////////////////////////////////////////
// Includes
// -----------
#include <string.h>
#ifdef _WIN32
#include <windows.h>
@ -40,8 +33,6 @@ and stopped.
#include "FileUtil.h"
#include "StringUtil.h"
#include "DynamicLibrary.h"
///////////////////////////////////
DynamicLibrary::DynamicLibrary()
{
@ -70,18 +61,15 @@ std::string GetLastErrorAsString()
}
return s;
#else
static std::string errstr;
char *tmp = dlerror();
if (tmp)
errstr = tmp;
return errstr;
static std::string errstr;
char *tmp = dlerror();
if (tmp)
errstr = tmp;
return errstr;
#endif
}
//////////////////////////////////////////////////////////////////////////////////////////
// Includes
// -----------
/* Function: Loading means loading the dll with LoadLibrary() to get an instance to the dll.
This is done when Dolphin is started to determine which dlls are good, and before opening
the Config and Debugging windows from Plugin.cpp and before opening the dll for running
@ -94,7 +82,7 @@ int DynamicLibrary::Load(const char* filename)
if (!filename || strlen(filename) == 0)
{
LOG(MASTER_LOG, "Missing filename of dynamic library to load");
PanicAlert("Missing filename of dynamic library to load");
PanicAlert("Missing filename of dynamic library to load");
return 0;
}
LOG(MASTER_LOG, "Trying to load library %s", filename);
@ -121,7 +109,6 @@ int DynamicLibrary::Load(const char* filename)
return 1;
}
int DynamicLibrary::Unload()
{
int retval;