Add -DMULTIARCH (see change #3006).

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

diff --git a/XSUB.h b/XSUB.h
index 32e0810..ad465a0 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -29,13 +29,10 @@
 #define XSINTERFACE_FUNC_SET(cv,f)     \
                CvXSUBANY(cv).any_dptr = (void (*) _((void*)))(f)
 
-#define XSFLUSHARGS \
-       PL_stack_sp = PL_stack_base + ax + ((off) - 1)
-
-#define XSRETURN(off)                          \
-    STMT_START {                               \
-       XSFLUSHARGS;                            \
-       return;                                 \
+#define XSRETURN(off)                                  \
+    STMT_START {                                       \
+       PL_stack_sp = PL_stack_base + ax + ((off) - 1); \
+       return;                                         \
     } STMT_END
 
 /* Simple macros to put new mortal values onto the stack.   */
@@ -111,10 +108,8 @@
 #  ifdef USE_LOCALE_COLLATE
 #    define VTBL_collxfrm      get_vtbl(want_vtbl_collxfrm)
 #  endif
-#  ifdef OVERLOAD
-#    define VTBL_amagic                get_vtbl(want_vtbl_amagic)
-#    define VTBL_amagicelem    get_vtbl(want_vtbl_amagicelem)
-#  endif
+#  define VTBL_amagic          get_vtbl(want_vtbl_amagic)
+#  define VTBL_amagicelem      get_vtbl(want_vtbl_amagicelem)
 #else
 #  define VTBL_sv              &PL_vtbl_sv
 #  define VTBL_env             &PL_vtbl_env
@@ -144,10 +139,8 @@
 #  ifdef USE_LOCALE_COLLATE
 #    define VTBL_collxfrm      &PL_vtbl_collxfrm
 #  endif
-#  ifdef OVERLOAD
-#    define VTBL_amagic                &PL_vtbl_amagic
-#    define VTBL_amagicelem    &PL_vtbl_amagicelem
-#  endif
+#  define VTBL_amagic          &PL_vtbl_amagic
+#  define VTBL_amagicelem      &PL_vtbl_amagicelem
 #endif
 
 #ifdef PERL_OBJECT