aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2011-06-04 19:37:50 -0400
committerAndrew Dunstan <andrew@dunslane.net>2011-06-04 19:37:50 -0400
commitf604891a06a6662502a2b13607308fef67e4257d (patch)
tree138e2fc6dcd5a2d2d2353973ef40b54c266a8919 /src
parentb9544a070b3a5e2d52c3218f2e40835806ec9172 (diff)
downloadpostgresql-f604891a06a6662502a2b13607308fef67e4257d.tar.gz
postgresql-f604891a06a6662502a2b13607308fef67e4257d.zip
Allow building with perl 5.14.
Patch from Alex Hunsaker.
Diffstat (limited to 'src')
-rw-r--r--src/pl/plperl/plperl.c2
-rw-r--r--src/pl/plperl/plperl.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index d3b86533ece..64a4fd45d60 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -687,7 +687,7 @@ plperl_trusted_init(void)
if (!isGV_with_GP(sv) || !GvCV(sv))
continue;
SvREFCNT_dec(GvCV(sv)); /* free the CV */
- GvCV(sv) = NULL; /* prevent call via GV */
+ GvCV_set(sv, NULL); /* prevent call via GV */
}
hv_clear(stash);
/* invalidate assorted caches */
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
index c8aa185a3b6..48828b60236 100644
--- a/src/pl/plperl/plperl.h
+++ b/src/pl/plperl/plperl.h
@@ -43,6 +43,11 @@
#undef bool
#endif
+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
+#ifndef GvCV_set
+#define GvCV_set(gv, cv) (GvCV(gv) = cv)
+#endif
+
/* routines from spi_internal.c */
int spi_DEBUG(void);
int spi_LOG(void);