X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=8a5b92a4c74c3faf42acc55e07dde5f15a812601;hb=f29b885a606ebcae8bf384c16eb4affebb332ccc;hp=760caa1cf6acdf3ef1745c9ef7d07010e4d677a4;hpb=cbf82dd00c19573e7e274a1d8dda9656bc6e259a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/proto.h b/proto.h
index 760caa1..8a5b92a 100644
--- a/proto.h
+++ b/proto.h
@@ -650,7 +650,8 @@ PERL_CALLCONV void	Perl_gv_init(pTHX_ GV* gv, HV* stash, const char* name, STRLE
 			__attribute__nonnull__(pTHX_3);
 
 PERL_CALLCONV void	Perl_gv_name_set(pTHX_ GV* gv, const char *name, U32 len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__nonnull__(pTHX_1)
+			__attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV HV*	Perl_gv_stashpv(pTHX_ const char* name, I32 create)
 			__attribute__nonnull__(pTHX_1);
@@ -2064,9 +2065,13 @@ PERL_CALLCONV IO*	Perl_sv_2io(pTHX_ SV* sv)
 			__attribute__nonnull__(pTHX_1);
 
 #ifdef PERL_IN_SV_C
-STATIC char*	S_glob_2inpuv(pTHX_ GV* gv, STRLEN *len, bool want_number)
+STATIC bool	S_glob_2number(pTHX_ GV* const gv)
 			__attribute__nonnull__(pTHX_1);
 
+STATIC char*	S_glob_2pv(pTHX_ GV* const gv, STRLEN * const len)
+			__attribute__nonnull__(pTHX_1)
+			__attribute__nonnull__(pTHX_2);
+
 #endif
 /* PERL_CALLCONV IV	sv_2iv(pTHX_ SV* sv)
 			__attribute__nonnull__(pTHX_1); */
@@ -2865,27 +2870,27 @@ PERL_CALLCONV int	Perl_nothreadhook(pTHX);
 END_EXTERN_C
 
 #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT)
-STATIC I32	S_do_trans_simple(pTHX_ SV *sv)
+STATIC I32	S_do_trans_simple(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_do_trans_count(pTHX_ SV *sv)
+STATIC I32	S_do_trans_count(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_do_trans_complex(pTHX_ SV *sv)
+STATIC I32	S_do_trans_complex(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_do_trans_simple_utf8(pTHX_ SV *sv)
+STATIC I32	S_do_trans_simple_utf8(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_do_trans_count_utf8(pTHX_ SV *sv)
+STATIC I32	S_do_trans_count_utf8(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
-STATIC I32	S_do_trans_complex_utf8(pTHX_ SV *sv)
+STATIC I32	S_do_trans_complex_utf8(pTHX_ SV * const sv)
 			__attribute__warn_unused_result__
 			__attribute__nonnull__(pTHX_1);
 
@@ -3261,12 +3266,6 @@ STATIC void*	S_parse_body(pTHX_ char **env, XSINIT_t xsinit);
 STATIC void	S_run_body(pTHX_ I32 oldscope)
 			__attribute__noreturn__;
 
-STATIC void	S_call_body(pTHX_ const OP *myop, bool is_eval)
-			__attribute__nonnull__(pTHX_1);
-
-STATIC void*	S_call_list_body(pTHX_ CV *cv)
-			__attribute__nonnull__(pTHX_1);
-
 STATIC SV *	S_incpush_if_exists(pTHX_ SV *dir)
 			__attribute__nonnull__(pTHX_1);