diff options
| -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 |