From 95242031c6ef4f2b64436017c883ed3d20d0a850 Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <dron@ak4719.spb.edu>
Date: Sat, 3 Jul 2004 16:04:01 +0000
Subject: [PATCH] Avoid warnings.

---
 libtiff/mkg3states.c |  8 +++++++-
 tools/bmp2tiff.c     |  7 +++++--
 tools/fax2ps.c       | 14 +++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c
index 91cdf7f3..cceb254c 100644
--- a/libtiff/mkg3states.c
+++ b/libtiff/mkg3states.c
@@ -1,4 +1,4 @@
-/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/mkg3states.c,v 1.3 2004-04-08 14:30:51 dron Exp $ */
+/* "$Id: mkg3states.c,v 1.4 2004-07-03 16:05:40 dron Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -29,10 +29,16 @@
  * in Frank Cringle's viewfax program;
  *      Copyright (C) 1990, 1995  Frank D. Cringle.
  */
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+
 #include "tif_fax3.h"
 
 #define	streq(a,b)	(strcmp(a,b) == 0)
diff --git a/tools/bmp2tiff.c b/tools/bmp2tiff.c
index d3d30165..71a42b5d 100644
--- a/tools/bmp2tiff.c
+++ b/tools/bmp2tiff.c
@@ -1,4 +1,4 @@
-/* $Id: bmp2tiff.c,v 1.2 2004-06-14 15:10:10 dron Exp $
+/* $Id: bmp2tiff.c,v 1.3 2004-07-03 16:04:01 dron Exp $
  *
  * Project:  libtiff tools
  * Purpose:  Convert Windows BMP files in TIFF.
@@ -32,11 +32,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#if HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+
 #include "tiffio.h"
 
 enum BMPType
diff --git a/tools/fax2ps.c b/tools/fax2ps.c
index ee7e81cb..7d9951ae 100644
--- a/tools/fax2ps.c
+++ b/tools/fax2ps.c
@@ -1,4 +1,4 @@
-/* $Id: fax2ps.c,v 1.12 2004-06-05 08:13:06 dron Exp $" */
+/* $Id: fax2ps.c,v 1.13 2004-07-03 16:04:01 dron Exp $" */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -25,16 +25,24 @@
  */
 #include "config.h"
 
-#include <math.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include <math.h>
 #include <time.h>
 
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #if HAVE_IO_H
 # include <io.h>
 #endif
 
+#if HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+
 #include "tiffio.h"
 
 float	defxres = 204.;		/* default x resolution (pixels/inch) */