Load /tmp/libxml2-2.6.26 intoupstream/2.6.26.dfsg

libxml2/branches/upstream/current.

3 files changed, 16 insertions, 8 deletions

diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index c83dc95..c5f2164 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -663,6 +663,7 @@ typedef enum {
     XML_SCHEMAV_CVC_TYPE_2, /* 1876 */
     XML_SCHEMAV_CVC_IDC, /* 1877 */
     XML_SCHEMAV_CVC_WILDCARD, /* 1878 */
+    XML_SCHEMAV_MISC, /* 1879 */
     XML_XPTR_UNKNOWN_SCHEME = 1900, 
     XML_XPTR_CHILDSEQ_START, /* 1901 */
     XML_XPTR_EVAL_FAILED, /* 1902 */
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index ce0d938..cc75dc0 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.6.24"
+#define LIBXML_DOTTED_VERSION "2.6.26"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20624
+#define LIBXML_VERSION 20626
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20624"
+#define LIBXML_VERSION_STRING "20626"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a CVS compilation
  */
-#define LIBXML_VERSION_EXTRA "-CVS2772"
+#define LIBXML_VERSION_EXTRA "-CVS2798"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20624);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20626);
 
 #ifndef VMS
 #if 0
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 76473a6..febbf78 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -35,6 +35,7 @@ extern "C" {
 #endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
 	
 #ifdef LIBXML_XPATH_ENABLED
+
 typedef struct _xmlXPathContext xmlXPathContext;
 typedef xmlXPathContext *xmlXPathContextPtr;
 typedef struct _xmlXPathParserContext xmlXPathParserContext;
@@ -342,7 +343,9 @@ struct _xmlXPathContext {
     /* dictionnary */
     xmlDictPtr dict;			/* dictionnary if any */
 
-    int flags;				/* flags to control compilation */
+    int flags;				/* flags to control compilation */

+    /* Cache for reusal of XPath objects */
+    void *cache;
 };
 
 /*
@@ -485,9 +488,13 @@ XMLPUBFUN xmlXPathObjectPtr XMLCALL
  */
 XMLPUBFUN xmlXPathContextPtr XMLCALL 
 		    xmlXPathNewContext		(xmlDocPtr doc);
-XMLPUBFUN void XMLCALL		   
+XMLPUBFUN void XMLCALL
 		    xmlXPathFreeContext		(xmlXPathContextPtr ctxt);
-
+XMLPUBFUN int XMLCALL
+		    xmlXPathContextSetCache(xmlXPathContextPtr ctxt,
+				            int active,
+					    int value,
+					    int options);
 /**
  * Evaluation functions.
  */