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

fixed linux syntax and build errors

This commit is contained in:
Nick Bolton 2012-07-10 18:35:33 +00:00
parent d48dfd62dd
commit 5f0402d47b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/ipc/CMakeLists.txt
View File

@ -56,5 +56,5 @@ include_directories(${inc})
add_library(ipc STATIC ${src}) add_library(ipc STATIC ${src})
if (UNIX) if (UNIX)
target_link_libraries(arch base common mt io net synergy) target_link_libraries(ipc arch base common mt io net synergy)
endif() endif()

20
src/lib/synergy/CDaemonApp.cpp
View File

@ -24,6 +24,13 @@
#include "CLog.h" #include "CLog.h"
#include "XArch.h" #include "XArch.h"
#include "CApp.h" #include "CApp.h"
#include "TMethodJob.h"
#include "TMethodEventJob.h"
#include "CIpcClientProxy.h"
#include "CIpcMessage.h"
#include "CSocketMultiplexer.h"
#include "CIpcLogOutputter.h"
#include "CLog.h"
#include <string> #include <string>
#include <iostream> #include <iostream>
@ -37,13 +44,6 @@
#include "CMSWindowsScreen.h" #include "CMSWindowsScreen.h"
#include "CMSWindowsRelauncher.h" #include "CMSWindowsRelauncher.h"
#include "CMSWindowsDebugOutputter.h" #include "CMSWindowsDebugOutputter.h"
#include "TMethodJob.h"
#include "TMethodEventJob.h"
#include "CIpcClientProxy.h"
#include "CIpcMessage.h"
#include "CSocketMultiplexer.h"
#include "CIpcLogOutputter.h"
#include "CLog.h"
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
@ -292,7 +292,7 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*)
switch (m->type()) { switch (m->type()) {
case kIpcCommand: { case kIpcCommand: {
CIpcCommandMessage* cm = static_cast<CIpcCommandMessage*>(m); CIpcCommandMessage* cm = static_cast<CIpcCommandMessage*>(m);
CString& command = cm->command(); CString command = cm->command();
LOG((CLOG_DEBUG "got new command: %s", command.c_str())); LOG((CLOG_DEBUG "got new command: %s", command.c_str()));
CString debugArg("--debug"); CString debugArg("--debug");
@ -321,11 +321,13 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*)
catch (XArch& e) { catch (XArch& e) {
LOG((CLOG_ERR "failed to save Command setting, %s", e.what().c_str())); LOG((CLOG_ERR "failed to save Command setting, %s", e.what().c_str()));
} }
#if SYSAPI_WIN32
// tell the relauncher about the new command. this causes the // tell the relauncher about the new command. this causes the
// relauncher to stop the existing command and start the new // relauncher to stop the existing command and start the new
// command. // command.
m_relauncher->command(command); m_relauncher->command(command);
#endif
break; break;
} }