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

Fixed errors in merge causing infinite loops.

This commit is contained in:
crs 2003-03-21 19:14:32 +00:00
parent 7684b35c4f
commit 95263289ac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/arch/CArchMiscWindows.cpp
View File

@ -13,6 +13,7 @@
*/ */
#include "CArchMiscWindows.h" #include "CArchMiscWindows.h"
#include "CArchDaemonWindows.h"
// //
// CArchMiscWindows // CArchMiscWindows
@ -33,19 +34,19 @@ CArchMiscWindows::isWindows95Family()
int int
CArchMiscWindows::runDaemon(RunFunc runFunc) CArchMiscWindows::runDaemon(RunFunc runFunc)
{ {
return CArchMiscWindows::runDaemon(runFunc); return CArchDaemonWindows::runDaemon(runFunc);
} }
void void
CArchMiscWindows::daemonRunning(bool running) CArchMiscWindows::daemonRunning(bool running)
{ {
CArchMiscWindows::daemonRunning(running); CArchDaemonWindows::daemonRunning(running);
} }
void void
CArchMiscWindows::daemonFailed(int result) CArchMiscWindows::daemonFailed(int result)
{ {
CArchMiscWindows::daemonFailed(result); CArchDaemonWindows::daemonFailed(result);
} }
HKEY HKEY