[project @ 2004-05-02 00:21:40 by jmb]

Minimal fixes to allow compilation with Norcroft

svn path=/import/netsurf/; revision=813

8 files changed, 10 insertions, 9 deletions

diff --git a/content/fetch.c b/content/fetch.c
index 55ef247f5..35f19ca0f 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -443,7 +443,7 @@ void fetch_abort(struct fetch *f)
 			do {
 				fetch->locked++;
 				fetch->callback(FETCH_ERROR, fetch->p,
-						messages_get("FetchError"), 0);
+						(char*)messages_get("FetchError"), 0);
 				fetch->locked--;
 				next_fetch = fetch->queue_next;
 				fetch_free(fetch);
@@ -692,7 +692,7 @@ bool fetch_process_headers(struct fetch *f)
 	/* handle HTTP errors (non 2xx response codes) */
 	if (f->only_2xx && strncmp(f->url, "http", 4) == 0 &&
 			(http_code < 200 || 299 < http_code)) {
-		f->callback(FETCH_ERROR, f->p, messages_get("Not2xx"), 0);
+		f->callback(FETCH_ERROR, f->p, (char*)messages_get("Not2xx"), 0);
 		f->locked--;
 		return true;
 	}
@@ -717,7 +717,7 @@ bool fetch_process_headers(struct fetch *f)
 	}
 
 	LOG(("FETCH_TYPE, '%s'", type));
-	f->callback(FETCH_TYPE, f->p, type, f->content_length);
+	f->callback(FETCH_TYPE, f->p, (char*)type, f->content_length);
 	f->locked--;
 	if (f->aborting)
 		return true;
diff --git a/content/fetchcache.c b/content/fetchcache.c
index 23f8fc19a..f6fcb01f8 100644
--- a/content/fetchcache.c
+++ b/content/fetchcache.c
@@ -160,7 +160,7 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size)
 			mime_type = fetchcache_parse_type(data, &params);
 			type = content_lookup(mime_type);
 			LOG(("FETCH_TYPE, type %u", type));
-			content_set_type(c, type, mime_type, params);
+			content_set_type(c, type, mime_type, (const char**)params);
 			free(mime_type);
 			for (i = 0; params[i]; i++)
 				free(params[i]);
diff --git a/css/parser.y b/css/parser.y
index 81a2772c1..fc7a56289 100644
--- a/css/parser.y
+++ b/css/parser.y
@@ -320,6 +320,7 @@ any(A) ::= ASTERISK(B).
 
 %extra_argument { struct css_parser_params *param }
 %include {
+#include <string.h>
 #define CSS_INTERNALS
 #include "netsurf/css/css.h"
 #include "netsurf/utils/utils.h" }
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 2cbdc6916..10d13a519 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -26,6 +26,7 @@ bool netsurf_quit = false;
 static void netsurf_init(int argc, char** argv);
 static void netsurf_poll(void);
 static void netsurf_exit(void);
+extern void save_complete_init(void);
 
 
 /**
diff --git a/riscos/dialog.c b/riscos/dialog.c
index a0320c19c..9a93da379 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -31,7 +31,6 @@ wimp_w dialog_info, dialog_saveas, dialog_config, dialog_config_br,
 	dialog_401li,
 #endif
 	dialog_zoom, dialog_pageinfo, dialog_tooltip;
-	;
 wimp_menu* theme_menu = NULL;
 
 static int font_size;
diff --git a/riscos/gui.c b/riscos/gui.c
index 559fdc4b9..fcf6f57fc 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -447,7 +447,7 @@ void ro_gui_handle_event(wimp_event_no event, wimp_block *block)
 			break;
 
 		case wimp_POINTER_LEAVING_WINDOW:
-		        if (over_window == history_window)
+		        if (over_window == (gui_window*)history_window)
 		                wimp_close_window(dialog_tooltip);
 			over_window = 0;
 			gui_window_set_pointer(GUI_POINTER_DEFAULT);
@@ -456,7 +456,7 @@ void ro_gui_handle_event(wimp_event_no event, wimp_block *block)
 		case wimp_POINTER_ENTERING_WINDOW:
 			over_window = ro_lookup_gui_from_w(block->entering.w);
 			if (over_window == 0 && block->entering.w == history_window)
-			        over_window = history_window;
+			        over_window = (gui_window*)history_window;
 			break;
 
 		case wimp_MOUSE_CLICK:
diff --git a/riscos/plugin.c b/riscos/plugin.c
index 01926fd50..fe8ba080c 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -113,7 +113,7 @@ static int need_reformat = 0;
 /**
  * Initialises plugin system in readiness for receiving object data
  */
-void plugin_create(struct content *c)
+void plugin_create(struct content *c, const char *params[])
 {
         c->data.plugin.data = xcalloc(0, 1);
         c->data.plugin.length = 0;
diff --git a/riscos/plugin.h b/riscos/plugin.h
index 6f3d8220d..f08465897 100644
--- a/riscos/plugin.h
+++ b/riscos/plugin.h
@@ -70,7 +70,7 @@ struct plugin_param_item {
 /* function definitions */
 bool plugin_handleable(const char *mime_type);
 void plugin_msg_parse(wimp_message *message, int ack);
-void plugin_create(struct content *c);
+void plugin_create(struct content *c, const char *params[]);
 void plugin_process_data(struct content *c, char *data, unsigned long size);
 int plugin_convert(struct content *c, unsigned int width, unsigned int height);
 void plugin_revive(struct content *c, unsigned int width, unsigned int height);