diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 03:02:54 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 03:02:54 +0000 |
commit | ba0a2090f574df90404f8a0bbe689389ce0ebcab (patch) | |
tree | 53f8d0ad53e5fc0f05d68a0073273080ef5bd392 /gnu/usr.bin/perl/nostdio.h | |
parent | 0121b80e4f69c2ad9631e8d20b5c91f3b2a40434 (diff) |
Resolve conflicts for perl 5.8.2, remove old files, and add OpenBSD-specific scaffolding
Diffstat (limited to 'gnu/usr.bin/perl/nostdio.h')
-rw-r--r-- | gnu/usr.bin/perl/nostdio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/usr.bin/perl/nostdio.h b/gnu/usr.bin/perl/nostdio.h index ed51758e65d..f51cb2014de 100644 --- a/gnu/usr.bin/perl/nostdio.h +++ b/gnu/usr.bin/perl/nostdio.h @@ -1,6 +1,6 @@ /* nostdio.h * - * Copyright (c) 1987-2002, Larry Wall + * Copyright (C) 1996, 2000, 2001, 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_ |