Fix failing Time-Piece tests on Win32

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

diff --git a/proto.h b/proto.h
index 24665c0..520b6fa 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -4028,7 +4028,6 @@ PERL_CALLCONV OP *        Perl_my_attrs(pTHX_ OP *o, OP *attrs)
 #define PERL_ARGS_ASSERT_MY_ATTRS      \
        assert(o)
 
-PERL_CALLCONV void     Perl_boot_core_xsutils(pTHX);
 #if defined(USE_ITHREADS)
 PERL_CALLCONV PERL_CONTEXT*    Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, CLONE_PARAMS* param)
                        __attribute__warn_unused_result__
@@ -4759,7 +4758,11 @@ STATIC void      S_find_beginning(pTHX_ SV* linestr_sv, PerlIO *rsfp)
        assert(linestr_sv); assert(rsfp)
 
 STATIC void    S_forbid_setid(pTHX_ const char flag, const bool suidscript);
-STATIC void    S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags);
+STATIC void    S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
+                       __attribute__nonnull__(pTHX_1);
+#define PERL_ARGS_ASSERT_INCPUSH       \
+       assert(dir)
+
 STATIC void    S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_INCPUSH_USE_SEP       \
@@ -4768,7 +4771,7 @@ STATIC void       S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags)
 STATIC void    S_init_interp(pTHX);
 STATIC void    S_init_ids(pTHX);
 STATIC void    S_init_main_stash(pTHX);
-STATIC void    S_init_perllib(pTHX_ U32 old_vers);
+STATIC void    S_init_perllib(pTHX);
 STATIC void    S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env)
                        __attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_INIT_POSTDUMP_SYMBOLS \
@@ -4803,11 +4806,12 @@ STATIC void*    S_parse_body(pTHX_ char **env, XSINIT_t xsinit);
 STATIC void    S_run_body(pTHX_ I32 oldscope)
                        __attribute__noreturn__;
 
-STATIC SV *    S_incpush_if_exists(pTHX_ AV *const av, SV *dir)
+STATIC SV *    S_incpush_if_exists(pTHX_ AV *const av, SV *dir, SV *const stem)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_2)
+                       __attribute__nonnull__(pTHX_3);
 #define PERL_ARGS_ASSERT_INCPUSH_IF_EXISTS     \
-       assert(av); assert(dir)
+       assert(av); assert(dir); assert(stem)
 
 #endif
 
@@ -5963,10 +5967,9 @@ PERL_CALLCONV int        Perl_my_socketpair(int family, int type, int protocol, int fd[
 PERL_CALLCONV int      Perl_my_dirfd(pTHX_ DIR* dir);
 #ifdef PERL_OLD_COPY_ON_WRITE
 PERL_CALLCONV SV*      Perl_sv_setsv_cow(pTHX_ SV* dstr, SV* sstr)
-                       __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_SV_SETSV_COW  \
-       assert(dstr); assert(sstr)
+       assert(sstr)
 
 #endif