rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into adam-sandbox

This commit is contained in:
Adam Potolsky 2015-06-25 09:46:21 -07:00
parent 55a38ff8cc 4569de5413
commit 25c1754d2d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/arch/unix/ArchPluginUnix.cpp
View File

@ -35,6 +35,7 @@ typedef void (*cleanupFunc)();
void* g_eventTarget = NULL;
IEventQueue* g_events = NULL;
static const char kPre174Plugin[] = "Pre-1.7.4";
ArchPluginUnix::ArchPluginUnix()
{
@ -82,7 +83,13 @@ ArchPluginUnix::load()
String filename = synergy::string::removeFileExt(*it);
m_pluginTable.insert(std::make_pair(filename, library));
LOG((CLOG_DEBUG "loaded plugin: %s", (*it).c_str()));
const char * version = (char*)invoke( filename.c_str(),"version",NULL);
if (version == NULL) {
version = kPre174Plugin;
}
LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(),version));
}
}

5
src/lib/arch/win32/ArchPluginWindows.cpp
View File

@ -34,6 +34,7 @@ typedef void (*cleanupFunc)();
void* g_eventTarget = NULL;
IEventQueue* g_events = NULL;
static const char * kPre174Plugin = "Pre-1.7.v";
ArchPluginWindows::ArchPluginWindows()
{
@ -69,9 +70,9 @@ ArchPluginWindows::load()
String filename = synergy::string::removeFileExt(*it);
m_pluginTable.insert(std::make_pair(filename, lib));
char * version = (char*)invoke( filename.c_str(),"version",NULL);
const char * version = (char*)invoke( filename.c_str(),"version",NULL);
if (version == NULL) {
version = "Pre-1.7.4";
version = kPre174Plugin;
}
LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(),version));