[rkward-cvs] SF.net SVN: rkward:[3522] trunk/rkward/rkward/rbackend/rksignalsupport.cpp

[tfry at users.sourceforge.net]

Revision: 3522
          http://rkward.svn.sourceforge.net/rkward/?rev=3522&view=rev
Author:   tfry
Date:     2011-04-23 11:57:10 +0000 (Sat, 23 Apr 2011)

Log Message:
-----------
Experimental: Fix compilation problem on FreeBSD

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rksignalsupport.cpp

Modified: trunk/rkward/rkward/rbackend/rksignalsupport.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rksignalsupport.cpp	2011-04-23 10:33:22 UTC (rev 3521)
+++ trunk/rkward/rkward/rbackend/rksignalsupport.cpp	2011-04-23 11:57:10 UTC (rev 3522)
@@ -23,18 +23,18 @@
 
 #include "../debug.h"
 
-#ifndef __sighandler_t
-	typedef void (*__sighandler_t) (int);
-#endif
+// On some platforms sighandler_t is defined, on others it is not, but it's required to be the same everywhere, anyway.
+// To avoid re-definition errors, we just use our own "type".
+typedef void (*rk_sighandler_t) (int);
 
 namespace RKSignalSupportPrivate {
 #ifdef Q_WS_WIN
-	__sighandler_t r_sigsegv_handler = 0;
-	__sighandler_t default_sigsegv_handler = 0;
-	__sighandler_t r_sigill_handler = 0;
-	__sighandler_t default_sigill_handler = 0;
-	__sighandler_t r_sigabrt_handler = 0;
-	__sighandler_t default_sigabrt_handler = 0;
+	rk_sighandler_t r_sigsegv_handler = 0;
+	rk_sighandler_t default_sigsegv_handler = 0;
+	rk_sighandler_t r_sigill_handler = 0;
+	rk_sighandler_t default_sigill_handler = 0;
+	rk_sighandler_t r_sigabrt_handler = 0;
+	rk_sighandler_t default_sigabrt_handler = 0;
 #else
 	struct sigaction r_sigsegv_handler;
 	struct sigaction default_sigsegv_handler;
@@ -43,7 +43,7 @@
 	struct sigaction r_sigabrt_handler;
 	struct sigaction default_sigabrt_handler;
 #endif
-	__sighandler_t r_sigint_handler = 0;
+	rk_sighandler_t r_sigint_handler = 0;
 	void (*new_sigint_handler) (void) = 0;
 	void internal_sigint_handler (int num) {
 		new_sigint_handler ();
@@ -52,8 +52,8 @@
 
 #ifdef Q_WS_WIN
 	void signal_proxy (int signum) {
-		__sighandler_t r_handler = r_sigsegv_handler;
-		__sighandler_t default_handler = default_sigsegv_handler;
+		rk_sighandler_t r_handler = r_sigsegv_handler;
+		rk_sighandler_t default_handler = default_sigsegv_handler;
 #else
 	void signal_proxy (int signum, siginfo_t *info, void *context) {
 		struct sigaction r_handler = r_sigsegv_handler;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.