2 files changed, 3 insertions, 1 deletions
diff --git a/nostdio.h b/nostdio.h
index f51cb2014d..8aaa9503f6 100644
--- a/nostdio.h
+++ b/nostdio.h
@@ -111,7 +111,7 @@ struct _FILE;
 #define _flsbuf(c,f)  _CANNOT _flsbuf_
 #define fdopen(fd,p)  _CANNOT _fdopen_
 #define fileno(f)  _CANNOT _fileno_
-#if SFIO_VERSION < 20000101L
+#if defined(SFIO_VERSION) && SFIO_VERSION < 20000101L
 #define flockfile(f)  _CANNOT _flockfile_
 #define ftrylockfile(f)  _CANNOT _ftrylockfile_
 #define funlockfile(f)  _CANNOT _funlockfile_
diff --git a/perl.c b/perl.c
index 3ff4a80eec..188e193f41 100644
--- a/perl.c
+++ b/perl.c
@@ -2238,8 +2238,10 @@ S_run_body(pTHX_ I32 oldscope)
 
     if (!PL_restartop) {
 	DEBUG_x(dump_all());
+#ifdef DEBUGGING
 	if (!DEBUG_q_TEST)
 	  PERL_DEBUG(PerlIO_printf(Perl_debug_log, "\nEXECUTING...\n\n"));
+#endif
 	DEBUG_S(PerlIO_printf(Perl_debug_log, "main thread is 0x%"UVxf"\n",
 			      PTR2UV(thr)));