database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-05 07:41:25 +03:00
Code Activity

Adjust recent PERL_SYS_INIT3 call to avoid platforms where it might fail, and to remove compilation warning. Backpatch the release 7.4

Browse Source
This commit is contained in:
Andrew Dunstan
2009-06-05 20:32:41 +00:00
parent 64a4c69fbb
commit b3452713ff
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pl/plperl/plperl.c
View File

@@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.94.2.11 2009/06/04 16:00:49 adunstan Exp $ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.94.2.12 2009/06/05 20:32:41 adunstan Exp $
* *
**********************************************************************/ **********************************************************************/
@@ -284,6 +284,8 @@ plperl_init_interp(void)
int nargs = 3; int nargs = 3;
char *dummy_perl_env[1] = { NULL };
#ifdef WIN32 #ifdef WIN32
/* /*
@@ -323,8 +325,17 @@ plperl_init_interp(void)
#endif #endif
#ifdef PERL_SYS_INIT3 /****
PERL_SYS_INIT3(&nargs, (char ***) &embedding, NULL); * The perl API docs state that PERL_SYS_INIT3 should be called before
* allocating interprters. Unfortunately, on some platforms this fails
* in the Perl_do_taint() routine, which is called when the platform is
* using the system's malloc() instead of perl's own. Other platforms,
* notably Windows, fail if PERL_SYS_INIT3 is not called. So we call it
* if it's available, unless perl is using the system malloc(), which is
* true when MYMALLOC is set.
*/
#if defined(PERL_SYS_INIT3) && !defined(MYMALLOC)
PERL_SYS_INIT3(&nargs, (char ***)&embedding, (char***)&dummy_perl_env);
#endif #endif
plperl_interp = perl_alloc(); plperl_interp = perl_alloc();