oops, backout bogus change#3545

[p5sagit/p5-mst-13.2.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 13e5de4..74e8f02 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -1,19 +1,13 @@
 #define ST(off) PL_stack_base[ax + (off)]
 
-#ifdef CAN_PROTOTYPE
-#  ifdef PERL_OBJECT
-#    define XS(name) void name(CV* cv, CPerlObj* pPerl)
+#ifdef PERL_OBJECT
+#  define XS(name) void name(CV* cv, CPerlObj* pPerl)
+#else
+#  if defined(CYGWIN32) && defined(USE_DYNAMIC_LOADING)
+#    define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv)
 #  else
-#    if defined(CYGWIN32) && defined(USE_DYNAMIC_LOADING)
-#      define XS(name) __declspec(dllexport) void name(CV* cv)
-       extern struct _reent *_impure_ptr;
-       void impure_setup(struct _reent *_impure_ptrMain);
-#    else
-#      define XS(name) void name(CV* cv)
-#    endif
+#    define XS(name) void name(pTHX_ CV* cv)
 #  endif
-#else
-#  define XS(name) void name(cv) CV* cv;
 #endif
 
 #define dXSARGS                                \
@@ -31,9 +25,9 @@
 #  define XSINTERFACE_CVT(ret,name) ret (*name)()
 #endif
 #define dXSFUNCTION(ret)               XSINTERFACE_CVT(ret,XSFUNCTION)
-#define XSINTERFACE_FUNC(ret,cv,f)     ((XSINTERFACE_CVT(ret,))(f))
+#define XSINTERFACE_FUNC(ret,cv,f)     ((XSINTERFACE_CVT(ret,cv))(f))
 #define XSINTERFACE_FUNC_SET(cv,f)     \
-               CvXSUBANY(cv).any_dptr = (void (*) _((void*)))(f)
+               CvXSUBANY(cv).any_dptr = (void (*) (pTHX_ void*))(f)
 
 #define XSRETURN(off)                                  \
     STMT_START {                                       \
@@ -71,14 +65,14 @@
            tmpsv = ST(1);                                              \
        else {                                                          \
            /* XXX GV_ADDWARN */                                        \
-           tmpsv = perl_get_sv(form("%s::%s", module,                  \
-                                 vn = "XS_VERSION"), FALSE);           \
+           tmpsv = get_sv(Perl_form(aTHX_ "%s::%s", module,            \
+                               vn = "XS_VERSION"), FALSE);             \
            if (!tmpsv || !SvOK(tmpsv))                                 \
-               tmpsv = perl_get_sv(form("%s::%s", module,              \
-                                     vn = "VERSION"), FALSE);          \
+               tmpsv = get_sv(Perl_form(aTHX_ "%s::%s", module,        \
+                                   vn = "VERSION"), FALSE);            \
        }                                                               \
        if (tmpsv && (!SvOK(tmpsv) || strNE(XS_VERSION, SvPV(tmpsv, n_a))))     \
-           croak("%s object version %s does not match %s%s%s%s %_",    \
+           Perl_croak(aTHX_ "%s object version %s does not match %s%s%s%s %_", \
                  module, XS_VERSION,                                   \
                  vn ? "$" : "", vn ? module : "", vn ? "::" : "",      \
                  vn ? vn : "bootstrap parameter", tmpsv);              \