diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2012-03-23 22:38:01 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2012-03-23 22:38:01 +0000 |
commit | 064305e2fb31d7fa1582bb49e4df2896cffb25da (patch) | |
tree | 163250a2e984b1aef3ff719ed9bc0eee3d66b900 | |
parent | 23bb11dfe7824c585507c8606e6aad62ce808810 (diff) | |
download | libdom-064305e2fb31d7fa1582bb49e4df2896cffb25da.tar.gz libdom-064305e2fb31d7fa1582bb49e4df2896cffb25da.tar.bz2 |
Fix encoding_source namespace collision
svn path=/trunk/libdom/; revision=13567
-rw-r--r-- | bindings/hubbub/parser.c | 8 | ||||
-rw-r--r-- | bindings/hubbub/parser.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bindings/hubbub/parser.c b/bindings/hubbub/parser.c index 6dcd60e..66d1628 100644 --- a/bindings/hubbub/parser.c +++ b/bindings/hubbub/parser.c @@ -137,8 +137,8 @@ dom_hubbub_parser *dom_hubbub_parser_create( parser->parser = NULL; parser->doc = NULL; parser->encoding = enc; - parser->encoding_source = enc != NULL ? ENCODING_SOURCE_HEADER - : ENCODING_SOURCE_DETECTED; + parser->encoding_source = enc != NULL ? DOM_HUBBUB_ENCODING_SOURCE_HEADER + : DOM_HUBBUB_ENCODING_SOURCE_DETECTED; parser->complete = false; parser->msg = msg; @@ -772,7 +772,7 @@ static hubbub_error change_encoding(void *parser, const char *charset) name = hubbub_parser_read_charset(dom_parser->parser, &source); if (source == HUBBUB_CHARSET_CONFIDENT) { - dom_parser->encoding_source = ENCODING_SOURCE_DETECTED; + dom_parser->encoding_source = DOM_HUBBUB_ENCODING_SOURCE_DETECTED; dom_parser->encoding = charset; return HUBBUB_OK; } @@ -788,7 +788,7 @@ static hubbub_error change_encoding(void *parser, const char *charset) * reprocessing with a different charset, or for confirming that the * charset is in fact correct */ dom_parser->encoding = charset; - dom_parser->encoding_source = ENCODING_SOURCE_META; + dom_parser->encoding_source = DOM_HUBBUB_ENCODING_SOURCE_META; /* Equal encodings will have the same string pointers */ return (charset == name) ? HUBBUB_OK : HUBBUB_ENCODINGCHANGE; diff --git a/bindings/hubbub/parser.h b/bindings/hubbub/parser.h index 2707ff4..7e8ee2e 100644 --- a/bindings/hubbub/parser.h +++ b/bindings/hubbub/parser.h @@ -20,10 +20,10 @@ struct dom_document; typedef struct dom_hubbub_parser dom_hubbub_parser; /* The encoding source of the document */ -typedef enum dom_hubub_encoding_source { - ENCODING_SOURCE_HEADER, - ENCODING_SOURCE_DETECTED, - ENCODING_SOURCE_META +typedef enum dom_hubbub_encoding_source { + DOM_HUBBUB_ENCODING_SOURCE_HEADER, + DOM_HUBBUB_ENCODING_SOURCE_DETECTED, + DOM_HUBBUB_ENCODING_SOURCE_META } dom_hubbub_encoding_source; /* The recommended way to use the parser is: |