Use functionality new in ppport.h 3.62

Author: Leont

vutil/vutil.h

@@ -10,122 +10,12 @@
  * AV *av2 = MUTABLE_AV(sv); <== GOOD: it may warn
  */
 
-#ifndef MUTABLE_PTR
-#  if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
-#    define MUTABLE_PTR(p) ({ void *_p = (p); _p; })
-#  else
-#    define MUTABLE_PTR(p) ((void *) (p))
-#  endif
-#endif
-
-#ifndef MUTABLE_AV
-#  define MUTABLE_AV(p)	((AV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_CV
-#  define MUTABLE_CV(p)	((CV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_GV
-#  define MUTABLE_GV(p)	((GV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_HV
-#  define MUTABLE_HV(p)	((HV *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_IO
-#  define MUTABLE_IO(p)	((IO *)MUTABLE_PTR(p))
-#endif
-#ifndef MUTABLE_SV
-#  define MUTABLE_SV(p)	((SV *)MUTABLE_PTR(p))
-#endif
-
-#ifndef SvPVx_nolen_const
-#  if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
-#    define SvPVx_nolen_const(sv) ({SV *_sv = (sv); SvPV_nolen_const(_sv); })
-#  else
-#    define SvPVx_nolen_const(sv) (SvPV_nolen_const(sv))
-#  endif
-#endif
-
-#ifndef PERL_ARGS_ASSERT_CK_WARNER
-static void Perl_ck_warner(pTHX_ U32 err, const char* pat, ...);
-
-#  ifdef vwarner
-static
-void
-Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
-{
-  va_list args;
-
-  PERL_UNUSED_ARG(err);
-  if (ckWARN(err)) {
-    va_list args;
-    va_start(args, pat);
-    vwarner(err, pat, &args);
-    va_end(args);
-  }
-}
-#  else
-/* yes this replicates my_warner */
-static
-void
-Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
-{
-  SV *sv;
-  va_list args;
-
-  PERL_UNUSED_ARG(err);
-
-  va_start(args, pat);
-  sv = vnewSVpvf(pat, &args);
-  va_end(args);
-  sv_2mortal(sv);
-  warn("%s", SvPV_nolen(sv));
-}
-#  endif
-#endif
-
 #if PERL_VERSION_LT(5,15,4)
 #  define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from(v,"version"))
 #else
 #  define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from_pvn(v,"version",7,0))
 #endif
 
-#ifndef PERL_ARGS_ASSERT_CROAK_XS_USAGE
-#define PERL_ARGS_ASSERT_CROAK_XS_USAGE assert(cv); assert(params)
-
-/* prototype to pass -Wmissing-prototypes */
-STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params);
-
-STATIC void
-S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
-{
-    const GV *const gv = CvGV(cv);
-
-    PERL_ARGS_ASSERT_CROAK_XS_USAGE;
-
-    if (gv) {
-        const char *const gvname = GvNAME(gv);
-        const HV *const stash = GvSTASH(gv);
-        const char *const hvname = stash ? HvNAME(stash) : NULL;
-
-        if (hvname)
-            Perl_croak_nocontext("Usage: %s::%s(%s)", hvname, gvname, params);
-        else
-            Perl_croak_nocontext("Usage: %s(%s)", gvname, params);
-    } else {
-        /* Pants. I don't think that it should be possible to get here. */
-        Perl_croak_nocontext("Usage: CODE(0x%" UVxf ")(%s)", PTR2UV(cv), params);
-    }
-}
-
-#ifdef PERL_IMPLICIT_CONTEXT
-#define croak_xs_usage(a,b)	S_croak_xs_usage(aTHX_ a,b)
-#else
-#define croak_xs_usage		S_croak_xs_usage
-#endif
-
-#endif
-
 #if PERL_VERSION_GE(5,9,0) && !defined(PERL_CORE)
 
 #  define VUTIL_REPLACE_CORE 1
@@ -222,29 +112,6 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 #endif
 
 
-#if PERL_VERSION_LT(5,27,9)
-#  define LC_NUMERIC_LOCK(cond)
-#  define LC_NUMERIC_UNLOCK
-#  if PERL_VERSION_LT(5,19,0)
-#    undef STORE_LC_NUMERIC_SET_STANDARD
-#    undef RESTORE_LC_NUMERIC
-#    undef DECLARATION_FOR_LC_NUMERIC_MANIPULATION
-#    ifdef USE_LOCALE
-#      define DECLARATION_FOR_LC_NUMERIC_MANIPULATION char *loc
-#      define STORE_NUMERIC_SET_STANDARD()\
-	 loc = savepv(setlocale(LC_NUMERIC, NULL));  \
-	 SAVEFREEPV(loc); \
-	 setlocale(LC_NUMERIC, "C");
-#      define RESTORE_LC_NUMERIC()\
-	 setlocale(LC_NUMERIC, loc);
-#    else
-#      define DECLARATION_FOR_LC_NUMERIC_MANIPULATION
-#      define STORE_LC_NUMERIC_SET_STANDARD()
-#      define RESTORE_LC_NUMERIC()
-#    endif
-#  endif
-#endif
-
 #ifndef LOCK_NUMERIC_STANDARD
 #  define LOCK_NUMERIC_STANDARD()
 #endif

vutil/vxs.xs

@@ -9,6 +9,9 @@
 #define NEED_vnewSVpvf
 #define NEED_newSVpvn_flags_GLOBAL
 #define NEED_warner
+#define NEED_ck_warner
+#define NEED_croak_xs_usage
+
 /* end vutil.c */
 #include "ppport.h"
 #include "vutil.h"
@@ -54,6 +57,6 @@ BOOT:
         /* register the overloading (type 'A') magic */
         PL_amagic_generation++;
 	do {
-	    newXS(xsub->name, xsub->xsub, file);
+	    newXS((char*)xsub->name, xsub->xsub, file);
 	} while (++xsub < end);
     }