Fix build with Perl 5.26.0


(ryoon)

$NetBSD: patch-Decoder.xs,v 1.1 2017/06/07 14:33:23 ryoon Exp $

* Fix build with Perl 5.26.0
  Like devel/p5-Params-Classify/patches/patch-lib_Params_Classify.xs

--- Decoder.xs.orig	2015-11-27 00:15:01.000000000 +0000
+++ Decoder.xs
@@ -19,6 +19,26 @@
 #ifndef PERL_ARGS_ASSERT_CROAK_XS_USAGE
 #define PERL_ARGS_ASSERT_CROAK_XS_USAGE assert(cv); assert(params)
 
+#ifndef OpHAS_SIBLING
+#  define OpHAS_SIBLING(o)		(cBOOL((o)->op_sibling))
+#endif
+
+#ifndef OpSIBLING
+#  define OpSIBLING(o)			(0 + (o)->op_sibling)
+#endif
+
+#ifndef OpMORESIB_set
+#  define OpMORESIB_set(o, sib)		((o)->op_sibling = (sib))
+#endif
+
+#ifndef OpLASTSIB_set
+#  define OpLASTSIB_set(o, parent)	((o)->op_sibling = NULL)
+#endif
+
+#ifndef OpMAYBESIB_set
+#  define OpMAYBESIB_set(o, sib, parent)	((o)->op_sibling = (sib))
+#endif
+
 /* prototype to pass -Wmissing-prototypes */
 STATIC void
 S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params);
@@ -193,17 +213,17 @@ THX_ck_entersub_args_sereal_decoder(pTHX
 
     entersubop = ck_entersub_args_proto(entersubop, namegv, (SV*)cv);
     pushop = cUNOPx(entersubop)->op_first;
-    if ( ! pushop->op_sibling )
+    if ( ! OpHAS_SIBLING(pushop) )
         pushop = cUNOPx(pushop)->op_first;
-    firstargop = pushop->op_sibling;
+    firstargop = OpSIBLING(pushop);
 
-    for (cvop = firstargop; cvop->op_sibling; cvop = cvop->op_sibling) ;
+    for (cvop = firstargop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
 
     lastargop = pushop;
     for (
         arity = 0, lastargop = pushop, argop = firstargop;
         argop != cvop;
-        lastargop = argop, argop = argop->op_sibling
+        lastargop = argop, argop = OpSIBLING(argop)
     ){
         arity++;
     }
@@ -222,8 +242,8 @@ THX_ck_entersub_args_sereal_decoder(pTHX
     if (arity > min_arity)
         opopt |= OPOPT_OUTARG_HEADER;
 
-    pushop->op_sibling = cvop;
-    lastargop->op_sibling = NULL;
+    OpLASTSIB_set(pushop, cvop);
+    OpLASTSIB_set(lastargop, NULL);
     op_free(entersubop);
     newop = newUNOP(OP_NULL, 0, firstargop);
     newop->op_type    = OP_CUSTOM;

$NetBSD: patch-Encoder.xs,v 1.1 2017/06/07 14:33:24 ryoon Exp $

* Fix build with Perl 5.26.0
  Like devel/p5-Params-Classify/patches/patch-lib_Params_Classify.xs

--- Encoder.xs.orig	2015-11-27 01:30:50.000000000 +0000
+++ Encoder.xs
@@ -20,6 +20,27 @@
 # define GvCV_set(gv, cv) (GvCV(gv) = (cv))
 #endif
 
+#ifndef OpHAS_SIBLING
+#  define OpHAS_SIBLING(o)		(cBOOL((o)->op_sibling))
+#endif
+
+#ifndef OpSIBLING
+#  define OpSIBLING(o)			(0 + (o)->op_sibling)
+#endif
+
+#ifndef OpMORESIB_set
+#  define OpMORESIB_set(o, sib)		((o)->op_sibling = (sib))
+#endif
+
+#ifndef OpLASTSIB_set
+#  define OpLASTSIB_set(o, parent)	((o)->op_sibling = NULL)
+#endif
+
+#ifndef OpMAYBESIB_set
+#  define OpMAYBESIB_set(o, sib, parent)	((o)->op_sibling = (sib))
+#endif
+
+
 #if defined(cv_set_call_checker) && defined(XopENTRY_set)
 # define USE_CUSTOM_OPS 1
 #else
@@ -88,14 +109,14 @@ THX_ck_entersub_args_sereal_encode_with_
 
   entersubop = ck_entersub_args_proto(entersubop, namegv, ckobj);
   pushop = cUNOPx(entersubop)->op_first;
-  if (!pushop->op_sibling)
+  if (!OpHAS_SIBLING(pushop))
     pushop = cUNOPx(pushop)->op_first;
-  firstargop = pushop->op_sibling;
+  firstargop = OpSIBLING(pushop);
 
-  for (cvop = firstargop; cvop->op_sibling; cvop = cvop->op_sibling) ;
+  for (cvop = firstargop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
 
   for (arity = 0, lastargop = pushop, argop = firstargop; argop != cvop;
-       lastargop = argop, argop = argop->op_sibling)
+       lastargop = argop, argop = OpSIBLING(argop))
   {
     arity++;
   }
@@ -106,8 +127,8 @@ THX_ck_entersub_args_sereal_encode_with_
   /* If we get here, we can replace the entersub with a suitable
    * sereal_encode_with_object custom OP. */
 
-  pushop->op_sibling = cvop;
-  lastargop->op_sibling = NULL;
+  OpLASTSIB_set(pushop, cvop);
+  OpLASTSIB_set(lastargop, NULL);
   op_free(entersubop);
   newop = newUNOP(OP_NULL, 0, firstargop);
   newop->op_type    = OP_CUSTOM;

$NetBSD: patch-Makefile.PL,v 1.1 2017/06/07 14:33:24 ryoon Exp $

* FIx build with Perl 5.26.0

--- Makefile.PL.orig	2016-12-03 00:33:01.000000000 +0000
+++ Makefile.PL
@@ -6,7 +6,7 @@ my $clean = {};
 if (-f "Collate.xs") {
     print "Making header files for XS...\n";
 
-    do 'mkheader' or die $@ || "mkheader: $!";
+    do './mkheader' or die $@ || "mkheader: $!";
 
     $clean = { FILES => 'ucatbl.h' };
 }

$NetBSD: patch-Makefile.PL,v 1.1 2017/06/07 14:33:24 ryoon Exp $

* Fix build with Perl 5.26.0

--- Makefile.PL.orig	2015-12-16 02:02:23.000000000 +0000
+++ Makefile.PL
@@ -8,7 +8,7 @@ my $mm_ver = ExtUtils::MakeMaker->VERSIO
 if (-f "Normalize.xs") {
     print STDERR "Making header files for XS...\n";
 
-    do 'mkheader' or die $@ || "mkheader: $!";
+    do './mkheader' or die $@ || "mkheader: $!";
 
     $clean = { FILES => 'unfcan.h unfcmb.h unfcmp.h unfcpt.h unfexc.h' };
 }