Use __printf__ instead of printf to avoid problem with "#define printf

libintl_printf" that libintl is fond of doing.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index fb6731ed8817abb2f1d3f18d87a0c6644aad0e71..5fcc9df9bad03d0e807ea48854cc1b2a85b123ed 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb  6 19:58:46 2007  Ben Pfaff  <blp@gnu.org>
+
+       * 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  <blp@gnu.org>
 
        * float-format.h: [FPREP_IEEE754] [WORDS_BIGENDIAN] Add missing

diff --git a/src/libpspp/compiler.h b/src/libpspp/compiler.h
index c99220ee748f443ee2f8ba1d15ef09d2a56352dd..a53b44d7161775cc34b5628edf6dcff7b5403745 100644 (file)
--- 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