diff options
author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2003-01-20 15:09:08 +0000 |
---|---|---|
committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2003-01-20 15:09:08 +0000 |
commit | f2b1176c042dd0d792a0f916f759bd848210d4d8 (patch) | |
tree | fb7bca914e5dba8507fc44fd26d061bbdd2620bf | |
parent | a211c3f8af40d0495c2f1a036a923353d5ad7a30 (diff) | |
download | perl-f2b1176c042dd0d792a0f916f759bd848210d4d8.tar.gz |
Move #define printf out of perl.h into appropriate
PerlIO files.
p4raw-id: //depot/perlio@18520
-rw-r--r-- | fakesdio.h | 12 | ||||
-rw-r--r-- | nostdio.h | 2 | ||||
-rw-r--r-- | perl.h | 11 |
3 files changed, 14 insertions, 11 deletions
diff --git a/fakesdio.h b/fakesdio.h index 8ef89e9ca5..8be514f180 100644 --- a/fakesdio.h +++ b/fakesdio.h @@ -55,6 +55,18 @@ #undef tmpfile #undef ungetc #undef vfprintf +#undef printf + +/* printf used to live in perl.h like this - more sophisticated + than the rest + */ +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC) +#define printf(fmt,args...) PerlIO_stdoutf(fmt,##args) +#else +#define printf PerlIO_stdoutf +#endif +#endif + #define fprintf PerlIO_printf #define stdin PerlIO_stdin() #define stdout PerlIO_stdout() @@ -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_ @@ -3820,17 +3820,6 @@ typedef struct am_table_short AMTS; # define Atoul(s) Strtoul(s, (char **)NULL, 10) #endif -#if !defined(PERLIO_IS_STDIO) -/* - * Remap printf - */ -#undef printf -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC) -#define printf(fmt,args...) PerlIO_stdoutf(fmt,##args) -#else -#define printf PerlIO_stdoutf -#endif -#endif /* if these never got defined, they need defaults */ #ifndef PERL_SET_CONTEXT |