changing an enum definition to get a correct API XML description. This was
* include/libxml/xmlreader.h doc/libxml2-api.xml: changing an enum
definition to get a correct API XML description. This was apparently
breaking Windows build.
Daniel
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index f11dfdb..c717243 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -749,6 +749,7 @@
<exports symbol='xmlInitMemory'/>
<exports symbol='xmlMalloc'/>
<exports symbol='xmlMallocAtomic'/>
+ <exports symbol='xmlMallocAtomicLoc'/>
<exports symbol='xmlMallocFunc'/>
<exports symbol='xmlMallocLoc'/>
<exports symbol='xmlMemDisplay'/>
@@ -1239,12 +1240,12 @@
<exports symbol='XML_READER_TYPE_TEXT'/>
<exports symbol='XML_READER_TYPE_WHITESPACE'/>
<exports symbol='XML_READER_TYPE_XML_DECLARATION'/>
- <exports symbol='enum'/>
<exports symbol='xmlFreeTextReader'/>
<exports symbol='xmlNewTextReader'/>
<exports symbol='xmlNewTextReaderFilename'/>
<exports symbol='xmlParserProperties'/>
<exports symbol='xmlParserSeverities'/>
+ <exports symbol='xmlReaderTypes'/>
<exports symbol='xmlTextReader'/>
<exports symbol='xmlTextReaderAttributeCount'/>
<exports symbol='xmlTextReaderBaseUri'/>
@@ -2776,24 +2777,24 @@
<enum name='XML_PARSER_SYSTEM_LITERAL' file='parser' value='13' type='xmlParserInputState' info='within a SYSTEM value'/>
<enum name='XML_PARSER_VALIDATE' file='xmlreader' value='3' type='xmlParserProperties'/>
<enum name='XML_PI_NODE' file='tree' value='7' type='xmlElementType'/>
- <enum name='XML_READER_TYPE_ATTRIBUTE' file='xmlreader' value='2'/>
- <enum name='XML_READER_TYPE_CDATA' file='xmlreader' value='4'/>
- <enum name='XML_READER_TYPE_COMMENT' file='xmlreader' value='8'/>
- <enum name='XML_READER_TYPE_DOCUMENT' file='xmlreader' value='9'/>
- <enum name='XML_READER_TYPE_DOCUMENT_FRAGMENT' file='xmlreader' value='11'/>
- <enum name='XML_READER_TYPE_DOCUMENT_TYPE' file='xmlreader' value='10'/>
- <enum name='XML_READER_TYPE_ELEMENT' file='xmlreader' value='1'/>
- <enum name='XML_READER_TYPE_END_ELEMENT' file='xmlreader' value='15'/>
- <enum name='XML_READER_TYPE_END_ENTITY' file='xmlreader' value='16'/>
- <enum name='XML_READER_TYPE_ENTITY' file='xmlreader' value='6'/>
- <enum name='XML_READER_TYPE_ENTITY_REFERENCE' file='xmlreader' value='5'/>
- <enum name='XML_READER_TYPE_NONE' file='xmlreader' value='0'/>
- <enum name='XML_READER_TYPE_NOTATION' file='xmlreader' value='12'/>
- <enum name='XML_READER_TYPE_PROCESSING_INSTRUCTION' file='xmlreader' value='7'/>
- <enum name='XML_READER_TYPE_SIGNIFICANT_WHITESPACE' file='xmlreader' value='14'/>
- <enum name='XML_READER_TYPE_TEXT' file='xmlreader' value='3'/>
- <enum name='XML_READER_TYPE_WHITESPACE' file='xmlreader' value='13'/>
- <enum name='XML_READER_TYPE_XML_DECLARATION' file='xmlreader' value='17'/>
+ <enum name='XML_READER_TYPE_ATTRIBUTE' file='xmlreader' value='2' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_CDATA' file='xmlreader' value='4' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_COMMENT' file='xmlreader' value='8' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_DOCUMENT' file='xmlreader' value='9' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_DOCUMENT_FRAGMENT' file='xmlreader' value='11' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_DOCUMENT_TYPE' file='xmlreader' value='10' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_ELEMENT' file='xmlreader' value='1' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_END_ELEMENT' file='xmlreader' value='15' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_END_ENTITY' file='xmlreader' value='16' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_ENTITY' file='xmlreader' value='6' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_ENTITY_REFERENCE' file='xmlreader' value='5' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_NONE' file='xmlreader' value='0' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_NOTATION' file='xmlreader' value='12' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_PROCESSING_INSTRUCTION' file='xmlreader' value='7' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_SIGNIFICANT_WHITESPACE' file='xmlreader' value='14' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_TEXT' file='xmlreader' value='3' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_WHITESPACE' file='xmlreader' value='13' type='xmlReaderTypes'/>
+ <enum name='XML_READER_TYPE_XML_DECLARATION' file='xmlreader' value='17' type='xmlReaderTypes'/>
<enum name='XML_RELAXNG_ERR_ATTREXTRANS' file='relaxng' value='20' type='xmlRelaxNGValidErr'/>
<enum name='XML_RELAXNG_ERR_ATTRNAME' file='relaxng' value='14' type='xmlRelaxNGValidErr'/>
<enum name='XML_RELAXNG_ERR_ATTRNONS' file='relaxng' value='16' type='xmlRelaxNGValidErr'/>
@@ -3384,6 +3385,7 @@
<typedef name='xmlParserSeverities' file='xmlreader' type='enum'/>
<struct name='xmlRMutex' file='threads' type='struct _xmlRMutex'/>
<typedef name='xmlRMutexPtr' file='threads' type='xmlRMutex *'/>
+ <typedef name='xmlReaderTypes' file='xmlreader' type='enum'/>
<struct name='xmlRef' file='tree' type='struct _xmlRef'>
<field name='next' type='struct _xmlRef *' info=' next Ref'/>
<field name='value' type='const xmlChar *' info=' The Ref name'/>
@@ -3706,7 +3708,6 @@
</struct>
<typedef name='xmlXPathVariablePtr' file='xpath' type='xmlXPathVariable *'/>
<variable name='docbDefaultSAXHandler' file='globals' type='xmlSAXHandler'/>
- <variable name='enum' file='xmlreader' type='enum'/>
<variable name='htmlDefaultSAXHandler' file='globals' type='xmlSAXHandler'/>
<variable name='oldXMLWDcompatibility' file='globals' type='int'/>
<variable name='xmlBufferAllocScheme' file='globals' type='xmlBufferAllocationScheme'/>
@@ -6737,6 +6738,13 @@
<arg name='output' type='FILE *' info='the FILE * for the output'/>
<arg name='node' type='xmlNodePtr' info='the node to dump'/>
</function>
+ <function name='xmlMallocAtomicLoc' file='xmlmemory'>
+ <info>a malloc() equivalent, with logging of the allocation info.</info>
+ <return type='void *' info='a pointer to the allocated area or NULL in case of lack of memory.'/>
+ <arg name='size' type='size_t' info='an int specifying the size in byte to allocate.'/>
+ <arg name='file' type='const char *' info='the file name or NULL'/>
+ <arg name='line' type='int' info='the line number'/>
+ </function>
<functype name='xmlMallocFunc' file='xmlmemory'>
<info>Signature for a malloc() implementation.</info>
<return type='void *' info='a pointer to the newly allocated block or NULL in case of error.'/>