From b5a94c85822eb737da0bb01b94be0531a3e9bbb7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 7 Feb 2007 04:00:09 +0000 Subject: [PATCH] Use __printf__ instead of printf to avoid problem with "#define printf libintl_printf" that libintl is fond of doing. --- src/libpspp/ChangeLog | 7 +++++++ src/libpspp/compiler.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog index fb6731ed..5fcc9df9 100644 --- a/src/libpspp/ChangeLog +++ b/src/libpspp/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 6 19:58:46 2007 Ben Pfaff + + * compiler.h (PRINTF_FORMAT): Use __printf__ instead of printf to + avoid problem with "#define printf libintl_printf" that libintl is + fond of doing. + (SCANF_FORMAT): Ditto, for symmetry only. + Tue Feb 6 19:47:10 2007 Ben Pfaff * float-format.h: [FPREP_IEEE754] [WORDS_BIGENDIAN] Add missing diff --git a/src/libpspp/compiler.h b/src/libpspp/compiler.h index c99220ee..a53b44d7 100644 --- a/src/libpspp/compiler.h +++ b/src/libpspp/compiler.h @@ -40,8 +40,8 @@ /* Mark a function as taking a printf- or scanf-like format string as its FMT'th argument and that the FIRST'th argument is the first one to be checked against the format string. */ -#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (printf, FMT, FIRST))) -#define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (scanf, FMT, FIRST))) +#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (__printf__, FMT, FIRST))) +#define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (__scanf__, FMT, FIRST))) /* Tells the compiler that a function may be treated as if any non-`NULL' pointer it returns cannot alias any other pointer -- 2.30.2