[maemo-commits] [maemo-commits] r8804 - in projects/haf/trunk/libsdl1.2: debian src

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2006-12-18 19:12:04 +0200 (Mon, 18 Dec 2006)
New Revision: 8804

Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/src/SDL_fatal.c
Log:
src/SDL_fatal.c: Parachute will raise same signal it received.


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2006-12-18 14:37:55 UTC (rev 8803)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2006-12-18 17:12:04 UTC (rev 8804)
@@ -1,3 +1,11 @@
+libsdl1.2 (1.2.8-16un) unstable; urgency=low
+
+  * src/SDL_fatal.c: fatals will raise invoking signal after SDL_Quit().
+    Fixes: NB#48789
+  * UNRELEASED
+
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Mon, 18 Dec 2006 19:08:21 +0200
+
 libsdl1.2 (1.2.8-15) unstable; urgency=low
 
   * src/video/x11/: Both windows get WM classname and unused is unmapped.

Modified: projects/haf/trunk/libsdl1.2/src/SDL_fatal.c
===================================================================
--- projects/haf/trunk/libsdl1.2/src/SDL_fatal.c	2006-12-18 14:37:55 UTC (rev 8803)
+++ projects/haf/trunk/libsdl1.2/src/SDL_fatal.c	2006-12-18 17:12:04 UTC (rev 8804)
@@ -75,13 +75,6 @@
 		case SIGSEGV:
 			print_msg("Segmentation Fault");
 			break;
-#ifdef SIGBUS
-#if SIGBUS != SIGSEGV
-		case SIGBUS:
-			print_msg("Bus Error");
-			break;
-#endif
-#endif /* SIGBUS */
 #ifdef SIGFPE
 		case SIGFPE:
 			print_msg("Floating Point Exception");
@@ -105,7 +98,8 @@
 	}
 	print_msg(" (SDL Parachute Deployed)\n");
 	SDL_Quit();
-	exit(-sig);
+	signal(sig, SIG_DFL);
+	raise(sig);
 }
 
 static int SDL_fatal_signals[] = {