Changeset 8293 in orxonox.OLD for trunk/src/util

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

Location:

trunk/src/util

Files:

• signal_handler.cc (modified) (3 diffs)
• signal_handler.h (modified) (2 diffs)

trunk/src/util/signal_handler.cc

@@ -46 +46 @@
 void SignalHandler::catchSignal( int sig )
 {
-  sighandler_t handler = signal( sig, SignalHandler::sigHandler );
+  sig_t handler = signal( sig, SignalHandler::sigHandler );
 
   assert( handler != SIG_ERR );
@@ -63 +63 @@
     (*(it->cb))( it->someData );
   }
+
+  std::string sigName = "UNKNOWN";
   
-  std::string sigName = "UNKNOWN";
-
   switch ( sig )
   {
@@ -90 +90 @@
   {
     getInstance()->dontCatch();
-    
     sleep(2);
 

trunk/src/util/signal_handler.h

@@ -10 +10 @@
 #include <string>
 
+
 #define GDB_BT_FILE "orxonox.backtrace"
-
 enum GdbRunType{
   GDB_RUN_WRITE_TO_FILE = 1,
@@ -25 +25 @@
 {
   int signal;
-  sighandler_t handler;
+  sig_t handler;
 };