X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=nostdio.h;h=d1d7374f8016db94d240d7dd2f11972f57af9e06;hb=e21694ed6c3a879be835a8269350acf67b5736f9;hp=ed51758e65d02b1b0d12b233ed37161e2d3f430e;hpb=eb1102fcca2230364ceadea29bd8e87ee51b15fa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/nostdio.h b/nostdio.h
index ed51758..d1d7374 100644
--- a/nostdio.h
+++ b/nostdio.h
@@ -1,6 +1,6 @@
 /*    nostdio.h
  *
- *    Copyright (c) 1987-2002, Larry Wall
+ *    Copyright (C) 1996, 2000, 2001, 2005, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -68,8 +68,10 @@ struct _FILE;
 #undef tmpfile
 #undef ungetc
 #undef vfprintf
+#undef printf
 
 #define fprintf    _CANNOT _fprintf_
+#define printf     _CANNOT _printf_
 #define stdin      _CANNOT _stdin_
 #define stdout     _CANNOT _stdout_
 #define stderr     _CANNOT _stderr_
@@ -109,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_