diff options
author | James Bursa <james@netsurf-browser.org> | 2005-08-21 12:04:18 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2005-08-21 12:04:18 +0000 |
commit | 08e8ee3ed19642b9fbad9f3d8764a0befd7f2a58 (patch) | |
tree | b6cf45a433bef0fd7ddab83bcb598d1c1ca31731 /content/content.h | |
parent | 4f82731104cafcc50607879957e248f0bec30e56 (diff) | |
download | netsurf-08e8ee3ed19642b9fbad9f3d8764a0befd7f2a58.tar.gz netsurf-08e8ee3ed19642b9fbad9f3d8764a0befd7f2a58.tar.bz2 |
[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
Diffstat (limited to 'content/content.h')
-rw-r--r-- | content/content.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/content/content.h b/content/content.h index 4bda90dfd..edb9fe0d7 100644 --- a/content/content.h +++ b/content/content.h @@ -2,7 +2,7 @@ * This file is part of NetSurf, http://netsurf.sourceforge.net/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2004 James Bursa <bursa@users.sourceforge.net> + * Copyright 2005 James Bursa <bursa@users.sourceforge.net> * Copyright 2003 Philip Pemberton <philpem@users.sourceforge.net> */ @@ -101,6 +101,7 @@ #ifndef _NETSURF_DESKTOP_CONTENT_H_ #define _NETSURF_DESKTOP_CONTENT_H_ +#include <stdint.h> #include "netsurf/utils/config.h" #include "netsurf/content/content_type.h" #include "netsurf/css/css.h" @@ -172,10 +173,10 @@ union content_msg_data { /** Linked list of users of a content. */ struct content_user { - void (*callback)(content_msg msg, struct content *c, void *p1, - void *p2, union content_msg_data data); - void *p1; - void *p2; + void (*callback)(content_msg msg, struct content *c, intptr_t p1, + intptr_t p2, union content_msg_data data); + intptr_t p1; + intptr_t p2; bool stop; struct content_user *next; }; @@ -286,23 +287,23 @@ bool content_redraw(struct content *c, int x, int y, int clip_x0, int clip_y0, int clip_x1, int clip_y1, float scale, unsigned long background_colour); bool content_add_user(struct content *c, - void (*callback)(content_msg msg, struct content *c, void *p1, - void *p2, union content_msg_data data), - void *p1, void *p2); + void (*callback)(content_msg msg, struct content *c, + intptr_t p1, intptr_t p2, union content_msg_data data), + intptr_t p1, intptr_t p2); struct content_user * content_find_user(struct content *c, - void (*callback)(content_msg msg, struct content *c, void *p1, - void *p2, union content_msg_data data), - void *p1, void *p2); + void (*callback)(content_msg msg, struct content *c, + intptr_t p1, intptr_t p2, union content_msg_data data), + intptr_t p1, intptr_t p2); void content_remove_user(struct content *c, - void (*callback)(content_msg msg, struct content *c, void *p1, - void *p2, union content_msg_data data), - void *p1, void *p2); + void (*callback)(content_msg msg, struct content *c, + intptr_t p1, intptr_t p2, union content_msg_data data), + intptr_t p1, intptr_t p2); void content_broadcast(struct content *c, content_msg msg, union content_msg_data data); void content_stop(struct content *c, - void (*callback)(content_msg msg, struct content *c, void *p1, - void *p2, union content_msg_data data), - void *p1, void *p2); + void (*callback)(content_msg msg, struct content *c, + intptr_t p1, intptr_t p2, union content_msg_data data), + intptr_t p1, intptr_t p2); void content_open(struct content *c, struct browser_window *bw, struct content *page, struct box *box, struct object_params *params); |