Put back the cygwin32 Configure fix of 3582 undone by 3597.

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

diff --git a/XSUB.h b/XSUB.h
index 13e5de4..70e7d84 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -1,19 +1,9 @@
 #define ST(off) PL_stack_base[ax + (off)]
 
-#ifdef CAN_PROTOTYPE
-#  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(CV* cv)
-       extern struct _reent *_impure_ptr;
-       void impure_setup(struct _reent *_impure_ptrMain);
-#    else
-#      define XS(name) void name(CV* cv)
-#    endif
-#  endif
+#if defined(CYGWIN32) && defined(USE_DYNAMIC_LOADING)
+#  define XS(name) __declspec(dllexport) void name(pTHXo_ CV* cv)
 #else
-#  define XS(name) void name(cv) CV* cv;
+#  define XS(name) void name(pTHXo_ CV* cv)
 #endif
 
 #define dXSARGS                                \
@@ -31,9 +21,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 +61,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);              \
@@ -154,10 +144,12 @@
 #ifdef PERL_OBJECT
 #  include "objXSUB.h"
 
-#  undef  PERL_OBJECT_THIS
-#  define PERL_OBJECT_THIS pPerl
-#  undef  PERL_OBJECT_THIS_
-#  define PERL_OBJECT_THIS_ pPerl,
+#  undef  aTHXo
+#  define aTHXo                        pPerl
+#  undef  aTHXo_
+#  define aTHXo_               aTHXo,
+#  undef  _aTHXo
+#  define _aTHXo               ,aTHXo
 
 #  undef  SAVEDESTRUCTOR
 #  define SAVEDESTRUCTOR(f,p) \
@@ -168,8 +160,6 @@
 #      undef   errno
 #      define  errno                   ErrorNo()
 #    endif
-#    undef  ErrorNo
-#    define ErrorNo                    pPerl->ErrorNo
 #    undef  NtCrypt
 #    define NtCrypt                    pPerl->NtCrypt
 #    undef  NtGetLib
@@ -182,6 +172,8 @@
 #    define NtGetBin                   pPerl->NtGetBin
 #    undef  NtGetDebugScriptStr
 #    define NtGetDebugScriptStr                pPerl->NtGetDebugScriptStr
+#    undef fprintf
+#    define fprintf                    pPerl->fprintf
 #  endif /* WIN32 */
 
 #  ifndef NO_XSLOCKS