Integrate from mainperl.

p4raw-id: //depot/cfgperl@3554

1 files changed, 8 insertions, 2 deletions

diff --git a/util.c b/util.c
index 5e77d4648c..582a7977b8 100644
--- a/util.c
+++ b/util.c
@@ -1408,8 +1408,8 @@ Perl_mess(pTHX_ const char *pat, va_list *args)
     return sv;
 }
 
-static OP *
-do_die(pTHX_ const char* pat, va_list *args)
+STATIC OP *
+S_do_die(pTHX_ const char* pat, va_list *args)
 {
     dTHR;
     char *message;
@@ -3301,6 +3301,12 @@ Perl_get_opargs(pTHX)
  return PL_opargs;
 }
 
+PPADDR_t*
+Perl_get_ppaddr(pTHX)
+{
+ return &PL_ppaddr;
+}
+
 #ifndef HAS_GETENV_LEN
 char *
 Perl_getenv_len(pTHX_ char *env_elem, unsigned long *len)