applied patch from Mark Junker, fixing a MinGW compilation problem, should

* include/wsockcompat.h: applied patch from Mark Junker, fixing a
  MinGW compilation problem, should close bug #324943
Daniel
diff --git a/ChangeLog b/ChangeLog
index 9b4a2c5..1ea374e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan  4 10:53:56 CET 2006 Daniel Veillard <daniel@veillard.com>
+
+	* include/wsockcompat.h: applied patch from Mark Junker, fixing a 
+	  MinGW compilation problem, should close bug #324943
+
 Tue Jan  3 11:49:54 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.ne>
 
 	* xmlschemas.c: Removed last dependency on the obsolete enum
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
index 3e770f4..a898b05 100644
--- a/include/wsockcompat.h
+++ b/include/wsockcompat.h
@@ -17,6 +17,13 @@
 #endif
 #endif
 
+#ifdef __MINGW32__
+/* Include <errno.h> here to ensure that it doesn't get included later
+ * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
+#include <errno.h>
+#undef EWOULDBLOCK
+#endif
+
 #if !defined SOCKLEN_T
 #define SOCKLEN_T int
 #endif