Imported Upstream version 0.3.2

[anytun.git] / src / signalController.h

diff --git a/src/signalController.h b/src/signalController.h
index 575b50b..6108bea 100644 (file)
--- a/src/signalController.h
+++ b/src/signalController.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,8 +30,8 @@
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SIGNAL_CONTROLLER_H_
-#define _SIGNAL_CONTROLLER_H_
+#ifndef ANYTUN_signalController_h_INCLUDED
+#define ANYTUN_signalController_h_INCLUDED
 
 #include <map>
 #include <queue>
@@ -164,11 +165,7 @@ public:
 private:
   typedef std::map<int, SignalHandler*> HandlerMap;
 
-#ifndef _MSC_VER
-  SignalController() : thread(NULL) {};
-#else
   SignalController() {};
-#endif
   ~SignalController();
   SignalController(const SignalController &s);
   void operator=(const SignalController &s);
@@ -188,9 +185,6 @@ private:
   Mutex sigQueueMutex;
   Semaphore sigQueueSem;
 
-#ifndef _MSC_VER  
-  boost::thread* thread;
-#endif
   HandlerMap handler;
 };