#define ST(off) PL_stack_base[ax + (off)]
-#ifdef PERL_OBJECT
-# define XS(name) void name(CV* cv, CPerlObj* pPerl)
+#if defined(CYGWIN32) && defined(USE_DYNAMIC_LOADING)
+# define XS(name) __declspec(dllexport) void name(pTHXo_ CV* cv)
#else
-# if defined(CYGWIN32) && defined(USE_DYNAMIC_LOADING)
-# define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv)
-# else
-# define XS(name) void name(pTHX_ CV* cv)
-# endif
+# define XS(name) void name(pTHXo_ CV* cv)
#endif
#define dXSARGS \
# 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 (*) (pTHX_ void*))(f)
#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) \
# undef errno
# define errno ErrorNo()
# endif
-# undef ErrorNo
-# define ErrorNo pPerl->ErrorNo
# undef NtCrypt
# define NtCrypt pPerl->NtCrypt
# undef NtGetLib
# define NtGetBin pPerl->NtGetBin
# undef NtGetDebugScriptStr
# define NtGetDebugScriptStr pPerl->NtGetDebugScriptStr
+# undef fprintf
+# define fprintf pPerl->fprintf
# endif /* WIN32 */
# ifndef NO_XSLOCKS