summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Sidwell <andy@entai.co.uk>2008-08-11 08:40:58 +0000
committerAndrew Sidwell <andy@entai.co.uk>2008-08-11 08:40:58 +0000
commit3a3f39e9274262a626d43eb66dc09185d55526b2 (patch)
tree0610f688dcfdb39222fece9fa2f90b4d95a29a2e
parent7d482d33bfc0c3eb497a28158eb5ea1ca4ff5082 (diff)
downloadnetsurf-3a3f39e9274262a626d43eb66dc09185d55526b2.tar.gz
netsurf-3a3f39e9274262a626d43eb66dc09185d55526b2.tar.bz2
Fix warnings introduced by hubbub integration.
svn path=/trunk/netsurf/; revision=5022
-rw-r--r--render/html.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/render/html.c b/render/html.c
index 7d4a55a5d..5dc505e02 100644
--- a/render/html.c
+++ b/render/html.c
@@ -713,6 +713,8 @@ encoding_change:
}
+#ifndef WITH_HUBBUB
+
/**
* Set the HTML parser character encoding.
*
@@ -720,10 +722,8 @@ encoding_change:
* \param encoding name of encoding
* \return true on success, false on error and error reported
*/
-
bool html_set_parser_encoding(struct content *c, const char *encoding)
{
-#ifndef WITH_HUBBUB
struct content_html_data *html = &c->data.html;
xmlError *error;
char error_message[500];
@@ -772,7 +772,6 @@ bool html_set_parser_encoding(struct content *c, const char *encoding)
/* Ensure noone else attempts to reset the encoding */
html->getenc = false;
-#endif
return true;
}
@@ -839,6 +838,9 @@ const char *html_detect_encoding(const char **data, unsigned int *size)
}
+#endif
+
+
/**
* Convert a CONTENT_HTML for display.
*