From db5b8878242d3db8a6e8c3cbf9d6a36b38e4f438 Mon Sep 17 00:00:00 2001 From: axel Date: Tue, 4 Apr 2006 01:04:22 +1000 Subject: [PATCH] PPC fix by James Vega, fixing an issue with a variable named putc, which clashed with the putc macro darcs-hash:20060403150422-ac50b-78d5db541cb1f41bfea55deac7578c0df73605bd.gz --- fallback.c | 6 +++--- fallback.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fallback.c b/fallback.c index ee74a6ed3..6f0327d6f 100644 --- a/fallback.c +++ b/fallback.c @@ -38,17 +38,17 @@ #include #endif -#include "common.h" +#include "fallback.h" #include "util.h" #ifdef TPUTS_KLUDGE -int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t)) +int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t)) { while( *str ) { - putc( *str++ ); + fish_putc( *str++ ); } } diff --git a/fallback.h b/fallback.h index b3be9d905..e42bbbd4e 100644 --- a/fallback.h +++ b/fallback.h @@ -27,7 +27,7 @@ typedef char tputs_arg_t; Linux on PPC seems to have a tputs implementation that sometimes behaves strangely. This fallback seems to fix things. */ -int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t)); +int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t)); #endif