diff options
| author | Bruce Momjian | 2006-07-06 01:55:51 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2006-07-06 01:55:51 +0000 |
| commit | 4f4d62a5b5197127b19e3a5bc1d7fe0efe32eece (patch) | |
| tree | 2ddca2fd8ba359021223d71338dbb83b1084a17d | |
| parent | a77275fe3b79d06c9db7c699394416230f6a3fe9 (diff) | |
Attached patch is required ot build with the CRT that comes with Visual
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
| -rw-r--r-- | src/include/c.h | 5 | ||||
| -rw-r--r-- | src/pl/plpython/plpython.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/include/c.h b/src/include/c.h index 2b51e2ac0a7..bd09a430edc 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * 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__) #define WIN32_ONLY_COMPILER +#define errcode __vc_errcode +#include <crtdefs.h> +#undef errcode #endif #include <stdio.h> diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 20974bb4d95..164df875a5a 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.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 * _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,7 +2363,7 @@ PLy_init_plpy(void) /* the python interface to the elog function * don't confuse these with PLy_elog */ -static PyObject *PLy_output(int, PyObject *, PyObject *); +static PyObject *PLy_output(volatile int, PyObject *, PyObject *); static PyObject * PLy_debug(PyObject * self, PyObject * args) |