Allow building with perl 5.14.

Patch from Alex Hunsaker.

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index d3b86533ece08d36a98ea8b71c33d9b13d59aac0..64a4fd45d603259a5b6715a14c128c29ff6f2d22 100644 (file)
--- 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 c8aa185a3b64c3d2fe1c0b668b49af63a3b36910..48828b60236e3a1f595687a7f64d49fc8a7ef0db 100644 (file)
--- 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);