mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attached patch is required ot build with the CRT that comes with Visual

Browse Source 
Studio 2005. Basically MS defined errcode in the headers with a typedef,
so we have to #define it out of the way.

While at it, fix a function declaration in plpython that didn't match
the implementation (volatile missing).

Magnus Hagander
This commit is contained in:
Bruce Momjian 2006-07-06 01:55:51 +00:00
parent a77275fe3b
commit 4f4d62a5b5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/c.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/c.h,v 1.205 2006/06/26 23:53:14 momjian Exp $ * $PostgreSQL: pgsql/src/include/c.h,v 1.206 2006/07/06 01:55:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -59,6 +59,9 @@
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)
#define WIN32_ONLY_COMPILER #define WIN32_ONLY_COMPILER
#define errcode __vc_errcode
#include <crtdefs.h>
#undef errcode
#endif #endif
#include <stdio.h> #include <stdio.h>

7
src/pl/plpython/plpython.c
View File

@ -1,7 +1,7 @@
/********************************************************************** /**********************************************************************
* plpython.c - python as a procedural language for PostgreSQL * plpython.c - python as a procedural language for PostgreSQL
* *
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.83 2006/06/25 00:18:24 momjian Exp $ * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.84 2006/07/06 01:55:51 momjian Exp $
* *
********************************************************************* *********************************************************************
*/ */
@ -10,7 +10,10 @@
/* Python uses #pragma to bring in a non-default libpython on VC++ if /* Python uses #pragma to bring in a non-default libpython on VC++ if
* _DEBUG is defined */ * _DEBUG is defined */
#undef _DEBUG #undef _DEBUG
/* Also hide away errcode, since we load Python.h before postgres.h */
#define errcode __vc_errcode
#include <Python.h> #include <Python.h>
#undef errcode
#define _DEBUG #define _DEBUG
#else #else
#include <Python.h> #include <Python.h>
@ -2360,7 +2363,7 @@ PLy_init_plpy(void)
/* the python interface to the elog function /* the python interface to the elog function
* don't confuse these with PLy_elog * don't confuse these with PLy_elog
*/ */
static PyObject *PLy_output(int, PyObject *, PyObject *); static PyObject *PLy_output(volatile int, PyObject *, PyObject *);
static PyObject * static PyObject *
PLy_debug(PyObject * self, PyObject * args) PLy_debug(PyObject * self, PyObject * args)