applied patch, with tweak suggested by Michael Parker

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

diff --git a/objpp.h b/objpp.h
index 94837c7..e0c2f24 100644 (file)
--- a/objpp.h
+++ b/objpp.h
@@ -51,28 +51,16 @@
 #define av_unshift        CPerlObj::Perl_av_unshift
 #undef  avhv_keys
 #define avhv_keys         CPerlObj::Perl_avhv_keys
-#undef  avhv_fetch
-#define avhv_fetch        CPerlObj::Perl_avhv_fetch
 #undef  avhv_fetch_ent
 #define avhv_fetch_ent    CPerlObj::Perl_avhv_fetch_ent
-#undef  avhv_store
-#define avhv_store        CPerlObj::Perl_avhv_store
-#undef  avhv_store_ent
-#define avhv_store_ent    CPerlObj::Perl_avhv_store_ent
 #undef  avhv_exists_ent
 #define avhv_exists_ent   CPerlObj::Perl_avhv_exists_ent
-#undef  avhv_exists
-#define avhv_exists       CPerlObj::Perl_avhv_exists
-#undef  avhv_delete
-#define avhv_delete       CPerlObj::Perl_avhv_delete
-#undef  avhv_delete_ent
-#define avhv_delete_ent   CPerlObj::Perl_avhv_delete_ent
+#undef  avhv_index_sv
+#define avhv_index_sv     CPerlObj::avhv_index_sv
 #undef  avhv_iternext
 #define avhv_iternext     CPerlObj::Perl_avhv_iternext
 #undef  avhv_iterval
 #define avhv_iterval      CPerlObj::Perl_avhv_iterval
-#undef  avhv_iternextsv
-#define avhv_iternextsv   CPerlObj::Perl_avhv_iternextsv
 #undef  bad_type
 #define bad_type          CPerlObj::bad_type
 #undef  bind_match
@@ -241,6 +229,8 @@
 #define dopoptoloop       CPerlObj::dopoptoloop
 #undef  dopoptosub
 #define dopoptosub        CPerlObj::dopoptosub
+#undef  dopoptosub_at
+#define dopoptosub_at     CPerlObj::dopoptosub_at
 #undef  dounwind
 #define dounwind          CPerlObj::Perl_dounwind
 #undef  do_aexec
@@ -565,8 +555,6 @@
 #define magic_clearsig    CPerlObj::Perl_magic_clearsig
 #undef  magic_existspack
 #define magic_existspack  CPerlObj::Perl_magic_existspack
-#undef  magic_freedefelem
-#define magic_freedefelem CPerlObj::Perl_magic_freedefelem
 #undef  magic_freeregexp
 #define magic_freeregexp  CPerlObj::Perl_magic_freeregexp
 #undef  magic_get