From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 16 Sep 2006 13:35:49 +0000 (+0000)
Subject: Define errcode as __msvc_errcode not __vc_errcode for MSVC builds,
X-Git-Tag: REL8_2_BETA1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=801cbe3310bc52c0ab41ec66bfe3893a16255189;p=postgresql

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 d90f8a7d95..b3e4311b3a 100644
--- 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 40d9de37ab..1a80a74d82 100644
--- 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