From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- render/box.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'render/box.h') diff --git a/render/box.h b/render/box.h index e7c19ad6d..b5092728f 100644 --- a/render/box.h +++ b/render/box.h @@ -99,7 +99,7 @@ struct box; struct column; struct object_params; struct object_param; - +struct html_content; #define UNKNOWN_WIDTH INT_MAX #define UNKNOWN_MAX_WIDTH INT_MAX @@ -332,8 +332,8 @@ bool box_handle_scrollbars(struct browser_window *bw, struct box *box, bool box_vscrollbar_present(const struct box *box); bool box_hscrollbar_present(const struct box *box); -bool xml_to_box(xmlNode *n, struct content *c); +bool xml_to_box(xmlNode *n, struct html_content *c); -bool box_normalise_block(struct box *block, struct content *c); +bool box_normalise_block(struct box *block, struct html_content *c); #endif -- cgit v1.2.3