aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/libpq/crypt.c4
-rw-r--r--src/backend/libpq/pqformat.c6
-rw-r--r--src/backend/optimizer/geqo/geqo_eval.c5
-rw-r--r--src/backend/postmaster/postmaster.c13
-rw-r--r--src/backend/utils/adt/date.c4
-rw-r--r--src/backend/utils/adt/datetime.c12
-rw-r--r--src/backend/utils/adt/float.c8
-rw-r--r--src/backend/utils/adt/int.c7
-rw-r--r--src/backend/utils/adt/int8.c9
-rw-r--r--src/backend/utils/adt/nabstime.c16
-rw-r--r--src/backend/utils/adt/numutils.c9
-rw-r--r--src/backend/utils/adt/timestamp.c7
-rw-r--r--src/backend/utils/adt/varbit.c16
-rw-r--r--src/include/c.h5
-rw-r--r--src/include/config.h.in29
-rw-r--r--src/include/utils/varbit.h12
16 files changed, 40 insertions, 122 deletions
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 8b9eace73ef..6cc9abb90ea 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,7 +9,7 @@
* Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed.
*
- * $Id: crypt.c,v 1.27 2000/07/04 16:31:53 petere Exp $
+ * $Id: crypt.c,v 1.28 2000/07/12 22:58:59 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
#include "utils/nabstime.h"
#ifdef HAVE_CRYPT_H
-#include "crypt.h"
+#include <crypt.h>
#endif
char **pwd_cache = NULL;
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index a591e4ead55..24bc0bda384 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -16,7 +16,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqformat.c,v 1.14 2000/07/08 05:30:33 tgl Exp $
+ * $Id: pqformat.c,v 1.15 2000/07/12 22:58:59 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,9 +48,7 @@
#include "postgres.h"
#include <errno.h>
-#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
-#endif
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
@@ -58,7 +56,7 @@
#include "mb/pg_wchar.h"
#endif
#ifdef HAVE_ENDIAN_H
-#include "endian.h"
+#include <endian.h>
#endif
#ifndef BYTE_ORDER
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index fa46fac6c84..269d45f1f28 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.51 2000/06/28 03:31:45 tgl Exp $
+ * $Id: geqo_eval.c,v 1.52 2000/07/12 22:59:01 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,13 +22,10 @@
#include "postgres.h"
#include <math.h>
-#ifdef HAVE_LIMITS_H
#include <limits.h>
-#else
#ifdef HAVE_VALUES_H
#include <values.h>
#endif
-#endif
#include "optimizer/geqo.h"
#include "optimizer/pathnode.h"
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index fe6b7b14557..b22aff762a3 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.155 2000/07/12 17:38:42 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.156 2000/07/12 22:59:04 petere Exp $
*
* NOTES
*
@@ -49,17 +49,12 @@
#include <sys/param.h>
/* moved here to prevent double define */
-#ifdef HAVE_NETDB_H
#include <netdb.h>
-#endif
-#ifdef HAVE_LIMITS_H
#include <limits.h>
-#else
#ifdef HAVE_VALUES_H
#include <values.h>
#endif
-#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
@@ -87,10 +82,6 @@
#include "utils/guc.h"
-#if !defined(MAXINT)
-#define MAXINT INT_MAX
-#endif
-
#define INVALID_SOCK (-1)
#define ARGV_SIZE 64
@@ -166,7 +157,7 @@ int MaxBackends = DEF_MAXBACKENDS;
* semaphores, even if you never actually use that many backends.
*/
-static int NextBackendTag = MAXINT; /* XXX why count down not up? */
+static int NextBackendTag = INT_MAX; /* XXX why count down not up? */
static char *progname = (char *) NULL;
static char **real_argv;
static int real_argc;
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 952a8e6d4d6..d003c4ee516 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 229667e1b50..84ca139f108 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 0d53401c960..0b6a0db2eaa 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 7029ca73b89..bf7758c1865 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 63c09384612..773ec8b193d 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 720517c9536..2b5cd7d0bfd 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 681a78baa85..3d4956afe2e 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 d5d5b86f9fe..b4736dd6ae8 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 b5d2e18e104..be1d5160f0f 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"
diff --git a/src/include/c.h b/src/include/c.h
index 18bdda5e781..603c5bbfe85 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.77 2000/07/12 17:38:53 petere Exp $
+ * $Id: c.h,v 1.78 2000/07/12 22:59:12 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,15 +46,12 @@
#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/fcntl.h>
-#ifdef STDC_HEADERS
#include <stddef.h>
#include <stdarg.h>
-#endif
#ifdef __CYGWIN32__
#include <errno.h>
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 583c20dc545..41779aeb943 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.125 2000/07/11 14:30:30 momjian Exp $
+ * $Id: config.h.in,v 1.126 2000/07/12 22:59:12 petere Exp $
*/
#ifndef CONFIG_H
@@ -291,9 +291,6 @@
/* Define if your cpp understands the ANSI stringizing operators in macros */
#undef HAVE_STRINGIZE
-/* Set to 1 if you have <arpa/inet.h> */
-#undef HAVE_ARPA_INET_H
-
/* Set to 1 if you have <crypt.h> */
#undef HAVE_CRYPT_H
@@ -303,9 +300,6 @@
/* Set to 1 if you have <endian.h> */
#undef HAVE_ENDIAN_H
-/* Set to 1 if you have <float.h> */
-#undef HAVE_FLOAT_H
-
/* Set to 1 if you have <fp_class.h> */
#undef HAVE_FP_CLASS_H
@@ -318,15 +312,6 @@
/* Set to 1 if you have <ieeefp.h> */
#undef HAVE_IEEEFP_H
-/* Set to 1 if you have <limits.h> */
-#undef HAVE_LIMITS_H
-
-/* Set to 1 if you have <netdb.h> */
-#undef HAVE_NETDB_H
-
-/* Set to 1 if you have <netinet/in.h> */
-#undef HAVE_NETINET_IN_H
-
/* Set to 1 if you have <readline.h> */
#undef HAVE_READLINE_H
@@ -345,18 +330,9 @@
/* Set to 1 if you have <values.h> */
#undef HAVE_VALUES_H
-/* Set to 1 if you have <sys/exec.h> */
-#undef HAVE_SYS_EXEC_H
-
/* Set to 1 if you have <sys/pstat.h> */
#undef HAVE_SYS_PSTAT_H
-/* Set to 1 if you have <machine/vmparam.h> */
-#undef HAVE_MACHINE_VMPARAM_H
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
/* Define if you have the setproctitle function. */
#undef HAVE_SETPROCTITLE
@@ -375,9 +351,6 @@
/* Set to 1 if you have <pwd.h> */
#undef HAVE_PWD_H
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
/* Set to 1 if you gettimeofday(a,b) vs gettimeofday(a) */
#undef GETTIMEOFDAY_1ARG
#ifdef GETTIMEOFDAY_1ARG
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
index e6106331b9a..5961bb80a5a 100644
--- a/src/include/utils/varbit.h
+++ b/src/include/utils/varbit.h
@@ -1,19 +1,14 @@
#ifndef VARBIT_H
#define VARBIT_H
-#include <math.h>
-
#include "postgres.h"
-#ifdef HAVE_LIMITS_H
+
+#include <math.h>
#include <limits.h>
-#ifndef MAXINT
-#define MAXINT INT_MAX
-#endif
-#else
#ifdef HAVE_VALUES_H
#include <values.h>
#endif
-#endif
+
#include "utils/builtins.h"
@@ -26,6 +21,7 @@ struct varbita
bits8 vl_dat[1];
};
+#undef BITSPERBYTE /* sometimes declared in <values.h> */
#define BITSPERBYTE 8
#define VARBITHDRSZ sizeof(int32)
/* Number of bits in this bit string */
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 12:09:29 +0000