From 82766ccd31c9a38b01e0f24f4290d9758b20d015 Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <dron@ak4719.spb.edu>
Date: Fri, 26 Mar 2004 14:57:52 +0000
Subject: [PATCH] *** empty log message ***

---
 libtiff/tiffcomp.h | 17 +--------------
 libtiff/tiffconf.h |  8 +------
 libtiff/tiffiop.h  | 54 +++++++++++++++++++++++++++-------------------
 3 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/libtiff/tiffcomp.h b/libtiff/tiffcomp.h
index 5b8c0347..3b622bf8 100644
--- a/libtiff/tiffcomp.h
+++ b/libtiff/tiffcomp.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.5 2004-03-19 17:36:53 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.6 2004-03-26 14:58:17 dron Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
@@ -143,21 +143,6 @@ typedef extended dblparam_t;
 typedef double dblparam_t;
 #endif
 
-/*
- * If your compiler supports inline functions, then
- * set INLINE appropriately to get the known hotspots
- * in the library expanded inline.
- */
-#if defined(__GNUC__)
-#if defined(__STRICT_ANSI__)
-#define	INLINE	__inline__
-#else
-#define	INLINE	inline
-#endif
-#else /* !__GNUC__ */
-#define	INLINE
-#endif
-
 /*
  * GLOBALDATA is a macro that is used to define global variables
  * private to the library.  We use this indirection to hide
diff --git a/libtiff/tiffconf.h b/libtiff/tiffconf.h
index 6c45b978..083239a8 100644
--- a/libtiff/tiffconf.h
+++ b/libtiff/tiffconf.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.9 2004-03-19 17:36:53 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.10 2004-03-26 14:57:52 dron Exp $ */
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
@@ -48,9 +48,6 @@
  * HOST_FILLORDER	native cpu bit order: one of FILLORDER_MSB2LSB
  *			or FILLODER_LSB2MSB; this is typically set by the
  *			configure script
- * WORDS_BIGENDIAN	native cpu byte order: 1 if big-endian (Motorola)
- *			or 0 if little-endian (Intel); this may be used
- *			in codecs to optimize code
  * USE_64BIT_API	set to 1 if tif_unix.c should use lseek64(),
  *                      fstat64() and stat64 allowing 2-4GB files.
  */
@@ -60,9 +57,6 @@
 #ifndef HOST_FILLORDER
 #define	HOST_FILLORDER	FILLORDER_MSB2LSB
 #endif
-#ifndef	WORDS_BIGENDIAN
-#define	WORDS_BIGENDIAN	1
-#endif
 
 #ifndef USE_64BIT_API
 #  define USE_64BIT_API	0
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index bf8fcff0..4ca1b2c1 100644
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v 1.12 2004-03-19 17:37:18 dron Exp $ */
+/* $Id: tiffiop.h,v 1.13 2004-03-26 14:58:44 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -30,37 +30,47 @@
  * ``Library-private'' definitions.
  */
 
-#include <sys/types.h>
-#define HOST_FILLORDER FILLORDER_MSB2LSB
-#define WORDS_BIGENDIAN	0
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-typedef double dblparam_t;
-#ifdef __STRICT_ANSI__
-#define	INLINE	__inline__
-#else
-#define	INLINE	inline
-#endif
-#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME
-
 /*
  * UNIX systems should run the configure script to generate
  * a port.h file that reflects the system capabilities.
  * Doing this obviates all the dreck done in tiffcomp.h.
  */
-#if defined(unix) || defined(__unix)
-#include "config.h"
-#include "tiffconf.h"
+#if defined(_MSC_VER)
+# include "config.h.vc"
+# include "tiffconf.h"
+# include "tiffcomp.h"
 #else
-#include "tiffconf.h"
-#include "tiffcomp.h"
+# include "config.h"
+# include "tiffconf.h"
 #endif
+
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 #include "tiffio.h"
 #include "tif_dir.h"
 
+#define HOST_FILLORDER FILLORDER_MSB2LSB
+
+typedef double dblparam_t;
+/*
+ * If your compiler supports inline functions, then
+ * set INLINE appropriately to get the known hotspots
+ * in the library expanded inline.
+ */
+#if defined(__GNUC__)
+# ifdef __STRICT_ANSI__
+#  define	INLINE	__inline__
+# else
+#  define	INLINE	inline
+# endif
+#else
+# define INLINE
+#endif
+
+#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME
+
 #ifndef TRUE
 #define	TRUE	1
 #define	FALSE	0