retired xmlwin32version.h

15 files changed, 14 insertions, 56 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f921e73..127ef3a6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,7 +35,7 @@ $(APIPAGES): libxml2-refs.xml site.xsl api.xsl
 	  $(bindir)/xsltproc --html $(top_srcdir)/doc/api.xsl $(top_srcdir)/doc/xml.html ; fi );
 
 scan:
-	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h xmlwin32version.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h xmlschemas.h xmlschemastypes.h"
+	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h xmlschemas.h xmlschemastypes.h"
 
 templates: scan
 	gtkdoc-mktmpl --module=libxml
diff --git a/include/libxml/catalog.h b/include/libxml/catalog.h
index 24141aeb..037e7e80 100644
--- a/include/libxml/catalog.h
+++ b/include/libxml/catalog.h
@@ -17,11 +17,8 @@
 
 #include <stdio.h>
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_CATALOG_ENABLED
 
 #ifdef __cplusplus
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index 9a326127..3c0fbb91 100644
--- a/include/libxml/encoding.h
+++ b/include/libxml/encoding.h
@@ -21,11 +21,8 @@
 #ifndef __XML_CHAR_ENCODING_H__
 #define __XML_CHAR_ENCODING_H__
 
-#if defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_ICONV_ENABLED
 #include <iconv.h>
 #endif
diff --git a/include/libxml/nanoftp.h b/include/libxml/nanoftp.h
index 92433498..a0ba2cee 100644
--- a/include/libxml/nanoftp.h
+++ b/include/libxml/nanoftp.h
@@ -9,11 +9,8 @@
 #ifndef __NANO_FTP_H__
 #define __NANO_FTP_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_FTP_ENABLED
 
 #ifdef __cplusplus
diff --git a/include/libxml/nanohttp.h b/include/libxml/nanohttp.h
index 1ddbdf6e..4fb4e1d2 100644
--- a/include/libxml/nanohttp.h
+++ b/include/libxml/nanohttp.h
@@ -9,11 +9,8 @@
 #ifndef __NANO_HTTP_H__
 #define __NANO_HTTP_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_HTTP_ENABLED
 
 #ifdef __cplusplus
diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h
index cd14fb2a..2a463204 100644
--- a/include/libxml/schemasInternals.h
+++ b/include/libxml/schemasInternals.h
@@ -11,11 +11,8 @@
 #ifndef __XML_SCHEMA_INTERNALS_H__
 #define __XML_SCHEMA_INTERNALS_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_SCHEMAS_ENABLED
 
 #include <libxml/xmlregexp.h>
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index 6759ce9e..1748f5ac 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -12,11 +12,8 @@
 #define __XML_TREE_H__
 
 #include <stdio.h>
-#if defined(WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__))
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index e0275b00..cd4058c8 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -11,11 +11,7 @@
 #define __XML_IO_H__
 
 #include <stdio.h>
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libxml/xmlautomata.h b/include/libxml/xmlautomata.h
index 950d2907..96ba2245 100644
--- a/include/libxml/xmlautomata.h
+++ b/include/libxml/xmlautomata.h
@@ -9,11 +9,7 @@
 #ifndef __XML_AUTOMATA_H__
 #define __XML_AUTOMATA_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
 #include <libxml/tree.h>
 
 #ifdef LIBXML_AUTOMATA_ENABLED
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index babe57be..8e8df944 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -9,11 +9,7 @@
 #define _DEBUG_MEMORY_ALLOC_
 
 #include <stdio.h>
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
 
 /**
  * DEBUG_MEMORY:
@@ -118,6 +114,10 @@ int	xmlMemUsed	(void);
 void	xmlMemDisplay	(FILE *fp);
 void	xmlMemShow	(FILE *fp, int nr);
 void	xmlMemoryDump	(void);
+void *	xmlMemMalloc	(size_t size);
+void *	xmlMemRealloc	(void *ptr,size_t size);
+void	xmlMemFree	(void *ptr);
+char *	xmlMemoryStrdup	(const char *str);
 
 #ifdef DEBUG_MEMORY_LOCATION
 /**
diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h
index 48d1aa28..434b7a2b 100644
--- a/include/libxml/xmlregexp.h
+++ b/include/libxml/xmlregexp.h
@@ -9,13 +9,9 @@
 #ifndef __XML_REGEXP_H__
 #define __XML_REGEXP_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
-#ifdef LIBXML_REGEXP_ENABLED
 
+#ifdef LIBXML_REGEXP_ENABLED
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libxml/xmlschemas.h b/include/libxml/xmlschemas.h
index 6a9a26f4..14b92308 100644
--- a/include/libxml/xmlschemas.h
+++ b/include/libxml/xmlschemas.h
@@ -11,11 +11,8 @@
 #ifndef __XML_SCHEMA_H__
 #define __XML_SCHEMA_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_SCHEMAS_ENABLED
 
 #include <libxml/tree.h>
diff --git a/include/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h
index b1788da6..a758c128 100644
--- a/include/libxml/xmlschemastypes.h
+++ b/include/libxml/xmlschemastypes.h
@@ -11,11 +11,8 @@
 #ifndef __XML_SCHEMA_TYPES_H__
 #define __XML_SCHEMA_TYPES_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
+
 #ifdef LIBXML_SCHEMAS_ENABLED
 
 #include <libxml/schemasInternals.h>
diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h
index a189ea88..59a4e35d 100644
--- a/include/libxml/xpathInternals.h
+++ b/include/libxml/xpathInternals.h
@@ -10,11 +10,7 @@
 #ifndef __XML_XPATH_INTERNALS_H__
 #define __XML_XPATH_INTERNALS_H__
 
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxml/xmlwin32version.h>
-#else
 #include <libxml/xmlversion.h>
-#endif
 #include <libxml/xpath.h>
 
 #ifdef __cplusplus
diff --git a/win32/configure.js b/win32/configure.js
index 2152a6b7..662c26ca 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -23,7 +23,6 @@ var versionFile = ".\\configure.txt";
    is identical to the first. */
 var optsFileIn = srcDirXml + "\\include\\libxml\\xmlversion.h.in";
 var optsFile = srcDirXml + "\\include\\libxml\\xmlversion.h";
-var optsFile2 = srcDirXml + "\\include\\libxml\\xmlwin32version.h";
 /* Version strings for the binary distribution. Will be filled later 
    in the code. */
 var verMajor;
@@ -245,7 +244,6 @@ function configureLibxml()
 	}
 	ofi.Close();
 	of.Close();
-	fso.CopyFile(optsFile, optsFile2, true);
 }
 
 /* Creates the readme file for the binary distribution of 'bname', for the