diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2004-05-02 00:21:41 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2004-05-02 00:21:41 +0000 |
| commit | 8cb321ec78908552cfc1329da3d6efaeac1e8423 (patch) | |
| tree | 1e386700b410a648c5e1b71cb54c865843b45718 /riscos | |
| parent | 8d57502f04441fff8678e5187e6955f75bf429b5 (diff) | |
| download | netsurf-8cb321ec78908552cfc1329da3d6efaeac1e8423.tar.gz netsurf-8cb321ec78908552cfc1329da3d6efaeac1e8423.tar.bz2 | |
[project @ 2004-05-02 00:21:40 by jmb]
Minimal fixes to allow compilation with Norcroft
svn path=/import/netsurf/; revision=813
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/dialog.c | 1 | ||||
| -rw-r--r-- | riscos/gui.c | 4 | ||||
| -rw-r--r-- | riscos/plugin.c | 2 | ||||
| -rw-r--r-- | riscos/plugin.h | 2 |
4 files changed, 4 insertions, 5 deletions
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); |