Allow building with perl 5.14.

adunstan · adunstan · commit ccd69b888641 · 2011-06-04T19:32:10.000-04:00
Patch from Alex Hunsaker.
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
@@ -926,7 +926,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);
 
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
@@ -85,6 +85,11 @@
 								(U32)HeKUTF8(he))
 #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
+
 /* declare routines from plperl.c for access by .xs files */
 HV		   *plperl_spi_exec(char *, int);
 void		plperl_return_next(SV *);

Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,7 @@ plperl_trusted_init(void)`
`926`	`926`	`if (!isGV_with_GP(sv) \|\| !GvCV(sv))`
`927`	`927`	`continue;`
`928`	`928`	`SvREFCNT_dec(GvCV(sv)); /* free the CV */`
`8000 929`		`- GvCV(sv) = NULL; /* prevent call via GV */`
	`929`	`+ GvCV_set(sv, NULL); /* prevent call via GV */`
`930`	`930`	`}`
`931`	`931`	`hv_clear(stash);`
`932`	`932`