--- trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:16 UTC (rev 20874)
+++ trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:30 UTC (rev 20875)
@@ -905,9 +905,9 @@
was detected; otherwise the location is the location of the last
parse event, as described above.
*/
-XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser);
-XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser);
-XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser);
+XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);
+XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);
+XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
/* Return the number of bytes in the current event.
Returns 0 if the event is in an internal entity.
@@ -1002,9 +1002,9 @@
releases. Micro is bumped with each release, and set to 0 with each
change to major or minor version.
*/
-#define XML_MAJOR_VERSION 1
-#define XML_MINOR_VERSION 95
-#define XML_MICRO_VERSION 8
+#define XML_MAJOR_VERSION 2
+#define XML_MINOR_VERSION 0
+#define XML_MICRO_VERSION 0
#ifdef __cplusplus
}
--- trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:16 UTC (rev 20874)
+++ trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:30 UTC (rev 20875)
@@ -65,6 +65,7 @@
#endif
#endif /* not defined XML_STATIC */
+
/* If we didn't define it above, define it away: */
#ifndef XMLIMPORT
#define XMLIMPORT
@@ -94,6 +95,19 @@
typedef char XML_LChar;
#endif /* XML_UNICODE */
+#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+typedef __int64 XML_Index;
+typedef unsigned __int64 XML_Size;
+#else
+typedef long long XML_Index;
+typedef unsigned long long XML_Size;
+#endif
+#else
+typedef long XML_Index;
+typedef unsigned long XML_Size;
+#endif /* XML_LARGE_SIZE */
+
#ifdef __cplusplus
}
#endif