X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=dc805d85ac2d6e5774fc1e3189f5888bd555ecf4;hb=4beedc23b598a493399ba23c8c4bd5448e52283a;hp=8edefcf8ed72e55d75f1e3515afe315b1482aa78;hpb=3280af22f58e7b37514ed104858e2c2fc55ceeeb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index 8edefcf..dc805d8 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -10,11 +10,6 @@
 #define XS(name) void name(cv) CV* cv;
 #endif
 
-#define na		PL_na
-#define sv_undef	PL_sv_undef
-#define sv_yes		PL_sv_yes
-#define sv_no		PL_sv_no
-
 #define dXSARGS				\
 	dSP; dMARK;			\
 	I32 ax = mark - PL_stack_base + 1;	\
@@ -62,37 +57,37 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {							\
-	SV *Sv;								\
-	char *vn = Nullch, *module = SvPV(ST(0),na);			\
+	SV *tmpsv;							\
+	char *vn = Nullch, *module = SvPV(ST(0),PL_na);			\
 	if (items >= 2)	 /* version supplied as bootstrap arg */	\
-	    Sv = ST(1);							\
+	    tmpsv = ST(1);						\
 	else {								\
 	    /* XXX GV_ADDWARN */					\
-	    Sv = perl_get_sv(form("%s::%s", module,			\
+	    tmpsv = perl_get_sv(form("%s::%s", module,			\
 				  vn = "XS_VERSION"), FALSE);		\
-	    if (!Sv || !SvOK(Sv))					\
-		Sv = perl_get_sv(form("%s::%s", module,			\
+	    if (!tmpsv || !SvOK(tmpsv))					\
+		tmpsv = perl_get_sv(form("%s::%s", module,		\
 				      vn = "VERSION"), FALSE);		\
 	}								\
-	if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, SvPV(Sv, na))))	\
+	if (tmpsv && (!SvOK(tmpsv) || strNE(XS_VERSION, SvPV(tmpsv, PL_na))))	\
 	    croak("%s object version %s does not match %s%s%s%s %_",	\
 		  module, XS_VERSION,					\
 		  vn ? "$" : "", vn ? module : "", vn ? "::" : "",	\
-		  vn ? vn : "bootstrap parameter", Sv);			\
+		  vn ? vn : "bootstrap parameter", tmpsv);		\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK
 #endif
 
 #ifdef PERL_OBJECT
-#include "ObjXSub.h"
+#include "objXSUB.h"
 #ifndef NO_XSLOCKS
 #ifdef WIN32
-#include "XSLock.h"
+#include "XSlock.h"
 #endif  /* WIN32 */
 #endif  /* NO_XSLOCKS */
 #else
 #ifdef PERL_CAPI
-#include "PerlCAPI.h"
+#include "perlCAPI.h"
 #endif
 #endif	/* PERL_OBJECT */