From 73e69ca3599cd99c7ad689773ea6623354a1a0f6 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Sun, 16 Oct 2016 23:35:35 +0100 Subject: [PATCH] Rename fmt_compile.c's NEW macro to NEW_FP to avoid redefine. It grabs and fills in a pointer called `fp' so a more specific name seems OK. --- sbr/fmt_compile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index 5fd7fc96..e97447bd 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -299,7 +299,7 @@ static struct colormap colortable[] = { } while (0) #define NEWFMT (next_fp++) -#define NEW(type,fill,wid) do {\ +#define NEW_FP(type,fill,wid) do {\ fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \ } while (0) @@ -314,12 +314,12 @@ static struct colormap colortable[] = { cm->c_refcount++; \ } while (0) -#define LV(type, value) do { NEW(type,0,0); fp->f_value = (value); } while (0) -#define LS(type, str) do { NEW(type,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0) +#define LV(type, value) do { NEW_FP(type,0,0); fp->f_value = (value); } while (0) +#define LS(type, str) do { NEW_FP(type,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0) -#define PUTCOMP(comp) do { NEW(FT_COMP,0,0); ADDC(comp); } while (0) -#define PUTLIT(str) do { NEW(FT_LIT,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0) -#define PUTC(c) do { NEW(FT_CHAR,0,0); fp->f_char = (c); } while (0) +#define PUTCOMP(comp) do { NEW_FP(FT_COMP,0,0); ADDC(comp); } while (0) +#define PUTLIT(str) do { NEW_FP(FT_LIT,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0) +#define PUTC(c) do { NEW_FP(FT_CHAR,0,0); fp->f_char = (c); } while (0) static char *format_string; static char *usr_fstring; /* for CERROR */ -- 2.56.0