Changeset 1607 for code/branches/core3/src/orxonox

Timestamp:

Jun 16, 2008, 11:07:34 PM (16 years ago)

Author:

rgrieder

Message:

moved SignalHandler from core to orxonox

Location:

code/branches/core3/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Main.cc (modified) (1 diff)
• SignalHandler.cc (moved) (moved from code/branches/core3/src/core/SignalHandler.cc) (3 diffs)
• SignalHandler.h (moved) (moved from code/branches/core3/src/core/SignalHandler.h) (3 diffs)

code/branches/core3/src/orxonox/CMakeLists.txt

@@ -4 +4 @@
   Orxonox.cc
   Settings.cc
+  SignalHandler.cc
 
   console/InGameConsole.cc

code/branches/core3/src/orxonox/Main.cc

@@ -37 +37 @@
 
 #include "util/OrxonoxPlatform.h"
-#include "core/SignalHandler.h"
+#include "SignalHandler.h"
 #include "Orxonox.h"
 

code/branches/core3/src/orxonox/SignalHandler.cc

@@ -32 +32 @@
 */
 
+#include "OrxonoxStableHeaders.h"
 #include "SignalHandler.h"
 
@@ -39 +40 @@
 SignalHandler * SignalHandler::singletonRef = NULL;
 
-#ifndef __WIN32__
+#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
 
 #include <wait.h>
@@ -349 +350 @@
 }
 
-#endif /* __WIN32__ */
+#endif /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */

code/branches/core3/src/orxonox/SignalHandler.h

@@ -35 +35 @@
 #define _SignalHandler_H__
 
-#include "CorePrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include <list>
@@ -42 +42 @@
 typedef int (*SignalCallback)( void * someData );
 
-#ifndef __WIN32__
+#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
 #include <signal.h>
 
@@ -91 +91 @@
 };
 
-#else /* #ifndef __WIN32__ */
+#else /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */
 
-class _CoreExport SignalHandler
+class _OrxonoxExport SignalHandler
 {
- public:
-   inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
-   void doCatch( const std::string & appName, const std::string & fileName ) {};
-  void dontCatch() {};
-  void registerCallback( SignalCallback cb, void * someData ) {};
+  public:
+    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
+    void doCatch( const std::string & appName, const std::string & fileName ) {};
+    void dontCatch() {};
+    void registerCallback( SignalCallback cb, void * someData ) {};
 
- private:
+  private:
     static SignalHandler * singletonRef;
 };
-#endif /* #ifndef __WIN32__ */
+
+#endif /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */
 
 #endif /* _SignalHandler_H__ */