Include method name in immutable methods (fixes #49680)

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

diff --git a/mop.h b/mop.h
index f14dea6..288c8ad 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,
@@ -34,8 +34,8 @@ typedef enum {
 #define HASH_FOR(name) mop_prehashed_hash_for(KEY_ ##name)
 
 void mop_prehash_keys (void);
-inline SV *mop_prehashed_key_for (mop_prehashed_key_t key);
-inline U32 mop_prehashed_hash_for (mop_prehashed_key_t key);
+SV *mop_prehashed_key_for (mop_prehashed_key_t key);
+U32 mop_prehashed_hash_for (mop_prehashed_key_t key);
 
 #define INSTALL_SIMPLE_READER(klass, name)  INSTALL_SIMPLE_READER_WITH_KEY(klass, name, name)
 #define INSTALL_SIMPLE_READER_WITH_KEY(klass, name, key) \