From 7992d0fbcaa5fa185f465e434836d63c1da94ba9 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Sat, 11 Mar 2006 01:19:22 +0000
Subject: [PATCH] Remove a few places that attempted to define INT_MAX,
 SCHAR_MAX, and similar constants if they were not previously defined. All
 these constants must be defined by limits.h according to C89, so we can
 safely assume they are present.

---
 contrib/dblink/dblink.c          |  5 ++---
 src/backend/utils/adt/char.c     | 10 +---------
 src/backend/utils/adt/float.c    |  9 +--------
 src/backend/utils/adt/int.c      |  9 +--------
 src/backend/utils/adt/numutils.c | 22 +---------------------
 5 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index b1b863ea1e..22a3425ee7 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -31,6 +31,8 @@
  */
 #include "postgres.h"
 
+#include <limits.h>
+
 #include "libpq-fe.h"
 #include "fmgr.h"
 #include "funcapi.h"
@@ -1112,9 +1114,6 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
 }
 
 
-#ifndef SHRT_MAX
-#define SHRT_MAX (0x7FFF)
-#endif
 /*
  * dblink_build_sql_insert
  *
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 4390e838a5..db91bf1817 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/char.c,v 1.44 2006/03/05 15:58:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/char.c,v 1.45 2006/03/11 01:19:22 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,14 +20,6 @@
 #include "libpq/pqformat.h"
 #include "utils/builtins.h"
 
-#ifndef SCHAR_MAX
-#define SCHAR_MAX (0x7F)
-#endif
-#ifndef SCHAR_MIN
-#define SCHAR_MIN (-SCHAR_MAX-1)
-#endif
-
-
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
  *****************************************************************************/
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 29a2124e5f..3382b86ba0 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.122 2006/03/10 20:15:25 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.123 2006/03/11 01:19:22 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,13 +74,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-#ifndef SHRT_MAX
-#define SHRT_MAX 32767
-#endif
-#ifndef SHRT_MIN
-#define SHRT_MIN (-32768)
-#endif
-
 /* Recent HPUXen have isfinite() macro in place of more standard finite() */
 #if !defined(HAVE_FINITE) && defined(isfinite)
 #define finite(x) isfinite(x)
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 61e06ff884..de59276ecb 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.71 2006/03/05 15:58:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.72 2006/03/11 01:19:22 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,13 +40,6 @@
 #include "utils/builtins.h"
 
 
-#ifndef SHRT_MAX
-#define SHRT_MAX (0x7FFF)
-#endif
-#ifndef SHRT_MIN
-#define SHRT_MIN (-0x8000)
-#endif
-
 #define SAMESIGN(a,b)	(((a) < 0) == ((b) < 0))
 
 #define Int2VectorSize(n)	(offsetof(int2vector, values) + (n) * sizeof(int2))
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index ab06b76974..0317e63d08 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/numutils.c,v 1.73 2006/03/05 15:58:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/numutils.c,v 1.74 2006/03/11 01:19:22 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,26 +22,6 @@
 
 #include "utils/builtins.h"
 
-#ifndef INT_MAX
-#define INT_MAX (0x7FFFFFFFL)
-#endif
-#ifndef INT_MIN
-#define INT_MIN (-INT_MAX-1)
-#endif
-#ifndef SHRT_MAX
-#define SHRT_MAX (0x7FFF)
-#endif
-#ifndef SHRT_MIN
-#define SHRT_MIN (-SHRT_MAX-1)
-#endif
-#ifndef SCHAR_MAX
-#define SCHAR_MAX (0x7F)
-#endif
-#ifndef SCHAR_MIN
-#define SCHAR_MIN (-SCHAR_MAX-1)
-#endif
-
-
 /*
  * pg_atoi: convert string to integer
  *