rename namespace to use_namespace to avoid a c++ keyword conflict

fix whitespace surrounding the enums, use tabs please :)

2 files changed, 39 insertions, 39 deletions

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 94465bcaad..9a0a7ba8cd 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -90,7 +90,7 @@ _start_element_handler(void *user, const xmlChar *name, const xmlChar **attribut
 		return;
 	}
 	
-	if (parser->namespace) {
+	if (parser->use_namespace) {
 		_find_namespace_decl(parser, name, attributes);
 		_qualify_namespace(parser, name, &qualified_name);
 	} else {
@@ -112,7 +112,7 @@ _end_element_handler(void *user, const xmlChar *name)
 		return;
 	}
 	
-	if (parser->namespace) {
+	if (parser->use_namespace) {
 		xmlChar *nsname;
 
 		nsname = xmlHashLookup(parser->_reverse_ns_map, name);
@@ -323,7 +323,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 
 	parser = (XML_Parser) memsuite->malloc_fcn(sizeof(struct _XML_Parser));
 	memset(parser, 0, sizeof(struct _XML_Parser));
-	parser->namespace = 0;
+	parser->use_namespace = 0;
 	parser->mem_hdlrs = *memsuite;
 	parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL);
 	if (parser->parser == NULL) {
@@ -335,7 +335,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 		parser->parser->charset = XML_CHAR_ENCODING_NONE;
 	}
 	if (sep != NULL) {
-		parser->namespace = 1;
+		parser->use_namespace = 1;
 		parser->_ns_map = xmlHashCreate(10);
 		parser->_reverse_ns_map = xmlHashCreate(10);
 	}
@@ -567,7 +567,7 @@ _free_ns_name(void *ptr, xmlChar *name)
 void
 XML_ParserFree(XML_Parser parser)
 {
-	if (parser->namespace) {
+	if (parser->use_namespace) {
 		xmlHashFree(parser->_ns_map,         _free_ns_name);
 		xmlHashFree(parser->_reverse_ns_map, _free_ns_name);
 	}
diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
index 0ac445743e..f0342ca0db 100644
--- a/ext/xml/expat_compat.h
+++ b/ext/xml/expat_compat.h
@@ -50,7 +50,7 @@ typedef struct _XML_Memory_Handling_Suite {
 } XML_Memory_Handling_Suite;
 
 typedef struct _XML_Parser {
-	int namespace;
+	int use_namespace;
 
 	xmlHashTablePtr _ns_map;
 	xmlHashTablePtr _reverse_ns_map;
@@ -74,42 +74,42 @@ typedef struct _XML_Parser {
 } *XML_Parser;
 
 enum XML_Error {
-  XML_ERROR_NONE,
-  XML_ERROR_NO_MEMORY,
-  XML_ERROR_SYNTAX,
-  XML_ERROR_NO_ELEMENTS,
-  XML_ERROR_INVALID_TOKEN,
-  XML_ERROR_UNCLOSED_TOKEN,
-  XML_ERROR_PARTIAL_CHAR,
-  XML_ERROR_TAG_MISMATCH,
-  XML_ERROR_DUPLICATE_ATTRIBUTE,
-  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-  XML_ERROR_PARAM_ENTITY_REF,
-  XML_ERROR_UNDEFINED_ENTITY,
-  XML_ERROR_RECURSIVE_ENTITY_REF,
-  XML_ERROR_ASYNC_ENTITY,
-  XML_ERROR_BAD_CHAR_REF,
-  XML_ERROR_BINARY_ENTITY_REF,
-  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-  XML_ERROR_MISPLACED_XML_PI,
-  XML_ERROR_UNKNOWN_ENCODING,
-  XML_ERROR_INCORRECT_ENCODING,
-  XML_ERROR_UNCLOSED_CDATA_SECTION,
-  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-  XML_ERROR_NOT_STANDALONE,
-  XML_ERROR_UNEXPECTED_STATE,
-  XML_ERROR_ENTITY_DECLARED_IN_PE,
-  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
+	XML_ERROR_NONE,
+	XML_ERROR_NO_MEMORY,
+	XML_ERROR_SYNTAX,
+	XML_ERROR_NO_ELEMENTS,
+	XML_ERROR_INVALID_TOKEN,
+	XML_ERROR_UNCLOSED_TOKEN,
+	XML_ERROR_PARTIAL_CHAR,
+	XML_ERROR_TAG_MISMATCH,
+	XML_ERROR_DUPLICATE_ATTRIBUTE,
+	XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
+	XML_ERROR_PARAM_ENTITY_REF,
+	XML_ERROR_UNDEFINED_ENTITY,
+	XML_ERROR_RECURSIVE_ENTITY_REF,
+	XML_ERROR_ASYNC_ENTITY,
+	XML_ERROR_BAD_CHAR_REF,
+	XML_ERROR_BINARY_ENTITY_REF,
+	XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
+	XML_ERROR_MISPLACED_XML_PI,
+	XML_ERROR_UNKNOWN_ENCODING,
+	XML_ERROR_INCORRECT_ENCODING,
+	XML_ERROR_UNCLOSED_CDATA_SECTION,
+	XML_ERROR_EXTERNAL_ENTITY_HANDLING,
+	XML_ERROR_NOT_STANDALONE,
+	XML_ERROR_UNEXPECTED_STATE,
+	XML_ERROR_ENTITY_DECLARED_IN_PE,
+	XML_ERROR_FEATURE_REQUIRES_XML_DTD,
+	XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING
 };
 
 enum XML_Content_Type {
-  XML_CTYPE_EMPTY = 1,
-  XML_CTYPE_ANY,
-  XML_CTYPE_MIXED,
-  XML_CTYPE_NAME,
-  XML_CTYPE_CHOICE,
-  XML_CTYPE_SEQ
+	XML_CTYPE_EMPTY = 1,
+	XML_CTYPE_ANY,
+	XML_CTYPE_MIXED,
+	XML_CTYPE_NAME,
+	XML_CTYPE_CHOICE,
+	XML_CTYPE_SEQ
 };
 
 XML_Parser XML_ParserCreate(const XML_Char *);