Start merge with maint-5.004 branch by creating an ancestral

branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.

p4raw-id: //depot/perl@77

1 files changed, 1 insertions, 5 deletions

diff --git a/proto.h b/proto.h
index 4c51fdc2be..4565ec4a82 100644
--- a/proto.h
+++ b/proto.h
@@ -398,10 +398,7 @@ Sighandler_t rsignal _((int, Sighandler_t));
 int	rsignal_restore _((int, Sigsave_t*));
 int	rsignal_save _((int, Sighandler_t, Sigsave_t*));
 Sighandler_t rsignal_state _((int));
-int	runops_standard _((void));
-#ifdef DEBUGGING
-int	runops_debug _((void));
-#endif
+int	runops _((void));
 void	rxres_free _((void** rsp));
 void	rxres_restore _((void** rsp, REGEXP* rx));
 void	rxres_save _((void** rsp, REGEXP* rx));
@@ -468,7 +465,6 @@ UV	sv_2uv _((SV* sv));
 void	sv_add_arena _((char* ptr, U32 size, U32 flags));
 int	sv_backoff _((SV* sv));
 SV*	sv_bless _((SV* sv, HV* stash));
-SV*	sv_bless3 _((SV* sv, HV* stash, bool zaptilde));
 void	sv_catpvf _((SV* sv, const char* pat, ...));
 void	sv_catpv _((SV* sv, char* ptr));
 void	sv_catpvn _((SV* sv, char* ptr, STRLEN len));