Load /tmp/tmp.XJZ6qc/libxml2-2.6.18 intoupstream/2.6.18

packages/libxml2/branches/upstream/current.

2 files changed, 35 insertions, 0 deletions

diff --git a/win32/configure.js b/win32/configure.js
index 12e5f42..d857146 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -145,6 +145,7 @@ function usage()
 	txt += "  dynruntime: Use the dynamic RTL (only bcb) (" + dynruntime + ")\n";
 	txt += "  debug:      Build unoptimised debug executables (" + (buildDebug? "yes" : "no")  + ")\n";
 	txt += "  static:     Link xmllint statically to libxml2 (" + (buildStatic? "yes" : "no")  + ")\n";
+	txt += "              Note: automatically enabled if cruntime is not /MD or /MDd\n";
 	txt += "  prefix:     Base directory for the installation (" + buildPrefix + ")\n";
 	txt += "  bindir:     Directory where xmllint and friends should be installed\n";
 	txt += "              (" + buildBinPrefix + ")\n";
@@ -534,6 +535,14 @@ if (error != 0) {
 	usage();
 	WScript.Quit(error);
 }
+
+// if user choses to link the c-runtime library statically into libxml2
+// with /MT and friends, then we need to enable static linking for xmllint
+if (cruntime == "/MT" || cruntime == "/MTd" ||
+		cruntime == "/ML" || cruntime == "/MLd") {
+	buildStatic = 1;
+}
+
 dirSep = "\\";
 if (compiler == "mingw")
 	dirSep = "/";
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 07ce959..5e2c8fb 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -663,6 +663,7 @@ xmlCopyAttributeTable
 xmlCopyChar
 xmlCopyCharMultiByte
 xmlCopyDoc
+xmlCopyDocElementContent
 xmlCopyDtd
 xmlCopyElementContent
 xmlCopyElementTable
@@ -736,6 +737,7 @@ xmlDefaultSAXHandlerInit
 xmlDelEncodingAlias
 xmlDeregisterNodeDefault
 xmlDetectCharEncoding
+xmlDictCleanup
 xmlDictCreate
 xmlDictCreateSub
 xmlDictExists
@@ -781,6 +783,7 @@ xmlFreeAutomata
 xmlFreeCatalog
 #endif
 xmlFreeDoc
+xmlFreeDocElementContent
 xmlFreeDtd
 xmlFreeElementContent
 xmlFreeElementTable
@@ -802,6 +805,7 @@ xmlFreeProp
 xmlFreePropList
 xmlFreeRMutex
 xmlFreeRefTable
+xmlFreeStreamCtxt
 xmlFreeTextReader
 xmlFreeTextWriter
 xmlFreeURI
@@ -848,6 +852,7 @@ xmlHashAddEntry2
 xmlHashAddEntry3
 xmlHashCopy
 xmlHashCreate
+xmlHashCreateDict
 xmlHashFree
 xmlHashLookup
 xmlHashLookup2
@@ -1130,6 +1135,7 @@ xmlNewChild
 xmlNewComment
 xmlNewDoc
 xmlNewDocComment
+xmlNewDocElementContent
 xmlNewDocFragment
 xmlNewDocNode
 xmlNewDocNodeEatName
@@ -1291,7 +1297,11 @@ xmlParserPrintFileInfo
 xmlParserValidityError
 xmlParserValidityWarning
 xmlParserWarning
+xmlPatternFromRoot
+xmlPatternGetStreamCtxt
 xmlPatternMatch
+xmlPatternMaxDepth
+xmlPatternStreamable
 xmlPatterncompile
 xmlPedanticParserDefault
 xmlPopInput
@@ -1512,6 +1522,9 @@ xmlSchemaCollapseString
 xmlSchemaCompareValues
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaCompareValuesWhtsp
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaDump
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1538,6 +1551,9 @@ xmlSchemaGetBuiltInListSimpleTypeItemType
 xmlSchemaGetBuiltInType
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaGetCanonValue
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaGetFacetValueAsULong
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1565,9 +1581,15 @@ xmlSchemaNewFacet
 xmlSchemaNewMemParserCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewNOTATIONValue
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaNewParserCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewStringValue
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaNewValidCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1690,6 +1712,9 @@ xmlStrcat
 xmlStrchr
 xmlStrcmp
 xmlStrdup
+xmlStreamPop
+xmlStreamPush
+xmlStreamPushAttr
 xmlStringCurrentChar
 xmlStringDecodeEntities
 xmlStringGetNodeList
@@ -1711,6 +1736,7 @@ xmlTextConcat
 xmlTextMerge
 xmlTextReaderAttributeCount
 xmlTextReaderBaseUri
+xmlTextReaderByteConsumed
 xmlTextReaderClose
 xmlTextReaderConstBaseUri
 xmlTextReaderConstEncoding