project: Update for 2.9.10 merge.

Author: Sibras

SMP/SMP.patch

@@ -1,5 +1,5 @@
 diff --git a/catalog.c b/catalog.c
-index f814121c..df20802a 100644
+index 7328fd31..ab1b7492 100644
 --- a/catalog.c
 +++ b/catalog.c
 @@ -77,6 +77,10 @@
@@ -35,7 +35,7 @@ index f814121c..df20802a 100644
  			char buf[256];
  			unsigned long len = GetModuleFileNameA(hmodule, buf, 255);
 diff --git a/nanohttp.c b/nanohttp.c
-index 2143718a..e08e175a 100644
+index 018b7e18..68930397 100644
 --- a/nanohttp.c
 +++ b/nanohttp.c
 @@ -77,6 +77,13 @@
@@ -53,7 +53,7 @@ index 2143718a..e08e175a 100644
  #include <libxml/xmlerror.h>
  #include <libxml/xmlmemory.h>
 diff --git a/xmlIO.c b/xmlIO.c
-index f61dd05a..1a370aa8 100644
+index 752d5e0a..51fc8b96 100644
 --- a/xmlIO.c
 +++ b/xmlIO.c
 @@ -43,12 +43,20 @@
@@ -77,7 +77,7 @@ index f61dd05a..1a370aa8 100644
  #ifndef S_ISDIR
  #  ifdef _S_ISDIR
  #    define S_ISDIR(x) _S_ISDIR(x)
-@@ -3739,11 +3747,13 @@ xmlParserGetDirectory(const char *filename) {
+@@ -3762,11 +3770,13 @@ xmlParserGetDirectory(const char *filename) {
          if (cur == dir) dir[1] = 0;
  	else *cur = 0;
  	ret = xmlMemStrdup(dir);
@@ -122,7 +122,7 @@ index 6f16c4b3..efed9920 100644
   *									*
   *		Macros, variables and associated types			*
 diff --git a/xmlmodule.c b/xmlmodule.c
-index a95ab66a..04ca2f2d 100644
+index 1867a5e1..cf450cc1 100644
 --- a/xmlmodule.c
 +++ b/xmlmodule.c
 @@ -314,7 +314,15 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)

SMP/config.h

@@ -38,7 +38,7 @@
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 /* MS C-runtime has functions which can be used in order to determine if
    a given floating-point variable contains NaN, (+-)INF. These are 
-   preferred, because floating-point technology is considered propriatary
+   preferred, because floating-point technology is considered proprietary
    by MS and we can assume that their functions know more about their 
    oddities than we do. */
 #include <float.h>

SMP/libxml/xmlversion.h

@@ -29,36 +29,36 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.9.9"
+#define LIBXML_DOTTED_VERSION "2.9.10"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20909
+#define LIBXML_VERSION 209010
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20909"
+#define LIBXML_VERSION_STRING "209010"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a CVS compilation
  */
-#define LIBXML_VERSION_EXTRA "-GITv2.9.9"
+#define LIBXML_VERSION_EXTRA "-GITv2.9.10"
 
 /**
  * LIBXML_TEST_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(20909);
+#define LIBXML_TEST_VERSION xmlCheckVersion(209010);
 
 #ifndef VMS
 #if 0
@@ -91,11 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Whether the thread support is configured in
  */
 #if 1
-#if defined(_REENTRANT) || defined(__MT__) || \
-    (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))
 #define LIBXML_THREAD_ENABLED
 #endif
-#endif
 
 /**
  * LIBXML_THREAD_ALLOC_ENABLED:
@@ -353,8 +350,10 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * LIBXML_EXPR_ENABLED:
  *
  * Whether the formal expressions interfaces are compiled in
+ *
+ * This code is unused and disabled unconditionally for now.
  */
-#if 1
+#if 0
 #define LIBXML_EXPR_ENABLED
 #endif
 

SMP/rcVersion.h

@@ -5,5 +5,5 @@
 
 #define LIBXML_MAJOR_VERSION 2
 #define LIBXML_MINOR_VERSION 9
-#define LIBXML_MICRO_VERSION 9
-#define LIBXML_DOTTED_VERSION "2.9.9"
+#define LIBXML_MICRO_VERSION 10
+#define LIBXML_DOTTED_VERSION "2.9.10"