From 87cdaf5491ea6d9e2701bb2b557d64c80c7de4e0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 28 Jul 2000 02:13:52 +0000
Subject: [PATCH] Remove <values.h> inclusions, no-longer-needed MAXINT
definitions.
---
configure | 4 ++--
configure.in | 2 +-
contrib/odbc/odbc.c | 10 ----------
src/backend/optimizer/geqo/geqo_eval.c | 5 +----
src/backend/postmaster/postmaster.c | 9 ++-------
src/backend/utils/adt/float.c | 5 +----
src/backend/utils/adt/nabstime.c | 6 +-----
src/backend/utils/adt/varbit.c | 6 +-----
src/include/config.h.in | 5 +----
src/include/utils/varbit.h | 7 ++-----
10 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/configure b/configure
index 2234d9f0636..9cb12f30631 100755
--- a/configure
+++ b/configure
@@ -2285,7 +2285,7 @@ mkinstalldirs="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs"
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4018,7 +4018,7 @@ fi
##
## Header files
##
-for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/pstat.h sys/select.h sys/socket.h sys/types.h termios.h values.h
+for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/pstat.h sys/select.h sys/socket.h sys/types.h termios.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index 1e125a1bbc8..6078b525c05 100644
--- a/configure.in
+++ b/configure.in
@@ -796,7 +796,7 @@ fi
## Header files
##
dnl sys/socket.h and sys/types.h are required by AC_FUNC_ACCEPT_ARGTYPES
-AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/pstat.h sys/select.h sys/socket.h sys/types.h termios.h values.h])
+AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/pstat.h sys/select.h sys/socket.h sys/types.h termios.h])
AC_CHECK_HEADERS([readline/readline.h readline.h], [break])
AC_CHECK_HEADERS([readline/history.h history.h], [break])
diff --git a/contrib/odbc/odbc.c b/contrib/odbc/odbc.c
index efc1fa21df0..2a134ee488b 100644
--- a/contrib/odbc/odbc.c
+++ b/contrib/odbc/odbc.c
@@ -3,19 +3,9 @@
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
-
#include <float.h> /* faked on sunos4 */
-
#include <math.h>
-
#include <limits.h>
-#ifndef MAXINT
-#define MAXINT INT_MAX
-#endif
-
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
#include "fmgr.h"
#include "utils/timestamp.h"
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 269d45f1f28..7b9542cb1b2 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_eval.c,v 1.52 2000/07/12 22:59:01 petere Exp $
+ * $Id: geqo_eval.c,v 1.53 2000/07/28 02:13:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,9 +23,6 @@
#include <math.h>
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
#include "optimizer/geqo.h"
#include "optimizer/pathnode.h"
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 30023453367..629ab48e8c0 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.157 2000/07/17 03:05:04 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.158 2000/07/28 02:13:26 tgl Exp $
*
* NOTES
*
@@ -48,14 +48,9 @@
#include <fcntl.h>
#include <time.h>
#include <sys/param.h>
-
- /* moved here to prevent double define */
+/* moved here to prevent double define */
#include <netdb.h>
-
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index bfa439f4156..940724ab05f 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.65 2000/07/17 03:05:17 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.66 2000/07/28 02:13:31 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -54,9 +54,6 @@
#include "postgres.h"
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
/* for finite() on Solaris */
#ifdef HAVE_IEEEFP_H
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 2b5cd7d0bfd..dee675f8300 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.72 2000/07/12 22:59:09 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.73 2000/07/28 02:13:31 tgl Exp $
*
* NOTES
*
@@ -24,10 +24,6 @@
#include <float.h>
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.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 be1d5160f0f..b238bce5312 100644
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -4,7 +4,7 @@
* Functions for the built-in type bit() and varying bit().
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.5 2000/07/12 22:59:09 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.6 2000/07/28 02:13:31 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,10 +21,6 @@
#include <math.h>
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
-
#include "fmgr.h"
#include "utils/builtins.h"
#include "utils/varbit.h"
diff --git a/src/include/config.h.in b/src/include/config.h.in
index e6c23e48758..7e5413994f8 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure.
*
- * $Id: config.h.in,v 1.127 2000/07/14 16:39:35 petere Exp $
+ * $Id: config.h.in,v 1.128 2000/07/28 02:13:40 tgl Exp $
*/
#ifndef CONFIG_H
@@ -327,9 +327,6 @@
/* Set to 1 if you have <termios.h> */
#undef HAVE_TERMIOS_H
-/* Set to 1 if you have <values.h> */
-#undef HAVE_VALUES_H
-
/* Set to 1 if you have <sys/pstat.h> */
#undef HAVE_SYS_PSTAT_H
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
index 5961bb80a5a..172cb4c6c4d 100644
--- a/src/include/utils/varbit.h
+++ b/src/include/utils/varbit.h
@@ -5,16 +5,13 @@
#include <math.h>
#include <limits.h>
-#ifdef HAVE_VALUES_H
-#include <values.h>
-#endif
#include "utils/builtins.h"
-#define HEXDIG(z) (z)<10 ? ((z)+'0') : ((z)-10+'A')
+#define HEXDIG(z) ((z)<10 ? ((z)+'0') : ((z)-10+'A'))
-/* Modeled on struct varlena from postgres.h, bu data type is bits8 */
+/* Modeled on struct varlena from postgres.h, but data type is bits8 */
struct varbita
{
int32 vl_len;
--
GitLab