Index: src/include/c.h
===================================================================
RCS file: /projects/cvsroot/pgsql/src/include/c.h,v
retrieving revision 1.204
diff -c -r1.204 c.h
*** src/include/c.h	24 Jun 2006 14:52:48 -0000	1.204
--- src/include/c.h	26 Jun 2006 13:13:50 -0000
***************
*** 59,64 ****
--- 59,67 ----
  
  #if defined(_MSC_VER) || defined(__BORLANDC__)
  #define	WIN32_ONLY_COMPILER
+ #define errcode __vc_errcode
+ #include <crtdefs.h>
+ #undef errcode
  #endif
  
  #include <stdio.h>
Index: src/pl/plpython/plpython.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/pl/plpython/plpython.c,v
retrieving revision 1.83
diff -c -r1.83 plpython.c
*** src/pl/plpython/plpython.c	25 Jun 2006 00:18:24 -0000	1.83
--- src/pl/plpython/plpython.c	26 Jun 2006 13:58:56 -0000
***************
*** 10,16 ****
--- 10,19 ----
  /* Python uses #pragma to bring in a non-default libpython on VC++ if
   * _DEBUG is defined */
  #undef _DEBUG
+ /* Also hide away errcode, since we load Python.h before postgres.h */
+ #define errcode __vc_errcode
  #include <Python.h>
+ #undef errcode
  #define _DEBUG
  #else
  #include <Python.h>
***************
*** 2360,2366 ****
  /* the python interface to the elog function
   * don't confuse these with PLy_elog
   */
! static PyObject *PLy_output(int, PyObject *, PyObject *);
  
  static PyObject *
  PLy_debug(PyObject * self, PyObject * args)
--- 2363,2369 ----
  /* the python interface to the elog function
   * don't confuse these with PLy_elog
   */
! static PyObject *PLy_output(volatile int, PyObject *, PyObject *);
  
  static PyObject *
  PLy_debug(PyObject * self, PyObject * args)