use the new names for the package-stash methods

[gitmo/Class-MOP.git] / mop.h

diff --git a/mop.h b/mop.h
index 4aa5788..e30510d 100644 (file)
--- a/mop.h
+++ b/mop.h
@@ -10,13 +10,13 @@
 #define NEED_sv_2pv_nolen
 #include "ppport.h"
 
-#define MOP_CALL_BOOT(name) \
-    { \
-        EXTERN_C XS(name); \
-        mop_call_xs(aTHX_ name, cv, mark); \
-    }
+#define MOP_CALL_BOOT(name)  mop_call_xs(aTHX_ name, cv, mark);
+
+#ifndef XSPROTO
+#define XSPROTO(name) XS(name)
+#endif
 
-void mop_call_xs (pTHX_ void (*subaddr) (pTHX_ CV *), CV *cv, SV **mark);
+void mop_call_xs (pTHX_ XSPROTO(subaddr), CV *cv, SV **mark);
 
 typedef enum {
     KEY_name,
@@ -27,6 +27,7 @@ typedef enum {
     KEY_methods,
     KEY_VERSION,
     KEY_ISA,
+    KEY__version,
     key_last,
 } mop_prehashed_key_t;