Allow building with perl 5.14.

adunstan · adunstan · commit cb252c2acd41 · 2011-06-04T19:35:04.000-04:00
Patch from Alex Hunsaker.
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
@@ -874,7 +874,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
@@ -42,6 +42,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
+
 /* 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
`@@ -874,7 +874,7 @@ plperl_trusted_init(void)`
`874`	`874`	`if (!isGV_with_GP(sv) \|\| !GvCV(sv))`
`875`	`875`	`continue;`
`876`	`876`	`SvREFCNT_dec(GvCV(sv)); /* free the CV */`
`877`		`- GvCV(sv) = NULL; /* prevent call via GV */`
	`877`	`+ GvCV_set(sv, NULL); /* prevent call via GV */`
`878`	`878`	`}`
`879`	`879`	`hv_clear(stash);`
`880`	`880`