Down with C++ reserved names

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

diff --git a/XSUB.h b/XSUB.h
index 6751572..7c059c1 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -1,7 +1,7 @@
 /*    XSUB.h
  *
  *    Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2003, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -245,7 +245,7 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 #  define XS_VERSION_BOOTCHECK \
     STMT_START {                                                       \
        SV *_sv; STRLEN n_a;                                            \
-       char *vn = Nullch, *module = SvPV(ST(0),n_a);                   \
+       const char *vn = Nullch, *module = SvPV(ST(0),n_a);             \
        if (items >= 2)  /* version supplied as bootstrap arg */        \
            _sv = ST(1);                                                \
        else {                                                          \
@@ -272,11 +272,13 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 #  define XS_VERSION_BOOTCHECK
 #endif
 
-#define dXCPT             dJMPENV; int rEtV = 0
-#define XCPT_TRY_START    JMPENV_PUSH(rEtV); if (rEtV == 0)
-#define XCPT_TRY_END      JMPENV_POP;
-#define XCPT_CATCH        if (rEtV != 0)
-#define XCPT_RETHROW      JMPENV_JUMP(rEtV)
+#ifdef NO_XSLOCKS
+#  define dXCPT             dJMPENV; int rEtV = 0
+#  define XCPT_TRY_START    JMPENV_PUSH(rEtV); if (rEtV == 0)
+#  define XCPT_TRY_END      JMPENV_POP;
+#  define XCPT_CATCH        if (rEtV != 0)
+#  define XCPT_RETHROW      JMPENV_JUMP(rEtV)
+#endif
 
 /* 
    The DBM_setFilter & DBM_ckFilter macros are only used by