diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-06-27 14:28:49 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-06-27 14:28:49 +0000 |
| commit | 0cb9638729211ea71a75ae8756c03ba21553bd53 (patch) | |
| tree | f00e767824d620a63a26a857b6a37fcb6945f89d /XSUB.h | |
| parent | 4f4e629e089f1120f8e94984281df06ac4f885c5 (diff) | |
| download | perl-0cb9638729211ea71a75ae8756c03ba21553bd53.tar.gz | |
somewhat untested PERL_OBJECT cleanups (C++isms mostly
gone from the public API); PERL_OBJECT builds again on
windows
TODO: namespace-clean the typedefs in iperlsys.h and
elsewhere; remove C++ remnants from public headers
p4raw-id: //depot/perl@3553
Diffstat (limited to 'XSUB.h')
| -rw-r--r-- | XSUB.h | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -1,13 +1,9 @@ #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 \ @@ -148,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) \ @@ -162,8 +160,6 @@ # undef errno # define errno ErrorNo() # endif -# undef ErrorNo -# define ErrorNo pPerl->ErrorNo # undef NtCrypt # define NtCrypt pPerl->NtCrypt # undef NtGetLib @@ -176,6 +172,8 @@ # define NtGetBin pPerl->NtGetBin # undef NtGetDebugScriptStr # define NtGetDebugScriptStr pPerl->NtGetDebugScriptStr +# undef fprintf +# define fprintf pPerl->fprintf # endif /* WIN32 */ # ifndef NO_XSLOCKS |