From 08e8ee3ed19642b9fbad9f3d8764a0befd7f2a58 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Sun, 21 Aug 2005 12:04:18 +0000 Subject: [project @ 2005-08-21 12:04:17 by bursa] Change void * parameters to intptr_t to make them correct for storing integers or pointers. svn path=/import/netsurf/; revision=1852 --- css/css.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'css') diff --git a/css/css.c b/css/css.c index 0fea19c92..2b4ad4d24 100644 --- a/css/css.c +++ b/css/css.c @@ -74,6 +74,7 @@ #define _GNU_SOURCE /* for strndup */ #include +#include #include #include #include @@ -102,7 +103,7 @@ struct css_working_stylesheet { static void css_deep_free_style(struct css_style *style); static void css_atimport_callback(content_msg msg, struct content *css, - void *p1, void *p2, union content_msg_data data); + intptr_t p1, intptr_t p2, union content_msg_data data); static bool css_working_list_imports(struct content **import, unsigned int import_count, struct content ***css, unsigned int *css_count); @@ -484,7 +485,7 @@ void css_destroy(struct content *c) if (c->data.css.import_content[i] != 0) { free(c->data.css.import_url[i]); content_remove_user(c->data.css.import_content[i], - css_atimport_callback, c, (void*)i); + css_atimport_callback, (intptr_t) c, i); } free(c->data.css.import_url); free(c->data.css.import_content); @@ -869,12 +870,12 @@ void css_atimport(struct content *c, struct css_node *node) i = c->data.css.import_count - 1; c->data.css.import_url[i] = url1; c->data.css.import_content[i] = fetchcache(c->data.css.import_url[i], - css_atimport_callback, c, (void *) i, + css_atimport_callback, (intptr_t) c, i, c->width, c->height, true, 0, 0, false, false); if (c->data.css.import_content[i]) { c->active++; fetchcache_go(c->data.css.import_content[i], c->url, - css_atimport_callback, c, (void *) i, + css_atimport_callback, (intptr_t) c, i, c->width, c->height, 0, 0, false); } @@ -888,14 +889,16 @@ void css_atimport(struct content *c, struct css_node *node) */ void css_atimport_callback(content_msg msg, struct content *css, - void *p1, void *p2, union content_msg_data data) + intptr_t p1, intptr_t p2, union content_msg_data data) { - struct content *c = p1; - unsigned int i = (unsigned int) p2; + struct content *c = (struct content *) p1; + unsigned int i = p2; + switch (msg) { case CONTENT_MSG_LOADING: if (css->type != CONTENT_CSS) { - content_remove_user(css, css_atimport_callback, c, (void*)i); + content_remove_user(css, css_atimport_callback, + (intptr_t) c, i); c->data.css.import_content[i] = 0; c->active--; content_add_error(c, "NotCSS", 0); @@ -931,14 +934,14 @@ void css_atimport_callback(content_msg msg, struct content *css, } c->data.css.import_content[i] = fetchcache( c->data.css.import_url[i], - css_atimport_callback, c, (void *) i, + css_atimport_callback, (intptr_t) c, i, css->width, css->height, true, 0, 0, false, false); if (c->data.css.import_content[i]) { c->active++; fetchcache_go(c->data.css.import_content[i], c->url, css_atimport_callback, - c, (void *) i, + (intptr_t) c, i, css->width, css->height, 0, 0, false); } -- cgit v1.2.3