summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbfriesen <bfriesen>2012-02-18 16:20:01 +0000
committerbfriesen <bfriesen>2012-02-18 16:20:01 +0000
commit842e30e1f74717501bae20aaf4ee84034dea32ad (patch)
tree2b1e4142262c0bd658527cd84dca95ad83c3b5c0
parent8e2514b5442226f01b9ab489f1c35145af03806c (diff)
downloadlibtiff-842e30e1f74717501bae20aaf4ee84034dea32ad.tar.gz
* libtiff/tiffio.h: Use double-underbar syntax in GCC printf
attribute specification to lessen the risk of accidental macro substitution. Patch from Vincent Torri.
-rw-r--r--ChangeLog6
-rw-r--r--libtiff/tiffio.h10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6008fb1a..33a7099c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-18 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff/tiffio.h: Use double-underbar syntax in GCC printf
+ attribute specification to lessen the risk of accidental macro
+ substitution. Patch from Vincent Torri.
+
2012-01-23 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* configure.ac: Add support for using library symbol versioning on
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
index 06ec25c8..59475f63 100644
--- a/libtiff/tiffio.h
+++ b/libtiff/tiffio.h
@@ -1,4 +1,4 @@
-/* $Id: tiffio.h,v 1.56.2.4 2010-06-08 18:50:43 bfriesen Exp $ */
+/* $Id: tiffio.h,v 1.56.2.5 2012-02-18 16:20:02 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -437,10 +437,10 @@ extern TIFF* TIFFClientOpen(const char*, const char*,
TIFFMapFileProc, TIFFUnmapFileProc);
extern const char* TIFFFileName(TIFF*);
extern const char* TIFFSetFileName(TIFF*, const char *);
-extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3)));
-extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4)));
-extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3)));
-extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4)));
+extern void TIFFError(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
+extern void TIFFWarning(const char*, const char*, ...) __attribute__((__format__ (__printf__,2,3)));
+extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((__format__ (__printf__,3,4)));
extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);