From 785843bd90e3a261e8956d4881519de8ce7a942e Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
Date: Tue, 26 Jun 2007 15:39:51 +0000
Subject: [PATCH] * configure.ac: Fix typo when substituting value for unsigned
 8 bit type. * libtiff/tiffconf.vc.h: Add porting type defintions for WIN32.

---
 ChangeLog                     |  5 +++++
 build/Makefile.in             |  2 +-
 configure                     |  4 ++--
 configure.ac                  |  2 +-
 contrib/dbs/xtiff/Makefile.in |  2 +-
 html/Makefile.in              |  2 +-
 libtiff/tiffconf.vc.h         | 24 ++++++++++++++++++++++++
 7 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8669bc6a..29a3be41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-26  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* configure.ac: Fix typo when substituting value for unsigned 8 bit type.
+	* libtiff/tiffconf.vc.h: Add porting type defintions for WIN32.
+
 2007-06-25  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* port/strtoull.c: New porting function in case strtoull() is not
diff --git a/build/Makefile.in b/build/Makefile.in
index 4ea7a34b..f66619b0 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.2 2007-06-25 15:38:23 bfriesen Exp $
+# $Id: Makefile.in,v 1.3 2007-06-26 15:39:54 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/configure b/configure
index 376f8c82..2b5e21b9 100755
--- a/configure
+++ b/configure
@@ -4418,7 +4418,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 macro_version='2.1a'
-macro_revision='1.2455'
+macro_revision='1.2410'
 
 
 
@@ -16314,7 +16314,7 @@ UINT8_T='unsigned char'
 echo "${ECHO_T}$UINT8_T" >&6; }
 
 cat >>confdefs.h <<_ACEOF
-#define TIFF_UINT8_T $INT8_T
+#define TIFF_UINT8_T $UINT8_T
 _ACEOF
 
 
diff --git a/configure.ac b/configure.ac
index 18e3cf55..3c4861c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,7 @@ AC_DEFINE_UNQUOTED(TIFF_INT8_T,$INT8_T,[Signed 8-bit type])
 AC_MSG_CHECKING(for unsigned 8-bit type)
 UINT8_T='unsigned char'
 AC_MSG_RESULT($UINT8_T)
-AC_DEFINE_UNQUOTED(TIFF_UINT8_T,$INT8_T,[Unsigned 8-bit type])
+AC_DEFINE_UNQUOTED(TIFF_UINT8_T,$UINT8_T,[Unsigned 8-bit type])
 
 AC_MSG_CHECKING(for signed 16-bit type)
 INT16_T='signed short'
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index ed54b586..c2541cb5 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.37 2007-06-25 15:38:24 bfriesen Exp $
+# $Id: Makefile.in,v 1.38 2007-06-26 15:39:54 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/html/Makefile.in b/html/Makefile.in
index d75e4226..a1d0590d 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.50 2007-06-25 15:38:25 bfriesen Exp $
+# $Id: Makefile.in,v 1.51 2007-06-26 15:39:54 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/libtiff/tiffconf.vc.h b/libtiff/tiffconf.vc.h
index 18c0a1b3..08ede038 100644
--- a/libtiff/tiffconf.vc.h
+++ b/libtiff/tiffconf.vc.h
@@ -22,6 +22,30 @@
 /* The size of a `long', as computed by sizeof. */
 #define SIZEOF_LONG 4
 
+/* Signed 8-bit type */
+#define TIFF_INT8_T signed char
+
+/* Unsigned 8-bit type */
+#define TIFF_UINT8_T unsigned char
+
+/* Signed 16-bit type */
+#define TIFF_INT16_T signed short
+
+/* Unsigned 16-bit type */
+#define TIFF_UINT16_T unsigned short
+
+/* Signed 32-bit type */
+#define TIFF_INT32_T signed int
+
+/* Unsigned 32-bit type */
+#define TIFF_UINT32_T unsigned int
+
+/* Signed 64-bit type */
+#define TIFF_INT64_T signed __int64
+
+/* Unsigned 64-bit type */
+#define TIFF_UINT64_T unsigned __int64
+
 /* Compatibility stuff. */
 
 /* Define as 0 or 1 according to the floating point format suported by the