summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Friesenhahn <bfriesen@simple.dallas.tx.us>2004-10-15 14:49:43 +0000
committerBob Friesenhahn <bfriesen@simple.dallas.tx.us>2004-10-15 14:49:43 +0000
commita8829183f1513fb3f46e20da458a51175bb4abf8 (patch)
treefdf49514eeb6f121d3066eb9b817b4f32ced460c
parent542625aabead1dcc44356600443550bb07efc382 (diff)
downloadlibtiff-git-a8829183f1513fb3f46e20da458a51175bb4abf8.tar.gz
* libtiff/tif_jpeg.c: There seems to be no need to include stdio.h
in this file so its inclusion is removed. Including stdio.h sometimes incurs an INT32 typedef conflict between MinGW's basetsd.h and libjpeg's jmorecfg.h.
-rw-r--r--ChangeLog7
-rw-r--r--libtiff/tif_jpeg.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c7d970c4..5e3676d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-15 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff/tif_jpeg.c: There seems to be no need to include stdio.h
+ in this file so its inclusion is removed. Including stdio.h
+ sometimes incurs an INT32 typedef conflict between MinGW's
+ basetsd.h and libjpeg's jmorecfg.h.
+
2004-10-15 Andrey Kiselev <dron@remotesensing.org>
* man/bmp2tiff.1: Added manual page for bmp2tiff utility.
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 405d2841..789e6627 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_jpeg.c,v 1.24 2004-10-12 18:50:48 dron Exp $ */
+/* $Id: tif_jpeg.c,v 1.25 2004-10-15 14:49:44 bfriesen Exp $ */
/*
* Copyright (c) 1994-1997 Sam Leffler
@@ -38,7 +38,6 @@
*
* Contributed by Tom Lane <tgl@sss.pgh.pa.us>.
*/
-#include <stdio.h>
#include <setjmp.h>
int TIFFFillStrip(TIFF*, tstrip_t);