diff --git a/ChangeLog b/ChangeLog
index 2e84362f..e28dfba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 28 14:51:44 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* xpointer.c include/win32config.h win32/libxml2/libxml2.def.src
+	  libxml.h : Yon Derek provided a set of changes to compile from
+	  CVS on Windows/MSC
+
 Thu Jun 28 14:11:28 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* parser.c: fixed UTF8 BOM support in push mode
diff --git a/include/win32config.h b/include/win32config.h
index 75471b0c..1ec100b1 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -99,7 +99,7 @@ static int isnan (double d) {
 /* Microsoft's C runtime names all non-ANSI functions with a leading
    underscore. Since functionality is still the same, they can be used. */
 #ifdef _MSC_VER
-#include <libxml/xmlversion.h>
+#include <libxml/xmlwin32version.h>
 #ifndef WITH_TRIO
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
diff --git a/libxml.h b/libxml.h
index ba392f37..2954ccb1 100644
--- a/libxml.h
+++ b/libxml.h
@@ -13,9 +13,8 @@
 #include "win32config.h"
 #else
 #include "config.h"
-#endif
-
 #include <libxml/xmlversion.h>
+#endif
 
 #ifdef WITHOUT_TRIO
 #include <stdio.h>
diff --git a/win32/libxml2/libxml2.def.src b/win32/libxml2/libxml2.def.src
index 537194ff..281529d6 100644
--- a/win32/libxml2/libxml2.def.src
+++ b/win32/libxml2/libxml2.def.src
@@ -18,7 +18,7 @@
 */
 
 #define LIBXML2_COMPILING_MSCCDEF
-#include "../../include/libxml/xmlversion.h"
+#include "../../include/libxml/xmlwin32version.h"
 
 LIBRARY libxml2
 EXPORTS
diff --git a/xpointer.c b/xpointer.c
index caf39bbe..c4d97203 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -2726,13 +2726,13 @@ xmlXPtrStringRangeFunction(xmlXPathParserContextPtr ctxt, int nargs) {
 	CHECK_TYPE(XPATH_NUMBER);
 	number = valuePop(ctxt);
 	if (number != NULL)
-	    num = number->floatval;
+	    num = (int) number->floatval;
     }
     if (nargs >= 3) {
 	CHECK_TYPE(XPATH_NUMBER);
 	position = valuePop(ctxt);
 	if (position != NULL)
-	    pos = position->floatval;
+	    pos = (int) position->floatval;
     }
     CHECK_TYPE(XPATH_STRING);
     string = valuePop(ctxt);