update to 1.16, fixes incompatibility with Perl 5.12. from Juha Erkkila
This commit is contained in:
parent
8b5fdba8dd
commit
6068a7a843
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2011/03/14 09:17:27 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2012/03/03 10:21:43 sthen Exp $
|
||||
|
||||
COMMENT = comprehensive set of aliasing operations
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
MODULES = cpan
|
||||
DISTNAME = Data-Alias-1.07
|
||||
REVISION = 4
|
||||
DISTNAME = Data-Alias-1.16
|
||||
CATEGORIES = devel
|
||||
USE_GROFF = Yes
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (Data-Alias-1.07.tar.gz) = WYZw+0R2ersRu4Adx5w97w==
|
||||
RMD160 (Data-Alias-1.07.tar.gz) = DzYWKuKxMsQtYgFUYHHxEJGirGE=
|
||||
SHA1 (Data-Alias-1.07.tar.gz) = r8+5MDUbtCpXG3AjJ4zudKVXRZ4=
|
||||
SHA256 (Data-Alias-1.07.tar.gz) = L0dtc++fYyrj2+m4OtzKJPjeUZJ5ABgi99CTh4D8y+I=
|
||||
SIZE (Data-Alias-1.07.tar.gz) = 61360
|
||||
MD5 (Data-Alias-1.16.tar.gz) = 9TpPZU1XZx/gvSzc1pdOQQ==
|
||||
RMD160 (Data-Alias-1.16.tar.gz) = ohA2vEBzRgA1r1x9cacrFg4VL0o=
|
||||
SHA1 (Data-Alias-1.16.tar.gz) = 28DHZYAuEwlNr909Ua9jLAbF+UM=
|
||||
SHA256 (Data-Alias-1.16.tar.gz) = CtGZx6TuhVvDvBUNLlWo40/1EN+0lYApogpMZIVuReA=
|
||||
SIZE (Data-Alias-1.16.tar.gz) = 64820
|
||||
|
@ -1,70 +0,0 @@
|
||||
$OpenBSD: patch-Alias_xs,v 1.1 2010/09/24 15:14:49 millert Exp $
|
||||
--- Alias.xs.orig Mon Sep 10 16:24:01 2007
|
||||
+++ Alias.xs Fri Sep 17 10:37:14 2010
|
||||
@@ -75,6 +75,10 @@
|
||||
#define SvPVX_const SvPVX
|
||||
#endif
|
||||
|
||||
+#if (PERL_COMBI_VERSION >= 5011000)
|
||||
+#define SVt_RV SVt_IV
|
||||
+#endif
|
||||
+
|
||||
#ifndef SvREFCNT_inc_NN
|
||||
#define SvREFCNT_inc_NN SvREFCNT_inc
|
||||
#endif
|
||||
@@ -366,7 +370,7 @@ STATIC void da_localize_gvar(pTHX_ GP *gp, SV **sptr)
|
||||
SSPUSHPTR(gp);
|
||||
SSPUSHINT(SAVEt_DESTRUCTOR_X);
|
||||
++gp->gp_refcnt;
|
||||
- *sptr = Nullsv;
|
||||
+ *sptr = NULL;
|
||||
}
|
||||
|
||||
STATIC SV *da_refgen(pTHX_ SV *sv) {
|
||||
@@ -1248,7 +1252,7 @@ OP *DataAlias_pp_return(pTHX) {
|
||||
cxstack_ix--;
|
||||
POPSUB(cx, sv);
|
||||
} else {
|
||||
- sv = Nullsv;
|
||||
+ sv = NULL;
|
||||
}
|
||||
PL_curpm = newpm;
|
||||
LEAVESUB(sv);
|
||||
@@ -1433,7 +1437,7 @@ STATIC int da_transform(pTHX_ OP *op, int sib) {
|
||||
int hits = 0;
|
||||
|
||||
while (op) {
|
||||
- OP *kid = Nullop, *tmp;
|
||||
+ OP *kid = NULL, *tmp;
|
||||
int ksib = TRUE;
|
||||
OPCODE optype;
|
||||
|
||||
@@ -1447,7 +1451,9 @@ STATIC int da_transform(pTHX_ OP *op, int sib) {
|
||||
default:
|
||||
--hits;
|
||||
switch (optype) {
|
||||
+#if PERL_COMBI_VERSION < 5006000
|
||||
case OP_SETSTATE:
|
||||
+#endif
|
||||
case OP_NEXTSTATE:
|
||||
case OP_DBSTATE:
|
||||
PL_curcop = (COP *) op;
|
||||
@@ -1586,7 +1592,9 @@ STATIC int da_peep2(pTHX_ OP *o) {
|
||||
if (da_peep2(aTHX_ k))
|
||||
return 1;
|
||||
} else switch (o->op_type ? o->op_type : o->op_targ) {
|
||||
+#if PERL_COMBI_VERSION < 5006000
|
||||
case OP_SETSTATE:
|
||||
+#endif
|
||||
case OP_NEXTSTATE:
|
||||
case OP_DBSTATE:
|
||||
PL_curcop = (COP *) o;
|
||||
@@ -1764,7 +1772,7 @@ STATIC OP *da_ck_entersub(pTHX_ OP *o) {
|
||||
kUNOP->op_first = last;
|
||||
while (kid->op_sibling != last)
|
||||
kid = kid->op_sibling;
|
||||
- kid->op_sibling = Nullop;
|
||||
+ kid->op_sibling = NULL;
|
||||
cLISTOPx(cUNOPo->op_first)->op_last = kid;
|
||||
if (kid->op_type == OP_NULL && inside)
|
||||
kid->op_flags &= ~OPf_SPECIAL;
|
Loading…
Reference in New Issue
Block a user