4 files changed, 4 insertions, 8 deletions
diff --git a/dump.c b/dump.c
index b9bf09910b..ced9d3a480 100644
--- a/dump.c
+++ b/dump.c
@@ -617,7 +617,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, OP *o)
     case OP_GVSV:
     case OP_GV:
 #ifdef USE_ITHREADS
-	Perl_dump_indent(aTHX_ level, file, "PADIX = %d\n", cPADOPo->op_padix);
+	Perl_dump_indent(aTHX_ level, file, "PADIX = %" IVdf "\n", (IV)cPADOPo->op_padix);
 #else
 	if (cSVOPo->op_sv) {
 	    SV *tmpsv = NEWSV(0,0);
diff --git a/embed.fnc b/embed.fnc
index 45c9d9684a..913c718536 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -562,7 +562,7 @@ Ap	|struct perl_thread*	|new_struct_thread|struct perl_thread *t
 Ap	|void	|reentrant_size
 Ap	|void	|reentrant_init
 Ap	|void	|reentrant_free
-Afnp	|void*	|reentrant_retry|const char*|...
+Anp	|void*	|reentrant_retry|const char*|...
 #endif
 Ap	|void	|call_atexit	|ATEXIT_t fn|void *ptr
 Apd	|I32	|call_argv	|const char* sub_name|I32 flags|char** argv
diff --git a/proto.h b/proto.h
index 3dc7e7a82c..1cd5a4a6b0 100644
--- a/proto.h
+++ b/proto.h
@@ -602,11 +602,7 @@ PERL_CALLCONV struct perl_thread*	Perl_new_struct_thread(pTHX_ struct perl_threa
 PERL_CALLCONV void	Perl_reentrant_size(pTHX);
 PERL_CALLCONV void	Perl_reentrant_init(pTHX);
 PERL_CALLCONV void	Perl_reentrant_free(pTHX);
-PERL_CALLCONV void*	Perl_reentrant_retry(const char*, ...)
-#ifdef CHECK_FORMAT
- __attribute__((format(printf,1,2)))
-#endif
-;
+PERL_CALLCONV void*	Perl_reentrant_retry(const char*, ...);
 #endif
 PERL_CALLCONV void	Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr);
 PERL_CALLCONV I32	Perl_call_argv(pTHX_ const char* sub_name, I32 flags, char** argv);
diff --git a/sv.c b/sv.c
index 677b535c05..609142f8fa 100644
--- a/sv.c
+++ b/sv.c
@@ -9389,7 +9389,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param)
 	CvFILE(dstr) = CvXSUB(sstr) ? CvFILE(sstr) : SAVEPV(CvFILE(sstr));
 	break;
     default:
-	Perl_croak(aTHX_ "Bizarre SvTYPE [%d]", SvTYPE(sstr));
+	Perl_croak(aTHX_ "Bizarre SvTYPE [%" IVdf "]", (IV)SvTYPE(sstr));
 	break;
     }