Integrate with Sarathy; manual resolve on regcomp.c conflicts

(Ilya's changes won).

p4raw-id: //depot/cfgperl@4468

1 files changed, 1 insertions, 8 deletions

diff --git a/perlapi.c b/perlapi.c
index 99a549b403..41dd32a387 100755
--- a/perlapi.c
+++ b/perlapi.c
@@ -599,13 +599,6 @@ Perl_vdeb(pTHXo_ const char* pat, va_list* args)
     ((CPerlObj*)pPerl)->Perl_vdeb(pat, args);
 }
 
-#undef  Perl_deb_growlevel
-void
-Perl_deb_growlevel(pTHXo)
-{
-    ((CPerlObj*)pPerl)->Perl_deb_growlevel();
-}
-
 #undef  Perl_debprofdump
 void
 Perl_debprofdump(pTHXo)
@@ -4210,7 +4203,7 @@ Perl_taint_env(pTHXo)
 
 #undef  Perl_taint_proper
 void
-Perl_taint_proper(pTHXo_ const char* f, char* s)
+Perl_taint_proper(pTHXo_ const char* f, const char* s)
 {
     ((CPerlObj*)pPerl)->Perl_taint_proper(f, s);
 }