From af98bb2ad7f4eae4ed5f759605f1d0da0e1fee02 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 6 Jun 2009 03:45:36 +0000
Subject: [PATCH] Move variable declaration to avoid 'unused variable' warning
when the ifdef doesn't trigger. Not worth back-patching. Per buildfarm
reports.
---
src/pl/plperl/plperl.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 377758e001b..4abbdeae206 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.148 2009/06/05 20:32:00 adunstan Exp $
+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.149 2009/06/06 03:45:36 tgl Exp $
*
**********************************************************************/
@@ -398,11 +398,8 @@ plperl_init_interp(void)
static char *embedding[3] = {
"", "-e", PERLBOOT
};
-
int nargs = 3;
- char *dummy_perl_env[1] = { NULL };
-
#ifdef WIN32
/*
@@ -457,7 +454,11 @@ plperl_init_interp(void)
#if defined(PERL_SYS_INIT3) && !defined(MYMALLOC)
/* only call this the first time through, as per perlembed man page */
if (interp_state == INTERP_NONE)
- PERL_SYS_INIT3(&nargs, (char ***) &embedding, (char***)&dummy_perl_env);
+ {
+ char *dummy_env[1] = { NULL };
+
+ PERL_SYS_INIT3(&nargs, (char ***) &embedding, (char ***) &dummy_env);
+ }
#endif
plperl_held_interp = perl_alloc();
--
GitLab