diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2009-06-04 16:00:33 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2009-06-04 16:00:33 +0000 |
| commit | 7920e7cc7fa4bc8b95a72c251bcac56537bfa699 (patch) | |
| tree | 2695a609aaf9edacbe07f8ce10547a91e5fcf305 /src | |
| parent | 6432580fdbecd41d8d29998b99a8bf2567f171d1 (diff) | |
| download | postgresql-7920e7cc7fa4bc8b95a72c251bcac56537bfa699.tar.gz postgresql-7920e7cc7fa4bc8b95a72c251bcac56537bfa699.zip | |
Initialise perl library as documented in perl API. Backpatch to release 7.4.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plperl/plperl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 638c6ac7ffb..8937e2ddbc9 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1,7 +1,7 @@ /********************************************************************** * plperl.c - perl as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.123.2.4 2008/01/22 20:19:53 adunstan Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.123.2.5 2009/06/04 16:00:33 adunstan Exp $ * **********************************************************************/ @@ -380,6 +380,8 @@ plperl_init_interp(void) "", "-e", PERLBOOT }; + int nargs = 3; + #ifdef WIN32 /* @@ -422,6 +424,11 @@ plperl_init_interp(void) save_time = loc ? pstrdup(loc) : NULL; #endif +#ifdef PERL_SYS_INIT3 + /* only call this the first time through, as per perlembed man page */ + if (interp_state == INTERP_NONE) + PERL_SYS_INIT3(&nargs, (char ***) &embedding, NULL); +#endif plperl_held_interp = perl_alloc(); if (!plperl_held_interp) @@ -429,7 +436,7 @@ plperl_init_interp(void) perl_construct(plperl_held_interp); perl_parse(plperl_held_interp, plperl_init_shared_libs, - 3, embedding, NULL); + nargs, embedding, NULL); perl_run(plperl_held_interp); if (interp_state == INTERP_NONE) |