Remove two warnings (sub diag() was redefined, and implict split is

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

diff --git a/proto.h b/proto.h
index 7adaac7..aa4d42a 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -189,6 +189,14 @@ PERL_CALLCONV void Perl_av_unshift(pTHX_ AV* ar, I32 num)
 PERL_CALLCONV SV**     Perl_av_arylen_p(pTHX_ AV* av)
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV I32*     Perl_av_iter_p(pTHX_ AV* av)
+                       __attribute__nonnull__(pTHX_1);
+
+#if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
+STATIC MAGIC*  S_get_aux_mg(pTHX_ AV *av)
+                       __attribute__nonnull__(pTHX_1);
+
+#endif
 PERL_CALLCONV OP*      Perl_bind_match(pTHX_ I32 type, OP* left, OP* pat)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_2)
@@ -1218,10 +1226,6 @@ PERL_CALLCONV int        Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV int      Perl_magic_setglob(pTHX_ SV* sv, MAGIC* mg)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
-
 PERL_CALLCONV int      Perl_magic_setmglob(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
@@ -1506,9 +1510,8 @@ PERL_CALLCONV CV* Perl_newXS(pTHX_ const char* name, XSUBADDR_t f, const char* f
                        __attribute__nonnull__(pTHX_2)
                        __attribute__nonnull__(pTHX_3);
 
-PERL_CALLCONV AV*      Perl_newAV(pTHX)
-                       __attribute__malloc__
-                       __attribute__warn_unused_result__;
+/* PERL_CALLCONV AV*   Perl_newAV(pTHX)
+                       __attribute__warn_unused_result__; */
 
 PERL_CALLCONV OP*      Perl_newAVREF(pTHX_ OP* o)
                        __attribute__malloc__
@@ -1542,9 +1545,8 @@ PERL_CALLCONV OP* Perl_newHVREF(pTHX_ OP* o)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV HV*      Perl_newHV(pTHX)
-                       __attribute__malloc__
-                       __attribute__warn_unused_result__;
+/* PERL_CALLCONV HV*   Perl_newHV(pTHX)
+                       __attribute__warn_unused_result__; */
 
 PERL_CALLCONV HV*      Perl_newHVhv(pTHX_ HV* hv)
                        __attribute__malloc__
@@ -2179,6 +2181,9 @@ PERL_CALLCONV SV* Perl_sv_2mortal(pTHX_ SV* sv);
 PERL_CALLCONV NV       Perl_sv_2nv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV SV*      Perl_sv_2num(pTHX_ SV* sv)
+                       __attribute__nonnull__(pTHX_1);
+
 /* PERL_CALLCONV char* Perl_sv_2pv(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1); */
 
@@ -2969,6 +2974,7 @@ PERL_CALLCONV const char *        Perl_custom_op_desc(pTHX_ const OP* op)
 
 PERL_CALLCONV void     Perl_sv_nosharing(pTHX_ SV *sv);
 /* PERL_CALLCONV void  Perl_sv_nolocking(pTHX_ SV *sv); */
+PERL_CALLCONV bool     Perl_sv_destroyable(pTHX_ SV *sv);
 #ifdef NO_MATHOMS
 /* PERL_CALLCONV void  Perl_sv_nounlocking(pTHX_ SV *sv); */
 #else
@@ -3260,6 +3266,10 @@ PERL_CALLCONV OP*        Perl_ck_unpack(pTHX_ OP *o)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV OP*      Perl_ck_each(pTHX_ OP *o)
+                       __attribute__warn_unused_result__
+                       __attribute__nonnull__(pTHX_1);
+
 STATIC bool    S_is_handle_constructor(const OP *o, I32 numargs)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(1);
@@ -4707,7 +4717,7 @@ PERL_CALLCONV void        Perl_sys_init3(int* argc, char*** argv, char*** env)
                        __attribute__nonnull__(2)
                        __attribute__nonnull__(3);
 
-PERL_CALLCONV void     Perl_sys_term(pTHX);
+PERL_CALLCONV void     Perl_sys_term(void);
 
 
 END_EXTERN_C