Define errcode as __msvc_errcode not __vc_errcode for MSVC builds,

per Magnus.

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index d90f8a7d956eb0be453611754cf6c3a404be13b6..b3e4311b3a632cd37bce567331e86e5cf5e2691c 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.58 2006/08/10 01:41:29 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.59 2006/09/16 13:35:49 tgl Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -269,7 +269,7 @@ typedef unsigned short mode_t;
 #define __inline__ __inline
 
 #undef errcode
-#define errcode __vc_errcode
+#define errcode __msvc_errcode
 
 #define _S_IRWXU       (_S_IREAD | _S_IWRITE | _S_IEXEC)
 #define _S_IXUSR       _S_IEXEC

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 40d9de37abb9e509534ea6064ff7e3aeb17a102f..1a80a74d8298bb7425c5b7c4700b5b843ddc2a6e 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.87 2006/09/02 12:30:01 momjian Exp $
+ *     $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.88 2006/09/16 13:35:49 tgl Exp $
  *
  *********************************************************************
  */
@@ -11,7 +11,7 @@
  * _DEBUG is defined */
 #undef _DEBUG
 /* Also hide away errcode, since we load Python.h before postgres.h */
-#define errcode __vc_errcode
+#define errcode __msvc_errcode
 #include <Python.h>
 #undef errcode
 #define _DEBUG