From a8829183f1513fb3f46e20da458a51175bb4abf8 Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
Date: Fri, 15 Oct 2004 14:49:43 +0000
Subject: [PATCH] * 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.

---
 ChangeLog          | 7 +++++++
 libtiff/tif_jpeg.c | 3 +--
 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);