From 9c53f989468300f7b20708b239718754b4431855 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 26 Jun 2005 22:25:49 +0000
Subject: [project @ 2005-06-26 22:25:49 by jmb] Update to cater for changes in
 UnixLib:   - unixlib/features.h is now features.h   - __dynamic_da_name is
 now declared as const char * const   - We explicitly force all FPU
 exceptions/traps back on (UnixLib default is now off) Correct error message
 when <NetSurf$Dir>.Resources.Sprites is missing.

svn path=/import/netsurf/; revision=1767
---
 riscos/gui.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'riscos')

diff --git a/riscos/gui.c b/riscos/gui.c
index 77eb3d108..bca01913a 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -11,13 +11,14 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <fpu_control.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unixlib/features.h>
+#include <features.h>
 #include <unixlib/local.h>
 #include "oslib/font.h"
 #include "oslib/help.h"
@@ -108,10 +109,9 @@
 #define FILETYPE_JPEG 0xc85
 #endif
 
-
 int os_version = 0;
 
-const char *__dynamic_da_name = "NetSurf";	/**< For UnixLib. */
+const char * const __dynamic_da_name = "NetSurf";	/**< For UnixLib. */
 int __dynamic_da_max_size = 128 * 1024 * 1024;	/**< For UnixLib. */
 int __feature_imagefs_is_file = 1;		/**< For UnixLib. */
 /* default filename handling */
@@ -238,6 +238,10 @@ void gui_init(int argc, char** argv)
 	struct theme_descriptor *descriptor = NULL;
 	char *nsdir_temp;
 
+	/* re-enable all FPU exceptions/traps -
+	 * UnixLib disables them by default */
+	_FPU_SETCW(_FPU_IEEE);
+
 	xhourglass_start(1);
 
 	/* read OS version for code that adapts to conform to the OS (remember
@@ -446,7 +450,7 @@ void ro_gui_sprites_init(void)
 		die(e->errmess);
 	}
 	if (obj_type != fileswitch_IS_FILE)
-		die("<NetSurf$Dir>.Resources.Pointers missing.");
+		die("<NetSurf$Dir>.Resources.Sprites missing.");
 
 	gui_sprites = malloc(len + 4);
 	if (!gui_sprites)
-- 
cgit v1.2.3