diff --git a/ChangeLog b/ChangeLog
index ca1b793..16aaeb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  2 22:34:54 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* xmlIO.c: fix a mix of code and declarations showing up on Windows
+	  patch from Kjartan Maraas, fixing #340404
+
 Tue May  2 14:24:40 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
 	* encoding.c: fixing bug #340398 xmlCharEncOutFunc writing to
diff --git a/xmlIO.c b/xmlIO.c
index 1251665..60e0a50 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -589,8 +589,11 @@
 int
 xmlCheckFilename (const char *path)
 {
+#ifdef HAVE_STAT
+	struct stat stat_buffer;
+#endif
 	if (path == NULL)
-      return(0);
+		return(0);
   
 #if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
 	{
@@ -616,8 +619,6 @@
 	}
 #else
 #ifdef HAVE_STAT
-    struct stat stat_buffer;
-
     if (stat(path, &stat_buffer) == -1)
         return 0;