From cb292206c5c160cde6eb5618de64f810e62f378a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 12 Jul 2000 22:59:15 +0000
Subject: Remove a bunch of unused configure tests, in particular cases where *
 the result is not recorded anywhere * the result is not used anywhere * the
 result is only used in some places, whereas others have been getting away
 with it * the result is used improperly

Also make command line options handling a little better (e.g., --disable-locale,
while redundant, should really still *dis*able).
---
 src/backend/utils/adt/date.c      |  4 +---
 src/backend/utils/adt/datetime.c  | 12 +++++-------
 src/backend/utils/adt/float.c     |  8 +-------
 src/backend/utils/adt/int.c       |  7 ++-----
 src/backend/utils/adt/int8.c      |  9 +++------
 src/backend/utils/adt/nabstime.c  | 16 ++++------------
 src/backend/utils/adt/numutils.c  |  9 ++++-----
 src/backend/utils/adt/timestamp.c |  7 ++-----
 src/backend/utils/adt/varbit.c    | 16 +++++-----------
 9 files changed, 27 insertions(+), 61 deletions(-)

(limited to 'src/backend/utils/adt')

diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 952a8e6d4d..d003c4ee51 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.48 2000/06/19 03:54:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.49 2000/07/12 22:59:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,7 @@
 
 #include <limits.h>
 #include <time.h>
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
 
 #include "access/hash.h"
 #include "miscadmin.h"
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 229667e1b5..84ca139f10 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,22 +8,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.50 2000/06/14 18:17:42 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.51 2000/07/12 22:59:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <ctype.h>
 #include <math.h>
 #include <sys/types.h>
 #include <errno.h>
-
-#include "postgres.h"
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
-#ifdef HAVE_LIMITS_H
+
 #include <limits.h>
-#endif
+
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 0d53401c96..0b6a0db2ea 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.63 2000/07/06 05:48:11 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.64 2000/07/12 22:59:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,16 +53,10 @@
 
 #include "postgres.h"
 
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#ifndef MAXINT
-#define MAXINT		  INT_MAX
-#endif
-#else
 #ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
-#endif
 
 /* for finite() on Solaris */
 #ifdef HAVE_IEEEFP_H
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 7029ca73b8..bf7758c186 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.39 2000/07/03 23:09:52 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.40 2000/07/12 22:59:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,13 +27,10 @@
  *		 intmod, int4fac
  */
 
-#include <ctype.h>
-
 #include "postgres.h"
 
-#ifdef HAVE_LIMITS_H
+#include <ctype.h>
 #include <limits.h>
-#endif
 
 #include "utils/builtins.h"
 
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 63c0938461..773ec8b193 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -7,20 +7,17 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.22 2000/07/03 23:09:52 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.23 2000/07/12 22:59:09 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <ctype.h>
 #include <time.h>
 #include <math.h>
 #include <float.h>
-
-#include "postgres.h"
-
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif
 
 #include "utils/int8.h"
 
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 720517c953..2b5cd7d0bf 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -9,32 +9,24 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.71 2000/07/03 23:09:52 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.72 2000/07/12 22:59:09 petere Exp $
  *
  * NOTES
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <ctype.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
-
-#include "postgres.h"
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#ifndef MAXINT
-#define MAXINT INT_MAX
-#endif
-#else
+
 #ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
-#endif
 
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 681a78baa8..3d4956afe2 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -11,17 +11,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.40 2000/04/12 17:15:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.41 2000/07/12 22:59:09 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include <errno.h>
 #include <math.h>
-
-#include "postgres.h"
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif
+
 #include "utils/builtins.h"
 
 #ifndef INT_MAX
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index d5d5b86f9f..b4736dd6ae 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.32 2000/07/05 23:11:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.33 2000/07/12 22:59:09 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,12 +19,9 @@
 #include <math.h>
 #include <errno.h>
 #include <sys/types.h>
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif
+
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c
index b5d2e18e10..be1d5160f0 100644
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -4,33 +4,27 @@
  *	  Functions for the built-in type bit() and varying bit().
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.4 2000/07/03 23:09:53 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.5 2000/07/12 22:59:09 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include "postgres.h"
+
 /* Include file list stolen from float.c.
  * Can probably get rid of some of these.
  * - thomas 2000-04-07
  */
 #include <ctype.h>
 #include <errno.h>
-
 #include <float.h>				/* faked on sunos4 */
-
 #include <math.h>
-
-#include "postgres.h"
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#ifndef MAXINT
-#define MAXINT		  INT_MAX
-#endif
-#else
+
 #ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
-#endif
+
 #include "fmgr.h"
 #include "utils/builtins.h"
 #include "utils/varbit.h"
-- 
cgit v1.2.1