From 9865b9fde2d675d974d6a0414a4ec084e1905b84 Mon Sep 17 00:00:00 2001
From: Markus Grüneis <gimpf@gimpf.org>
Date: Tue, 16 Feb 2010 19:17:43 +0000
Subject: fixed win32 build

---
 src/signalController.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/signalController.h')

diff --git a/src/signalController.h b/src/signalController.h
index 8a82c9e..fa5f0fb 100644
--- a/src/signalController.h
+++ b/src/signalController.h
@@ -39,14 +39,12 @@
 
 #include "threadUtils.hpp"
 
-#ifndef _MSC_VER
-#include "daemonService.h"
-#else
 #ifdef WIN_SERVICE
-#include "win32/winService.h"
+//#include "win32/winService.h"
+class WinService;
+typedef WinService DaemonService;
 #else
-#include "nullDaemon.h"
-#endif
+class DaemonService;
 #endif
 
 #define SIGERROR -1
@@ -61,8 +59,7 @@ class SignalController
 public:
   static SignalController& instance();
 
-  void init();
-  void init(DaemonService* service);
+  void init(DaemonService& service);
   int run();
   void inject(int sig, const std::string& msg = "");
 
@@ -92,7 +89,7 @@ private:
   typedef std::map<CallbackType, ServiceCallback> CallbackMap;
   CallbackMap callbacks;
 
-  friend void registerSignalHandler(SignalController& ctrl, DaemonService* service);
+  friend void registerSignalHandler(SignalController& ctrl, DaemonService& service);
 };
 
 extern SignalController& gSignalController;
-- 
cgit v1.2.3