From 95263289acb8b53cc5369b1ae93ef97c5b3dadc2 Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Fri, 21 Mar 2003 19:14:32 +0000
Subject: [PATCH] Fixed errors in merge causing infinite loops.

---
 lib/arch/CArchMiscWindows.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/arch/CArchMiscWindows.cpp b/lib/arch/CArchMiscWindows.cpp
index cc91d025..f76b42f1 100644
--- a/lib/arch/CArchMiscWindows.cpp
+++ b/lib/arch/CArchMiscWindows.cpp
@@ -13,6 +13,7 @@
  */
 
 #include "CArchMiscWindows.h"
+#include "CArchDaemonWindows.h"
 
 //
 // CArchMiscWindows
@@ -33,19 +34,19 @@ CArchMiscWindows::isWindows95Family()
 int
 CArchMiscWindows::runDaemon(RunFunc runFunc)
 {
-	return CArchMiscWindows::runDaemon(runFunc);
+	return CArchDaemonWindows::runDaemon(runFunc);
 }
 
 void
 CArchMiscWindows::daemonRunning(bool running)
 {
-	CArchMiscWindows::daemonRunning(running);
+	CArchDaemonWindows::daemonRunning(running);
 }
 
 void
 CArchMiscWindows::daemonFailed(int result)
 {
-	CArchMiscWindows::daemonFailed(result);
+	CArchDaemonWindows::daemonFailed(result);
 }
 
 HKEY