(PerlIO::)scalar.t: Add function for testing trailing null

[perl5.git] / nostdio.h

diff --git a/nostdio.h b/nostdio.h
index ed51758..f6a13b4 100644 (file)
--- 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_
@@ -122,3 +124,13 @@ struct _FILE;
 #ifndef OS2
 #define pclose(f)  _CANNOT _pclose_
 #endif
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */