tweaks to get PERL_OBJECT building again; passes tests

p4raw-id: //depot/perl@1137

diff --git a/ObjXSub.h b/ObjXSub.h
index 605ef1c..aa5944c 100644 (file)
--- a/ObjXSub.h
+++ b/ObjXSub.h
@@ -1191,6 +1191,8 @@
 #define magic_setvec        pPerl->Perl_magic_setvec
 #undef  magic_sizepack
 #define magic_sizepack      pPerl->Perl_magic_sizepack
+#undef  magic_unchain
+#define magic_unchain       pPerl->Perl_magic_unchain
 #undef  magic_wipepack
 #define magic_wipepack      pPerl->Perl_magic_wipepack
 #undef  magicname

diff --git a/objpp.h b/objpp.h
index 757a65b..5a6dafb 100644 (file)
--- a/objpp.h
+++ b/objpp.h
@@ -645,6 +645,8 @@
 #define magic_setvec      CPerlObj::Perl_magic_setvec
 #undef  magic_sizepack
 #define magic_sizepack    CPerlObj::Perl_magic_sizepack
+#undef  magic_unchain
+#define magic_unchain     CPerlObj::Perl_magic_unchain
 #undef  magic_wipepack
 #define magic_wipepack    CPerlObj::Perl_magic_wipepack
 #undef  magicname

diff --git a/proto.h b/proto.h
index 2356e68..97eda50 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -837,6 +837,7 @@ void *bset_obj_store _((void *obj, I32 ix));
 OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp));
 
 #define PPDEF(s) OP* CPerlObj::s _((ARGSproto));
+public:
 
 PPDEF(pp_aassign)
 PPDEF(pp_abs)
@@ -1232,9 +1233,6 @@ VIRTUAL int&      ErrorNo _((void));
 END_EXTERN_C
 #endif /* PERL_OBJECT */
 
-#ifdef PERL_OBJECT
-public:
-#endif
 #ifdef INDIRECT_BGET_MACROS
 VIRTUAL void byterun _((struct bytestream bs));
 #else