summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-03-28 01:09:03 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-03-28 01:09:03 +0000
commitf0a06d8535e08db5b741a06127ddb91486e8bd73 (patch)
tree070db18c5403f8bda3142194abe62a49b3702197
parentc43141645521b3557dd04eef6377ae18847f5188 (diff)
downloadnetsurf-f0a06d8535e08db5b741a06127ddb91486e8bd73.tar.gz
netsurf-f0a06d8535e08db5b741a06127ddb91486e8bd73.tar.bz2
Aliasing fixes
svn path=/trunk/netsurf/; revision=6956
-rw-r--r--riscos/history.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/riscos/history.c b/riscos/history.c
index 4fbc2f1f4..6157727c7 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -34,6 +34,7 @@
#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
+#include "riscos/wimputils.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/utils.h"
@@ -117,7 +118,7 @@ void ro_gui_history_open(struct browser_window *bw,
state.visible.x1 = width;
state.visible.y1 = height;
state.next = wimp_HIDDEN;
- error = xwimp_open_window((wimp_open *) &state);
+ error = xwimp_open_window(PTR_WIMP_OPEN(&state));
if (error) {
LOG(("xwimp_open_window: 0x%x: %s",
error->errnum, error->errmess));
@@ -171,7 +172,7 @@ void ro_gui_history_redraw(wimp_draw *redraw)
void ro_gui_history_mouse_at(wimp_pointer *pointer)
{
int x, y;
- long width;
+ int width;
const char *url;
wimp_window_state state;
wimp_icon_state ic;
@@ -215,7 +216,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer)
/* get width of string */
error = xwimptextop_string_width(url,
strlen(url) > 256 ? 256 : strlen(url),
- (int *) &width);
+ &width);
if (error) {
LOG(("xwimptextop_string_width: 0x%x: %s",
error->errnum, error->errmess));
@@ -272,7 +273,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer)
state.visible.y1 = pointer->pos.y - 22;
state.next = wimp_TOP;
/* open window */
- error = xwimp_open_window((wimp_open *) &state);
+ error = xwimp_open_window(PTR_WIMP_OPEN(&state));
if (error) {
LOG(("xwimp_open_window: 0x%x: %s",
error->errnum, error->errmess));