[Pspp-cvs] pspp/src/libpspp compiler.h ChangeLog

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/02/07 04:00:09

Modified files:
        src/libpspp    : compiler.h ChangeLog 

Log message:
        Use __printf__ instead of printf to avoid problem with "#define printf
        libintl_printf" that libintl is fond of doing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/compiler.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.50&r2=1.51

Patches:
Index: compiler.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/compiler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- compiler.h  15 Dec 2006 00:16:03 -0000      1.5
+++ compiler.h  7 Feb 2007 04:00:09 -0000       1.6
@@ -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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- ChangeLog   7 Feb 2007 03:47:57 -0000       1.50
+++ ChangeLog   7 Feb 2007 04:00:09 -0000       1.51
@@ -1,3 +1,10 @@
+Tue Feb  6 19:58:46 2007  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
 
        * float-format.h: [FPREP_IEEE754] [WORDS_BIGENDIAN] Add missing