Tiny plpython fix
Seems __vc_errcode was used during Visual C++ beta at some point, and is
now declared deprecated in the system headers. This patch renames our
use of it to __msvc_errcode, so we don't conflict anymore.
//Magnus
Attachments:
plpython_vcerr.patchapplication/octet-stream; name=plpython_vcerr.patchDownload
Index: src\pl\plpython/plpython.c
===================================================================
RCS file: c:/prog/cvsrepo/pgsql/pgsql/src/pl/plpython/plpython.c,v
retrieving revision 1.87
diff -c -r1.87 plpython.c
*** src\pl\plpython/plpython.c 2 Sep 2006 12:30:01 -0000 1.87
--- src\pl\plpython/plpython.c 14 Sep 2006 08:07:38 -0000
***************
*** 11,17 ****
* _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
--- 11,17 ----
* _DEBUG is defined */
#undef _DEBUG
/* Also hide away errcode, since we load Python.h before postgres.h */
! #define errcode __msvc_errcode
#include <Python.h>
#undef errcode
#define _DEBUG
"Magnus Hagander" <mha@sollentuna.net> writes:
Seems __vc_errcode was used during Visual C++ beta at some point, and is
now declared deprecated in the system headers. This patch renames our
use of it to __msvc_errcode, so we don't conflict anymore.
If we need this change in plpython, why not also src/include/port/win32.h?
regards, tom lane
Seems __vc_errcode was used during Visual C++ beta at some
point, and
is now declared deprecated in the system headers. This
patch renames
our use of it to __msvc_errcode, so we don't conflict anymore.
If we need this change in plpython, why not also
src/include/port/win32.h?
That's a very good question. It is because something that's pulled in
from the python headers causes the deprecation to show. Whereas when we
compile other things, the deprecation is hidden somewhere in an #ifdef
or so. But its definitly not *wrong* to fix it in win32.h as well.
The level of header files can be quite horrible to find this in, so I
haven't dug deep enough to find exactly which define it comes from. But
given that it's somewhere in the python headers, it's not something we
can change anyway.
//Magnus
"Magnus Hagander" <mha@sollentuna.net> writes:
If we need this change in plpython, why not also
src/include/port/win32.h?
That's a very good question. It is because something that's pulled in
from the python headers causes the deprecation to show. Whereas when we
compile other things, the deprecation is hidden somewhere in an #ifdef
or so. But its definitly not *wrong* to fix it in win32.h as well.
OK, changed it both places.
regards, tom lane