Fix definition of "errcode" for MSVC.

Hiroshi Saito

diff --git a/src/include/c.h b/src/include/c.h
index bfa602e6c5ade8a763347ef5de904e1dc09f308f..55da238dc1c12fe92fb56da9717aaf4517194e7d 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -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>

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 3708ede6abda1347239c657e961a8ab60d2bf653..2afc689ae37beb8a0d489b9b82b59acce0991f94 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -262,6 +262,9 @@ typedef unsigned short mode_t;
 #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