--- src/include/port/win32.h.orig	Mon Aug  7 15:25:08 2006
+++ src/include/port/win32.h	Mon Aug  7 15:26:24 2006
@@ -262,6 +262,9 @@
 #define inline __inline
 #define __inline__ __inline
 
+#undef errcode
+#define errcode __vc_errcode
+
 #define _S_IRWXU	(_S_IREAD | _S_IWRITE | _S_IEXEC)
 #define _S_IXUSR	_S_IEXEC
 #define _S_IWUSR	_S_IWRITE
--- src/include/c.h.orig	Mon Aug  7 15:23:13 2006
+++ src/include/c.h	Mon Aug  7 15:24:34 2006
@@ -60,11 +60,9 @@
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #define	WIN32_ONLY_COMPILER
-#define errcode __vc_errcode
 #if defined(__BORLANDC__) || (_MSC_VER > 1400)
 #include <crtdefs.h>
 #endif
-#undef errcode
 #endif
 
 #include <stdio.h>