From 3406901a2928627477374769416a32b01a08b131 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 17 Jul 1999 20:18:55 +0000
Subject: [PATCH] Move some system includes into c.h, and remove duplicates.
---
src/backend/access/common/heaptuple.c | 8 +-------
src/backend/access/common/indextuple.c | 7 +------
src/backend/access/common/printtup.c | 3 +--
src/backend/access/common/tupdesc.c | 9 +--------
src/backend/access/gist/gist.c | 5 -----
src/backend/access/gist/gistget.c | 5 -----
src/backend/access/gist/gistscan.c | 5 -----
src/backend/access/hash/hash.c | 7 +------
src/backend/access/hash/hashovfl.c | 7 +------
src/backend/access/hash/hashpage.c | 7 +------
src/backend/access/hash/hashsearch.c | 7 +------
src/backend/access/hash/hashutil.c | 7 +------
src/backend/access/heap/heapam.c | 7 +------
src/backend/access/heap/stats.c | 8 +-------
src/backend/access/index/genam.c | 7 +------
src/backend/access/nbtree/nbtcompare.c | 3 +--
src/backend/access/nbtree/nbtinsert.c | 7 +------
src/backend/access/nbtree/nbtpage.c | 8 +-------
src/backend/access/nbtree/nbtree.c | 7 +------
src/backend/access/nbtree/nbtsearch.c | 7 +------
src/backend/access/nbtree/nbtsort.c | 7 +------
src/backend/access/nbtree/nbtutils.c | 7 +------
src/backend/access/rtree/rtget.c | 7 +------
src/backend/access/rtree/rtproc.c | 7 +------
src/backend/access/rtree/rtree.c | 7 +------
src/backend/access/rtree/rtscan.c | 7 +------
src/backend/access/transam/xid.c | 3 +--
src/backend/bootstrap/bootparse.y | 3 +--
src/backend/bootstrap/bootscanner.l | 6 +-----
src/backend/bootstrap/bootstrap.c | 8 +-------
src/backend/catalog/aclchk.c | 3 +--
src/backend/catalog/catalog.c | 3 +--
src/backend/catalog/heap.c | 7 +------
src/backend/catalog/index.c | 7 +------
src/backend/catalog/indexing.c | 3 +--
src/backend/catalog/pg_aggregate.c | 7 +------
src/backend/catalog/pg_operator.c | 7 +------
src/backend/catalog/pg_proc.c | 7 +------
src/backend/catalog/pg_type.c | 7 +------
src/backend/commands/_deadcode/version.c | 4 +---
src/backend/commands/async.c | 3 +--
src/backend/commands/cluster.c | 3 +--
src/backend/commands/command.c | 3 +--
src/backend/commands/copy.c | 3 +--
src/backend/commands/creatinh.c | 4 +---
src/backend/commands/dbcommands.c | 4 +---
src/backend/commands/define.c | 4 +---
src/backend/commands/explain.c | 4 +---
src/backend/commands/indexcmds.c | 3 +--
src/backend/commands/proclang.c | 1 -
src/backend/commands/remove.c | 7 +------
src/backend/commands/rename.c | 7 +------
src/backend/commands/sequence.c | 2 --
src/backend/commands/trigger.c | 1 -
src/backend/commands/user.c | 4 +---
src/backend/commands/vacuum.c | 3 +--
src/backend/commands/variable.c | 4 +---
src/backend/commands/view.c | 4 +---
src/backend/executor/execAmi.c | 3 +--
src/backend/executor/execJunk.c | 3 +--
src/backend/executor/execMain.c | 3 +--
src/backend/executor/execQual.c | 3 +--
src/backend/executor/execTuples.c | 3 +--
src/backend/executor/functions.c | 3 +--
src/backend/executor/nodeAgg.c | 1 -
src/backend/executor/nodeGroup.c | 3 +--
src/backend/executor/nodeHash.c | 4 +---
src/backend/executor/nodeHashjoin.c | 3 +--
src/backend/executor/nodeSort.c | 3 +--
src/backend/executor/nodeUnique.c | 3 +--
src/backend/lib/stringinfo.c | 4 +---
src/backend/libpq/auth.c | 4 +---
src/backend/libpq/be-dumpdata.c | 3 +--
src/backend/libpq/be-fsstubs.c | 3 +--
src/backend/libpq/be-pqexec.c | 7 +------
src/backend/libpq/crypt.c | 5 +----
src/backend/libpq/hba.c | 4 +---
src/backend/libpq/password.c | 4 ++--
src/backend/libpq/portal.c | 4 +---
src/backend/libpq/portalbuf.c | 3 +--
src/backend/libpq/pqcomm.c | 9 +--------
src/backend/libpq/pqformat.c | 4 ++--
src/backend/libpq/pqpacket.c | 4 +---
src/backend/libpq/util.c | 4 +---
src/backend/main/main.c | 5 ++---
src/backend/nodes/copyfuncs.c | 4 +---
src/backend/nodes/equalfuncs.c | 3 +--
src/backend/nodes/freefuncs.c | 4 +---
src/backend/nodes/list.c | 3 +--
src/backend/nodes/nodes.c | 3 +--
src/backend/nodes/outfuncs.c | 5 ++---
src/backend/nodes/print.c | 4 +---
src/backend/nodes/read.c | 4 +---
src/backend/nodes/readfuncs.c | 4 +---
src/backend/optimizer/geqo/geqo_misc.c | 3 +--
src/backend/optimizer/geqo/geqo_params.c | 4 +---
src/backend/optimizer/path/_deadcode/xfunc.c | 3 +--
src/backend/optimizer/path/allpaths.c | 4 +---
src/backend/optimizer/plan/createplan.c | 3 +--
src/backend/optimizer/plan/planner.c | 3 +--
src/backend/optimizer/prep/prepkeyset.c | 2 --
src/backend/optimizer/prep/preptlist.c | 7 +------
src/backend/optimizer/prep/prepunion.c | 6 +-----
src/backend/optimizer/util/plancat.c | 14 ++------------
src/backend/parser/analyze.c | 6 +-----
src/backend/parser/gram.y | 3 +--
src/backend/parser/keywords.c | 3 +--
src/backend/parser/parse_agg.c | 5 +----
src/backend/parser/parse_clause.c | 5 +----
src/backend/parser/parse_coerce.c | 3 +--
src/backend/parser/parse_expr.c | 5 +----
src/backend/parser/parse_func.c | 3 +--
src/backend/parser/parse_node.c | 3 +--
src/backend/parser/parse_oper.c | 3 +--
src/backend/parser/parse_relation.c | 3 +--
src/backend/parser/parse_target.c | 5 +----
src/backend/parser/parse_type.c | 4 +---
src/backend/parser/parser.c | 4 +---
src/backend/parser/scan.l | 7 ++-----
src/backend/parser/scansup.c | 3 +--
src/backend/port/dynloader/aix.c | 4 +---
src/backend/port/dynloader/bsdi.c | 1 -
src/backend/port/dynloader/hpux.c | 3 +--
src/backend/port/dynloader/linux.c | 4 +---
src/backend/port/dynloader/ultrix4.c | 3 +--
src/backend/port/snprintf.c | 11 ++++-------
src/backend/postmaster/postmaster.c | 5 +----
src/backend/regex/retest.c | 4 +---
src/backend/rewrite/rewriteDefine.c | 4 +---
src/backend/rewrite/rewriteHandler.c | 7 +------
src/backend/rewrite/rewriteManip.c | 3 +--
src/backend/rewrite/rewriteRemove.c | 5 +----
src/backend/storage/buffer/buf_init.c | 3 +--
src/backend/storage/buffer/bufmgr.c | 4 +---
src/backend/storage/buffer/freelist.c | 3 +--
src/backend/storage/buffer/localbuf.c | 4 +---
src/backend/storage/buffer/s_lock.c | 3 +--
src/backend/storage/file/fd.c | 4 +---
src/backend/storage/ipc/ipc.c | 5 +----
src/backend/storage/ipc/ipci.c | 3 +--
src/backend/storage/ipc/shmem.c | 4 +---
src/backend/storage/ipc/shmqueue.c | 4 ++--
src/backend/storage/ipc/sinvaladt.c | 3 +--
src/backend/storage/large_object/inv_api.c | 4 +---
src/backend/storage/lmgr/lmgr.c | 8 +-------
src/backend/storage/lmgr/lock.c | 4 +---
src/backend/storage/lmgr/multi.c | 4 +---
src/backend/storage/lmgr/proc.c | 5 ++---
src/backend/storage/lmgr/single.c | 3 +--
src/backend/storage/page/bufpage.c | 3 +--
src/backend/storage/smgr/md.c | 4 +---
src/backend/storage/smgr/smgr.c | 3 +--
src/backend/storage/smgr/smgrtype.c | 3 +--
src/backend/tcop/dest.c | 4 +---
src/backend/tcop/fastpath.c | 3 +--
src/backend/tcop/postgres.c | 6 ++----
src/backend/tcop/pquery.c | 3 +--
src/backend/tioga/tgRecipe.c | 3 +--
src/backend/utils/adt/acl.c | 3 +--
src/backend/utils/adt/arrayfuncs.c | 5 +----
src/backend/utils/adt/bool.c | 3 +--
src/backend/utils/adt/cash.c | 4 +---
src/backend/utils/adt/char.c | 4 +---
src/backend/utils/adt/chunk.c | 7 +------
src/backend/utils/adt/date.c | 4 +---
src/backend/utils/adt/datetime.c | 4 +---
src/backend/utils/adt/datum.c | 3 +--
src/backend/utils/adt/dt.c | 5 ++---
src/backend/utils/adt/filename.c | 4 +---
src/backend/utils/adt/float.c | 5 +----
src/backend/utils/adt/geo_ops.c | 5 +----
src/backend/utils/adt/inet_net_ntop.c | 5 +----
src/backend/utils/adt/inet_net_pton.c | 5 +----
src/backend/utils/adt/int.c | 4 +---
src/backend/utils/adt/int8.c | 3 ---
src/backend/utils/adt/like.c | 3 +--
src/backend/utils/adt/mac.c | 4 +---
src/backend/utils/adt/nabstime.c | 4 +---
src/backend/utils/adt/name.c | 3 +--
src/backend/utils/adt/network.c | 4 +---
src/backend/utils/adt/not_in.c | 5 ++---
src/backend/utils/adt/numeric.c | 5 +----
src/backend/utils/adt/numutils.c | 8 +-------
src/backend/utils/adt/oid.c | 4 +---
src/backend/utils/adt/regexp.c | 3 +--
src/backend/utils/adt/regproc.c | 3 +--
src/backend/utils/adt/ruleutils.c | 7 ++-----
src/backend/utils/adt/selfuncs.c | 5 +----
src/backend/utils/adt/sets.c | 4 +---
src/backend/utils/adt/tid.c | 6 ++----
src/backend/utils/adt/timestamp.c | 3 +--
src/backend/utils/adt/varchar.c | 4 +---
src/backend/utils/adt/varlena.c | 3 +--
src/backend/utils/adt/version.c | 3 +--
src/backend/utils/cache/catcache.c | 3 +--
src/backend/utils/cache/fcache.c | 7 +------
src/backend/utils/cache/lsyscache.c | 3 +--
src/backend/utils/cache/relcache.c | 4 +---
src/backend/utils/cache/syscache.c | 3 +--
src/backend/utils/cache/temprel.c | 4 +---
src/backend/utils/error/assert.c | 3 +--
src/backend/utils/error/elog.c | 5 +----
src/backend/utils/error/exc.c | 4 +---
src/backend/utils/error/format.c | 4 +---
src/backend/utils/fmgr/dfmgr.c | 4 +---
src/backend/utils/fmgr/fmgr.c | 5 +----
src/backend/utils/hash/dynahash.c | 5 ++---
src/backend/utils/hash/hashfn.c | 3 +--
src/backend/utils/init/findbe.c | 4 +---
src/backend/utils/init/globals.c | 4 +---
src/backend/utils/init/miscinit.c | 7 +------
src/backend/utils/init/postinit.c | 4 +---
src/backend/utils/mb/mbutils.c | 4 +---
src/backend/utils/misc/database.c | 5 +----
src/backend/utils/misc/trace.c | 3 ---
src/backend/utils/mmgr/aset.c | 8 +-------
src/backend/utils/mmgr/mcxt.c | 3 +--
src/backend/utils/mmgr/palloc.c | 4 +---
src/backend/utils/mmgr/portalmem.c | 6 +-----
src/backend/utils/sort/lselect.c | 4 +---
src/backend/utils/sort/psort.c | 4 +---
src/bin/pg_dump/common.c | 5 +----
src/bin/pg_dump/pg_dump.c | 5 +----
src/bin/pg_encoding/pg_encoding.c | 4 +---
src/bin/pg_passwd/pg_passwd.c | 8 --------
src/bin/psql/psql.c | 6 ++----
src/bin/psql/stringutils.c | 5 +----
src/include/c.h | 8 ++++++--
src/include/executor/executor.h | 3 +--
src/include/executor/spi.h | 1 -
src/include/libpq/libpq-be.h | 3 +--
src/include/libpq/pqcomm.h | 3 +--
src/include/optimizer/geqo_misc.h | 4 +---
src/include/regex/utils.h | 2 +-
src/include/storage/bufmgr.h | 3 +--
src/include/storage/fd.h | 4 +---
src/include/utils/array.h | 3 +--
src/include/utils/lselect.h | 4 +---
src/include/utils/ps_status.h | 1 -
src/include/utils/trace.h | 2 --
src/interfaces/ecpg/preproc/c_keywords.c | 1 -
src/interfaces/ecpg/preproc/ecpg.c | 7 -------
src/interfaces/ecpg/preproc/ecpg_keywords.c | 1 -
src/interfaces/ecpg/preproc/keywords.c | 3 +--
src/interfaces/ecpg/preproc/pgc.l | 13 ++-----------
src/interfaces/ecpg/preproc/preproc.y | 4 ----
src/interfaces/libpgtcl/pgtcl.c | 4 +---
src/interfaces/libpgtcl/pgtclCmds.c | 5 +----
src/interfaces/libpgtcl/pgtclId.c | 4 +---
src/interfaces/libpq/fe-auth.c | 3 +--
src/interfaces/libpq/fe-connect.c | 4 +---
src/interfaces/libpq/fe-exec.c | 4 +---
src/interfaces/libpq/fe-lobj.c | 3 +--
src/interfaces/libpq/fe-misc.c | 5 ++---
src/interfaces/libpq/fe-print.c | 4 +---
src/pl/plpgsql/src/plpgsql.h | 4 +---
src/test/examples/testlibpq3.c | 2 --
src/test/locale/test-pgsql-locale.c | 1 -
src/test/regress/regress.c | 6 ++----
src/tutorial/complex.c | 3 ---
src/tutorial/funcs.c | 2 --
src/utils/version.c | 4 +---
262 files changed, 265 insertions(+), 883 deletions(-)
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 576e0f4e258..009f8abdd15 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.56 1999/07/16 04:58:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.57 1999/07/17 20:16:35 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -22,12 +22,6 @@
#include "access/heapam.h"
#include "catalog/pg_type.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
-
/* Used by heap_getattr() macro, for speed */
long heap_sysoffset[] = {
/* Only the first one is pass-by-ref, and is handled specially in the macro */
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index be7e250dd83..c300e644a76 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.36 1999/07/16 04:58:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.37 1999/07/17 20:16:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,11 +19,6 @@
#include "access/itup.h"
#include "catalog/pg_type.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------------------------------------------------------
* index_ tuple interface routines
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 2313e3e6c96..f5311356047 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,12 +8,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.48 1999/07/15 22:38:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.49 1999/07/17 20:16:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index f8b4147b33c..4bce6ee914f 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.53 1999/07/16 04:58:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.54 1999/07/17 20:16:36 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -16,8 +16,6 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-
#include "postgres.h"
#include "catalog/pg_type.h"
@@ -26,11 +24,6 @@
#include "utils/builtins.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------------------------------------------------------
* CreateTemplateTupleDesc
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 8dab9755cc8..0e4263b80ec 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -22,11 +22,6 @@
#include "executor/executor.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* non-export function prototypes */
static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index f35a0f7cd37..fc18377a94a 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -16,11 +16,6 @@
#include "access/gist.h"
#include "executor/execdebug.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index c4553094430..e7a864985a4 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -16,11 +16,6 @@
#include "access/gist.h"
#include "access/gistscan.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* routines defined and used here */
static void gistregscan(IndexScanDesc s);
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 74fa62931e2..1130367b65d 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.29 1999/07/16 04:58:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.30 1999/07/17 20:16:38 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -24,11 +24,6 @@
#include "executor/executor.h"
#include "miscadmin.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
bool BuildingHash = false;
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index fd4d814cc93..ea074c39099 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.24 1999/07/17 20:16:38 momjian Exp $
*
* NOTES
* Overflow pages look like ordinary relation pages.
@@ -18,11 +18,6 @@
#include "access/hash.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
static uint32 _hash_firstfreebit(uint32 map);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index d0c1a300620..b7abaa0cb71 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.24 1999/07/17 20:16:39 momjian Exp $
*
* NOTES
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -29,11 +29,6 @@
#include "access/hash.h"
#include "miscadmin.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index a405279d0cd..5056e3897fd 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,11 +16,6 @@
#include "access/hash.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/*
* _hash_search() -- Finds the page/bucket that the contains the
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 8ddfd22f6e5..9f13da34ab1 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,6 @@
#include "access/hash.h"
#include "access/iqual.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
ScanKey
_hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index ca97ce46571..5fb0367f2c6 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.51 1999/07/16 04:58:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.52 1999/07/17 20:16:39 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -85,11 +85,6 @@
#include "utils/inval.h"
#include "utils/relcache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------------------------------------------------------
* heap support routines
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index d5fd03382ad..349ab4a6220 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
*
* NOTES
* initam should be moved someplace else.
@@ -15,18 +15,12 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <time.h>
#include "postgres.h"
#include "access/heapam.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static void InitHeapAccessStatistics(void);
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index cf2db250658..c1971133ce1 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
*
* NOTES
* many of the old access method routines have been turned into
@@ -47,11 +47,6 @@
#include "postgres.h"
#include "access/genam.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------------------------------------------------------
* general access method routines
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 834d510b8c7..6673d69b84a 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.26 1999/07/15 23:02:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.27 1999/07/17 20:16:41 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -20,7 +20,6 @@
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 23954d7fedf..b07db1d7c9b 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.47 1999/07/16 04:58:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.48 1999/07/17 20:16:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,6 @@
#include "access/heapam.h"
#include "access/nbtree.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
static Buffer _bt_split(Relation rel, Buffer buf, OffsetNumber firstright);
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 6bdcd43cb53..2d30827368f 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.29 1999/07/16 04:58:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.30 1999/07/17 20:16:42 momjian Exp $
*
* NOTES
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -19,15 +19,9 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <time.h>
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "access/nbtree.h"
#include "miscadmin.h"
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index a38160cc1e4..c97273f10f0 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -17,11 +17,6 @@
*/
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "access/genam.h"
#include "access/heapam.h"
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 2c7e3a7f7dc..3a5eda3ad8c 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.52 1999/07/17 16:02:50 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.53 1999/07/17 20:16:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,6 @@
#include "access/genam.h"
#include "access/nbtree.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey,
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index aeed3a29e42..e3b1f5a043c 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
- * $Id: nbtsort.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
+ * $Id: nbtsort.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
*
* NOTES
*
@@ -53,11 +53,6 @@
#include "access/nbtree.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#ifdef BTREE_BUILD_STATS
#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index e4b3b2500ac..2a5e7578d2f 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.31 1999/07/16 04:58:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.32 1999/07/17 20:16:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,11 +22,6 @@
extern int NIndexTupleProcessed;
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
ScanKey
_bt_mkscankey(Relation rel, IndexTuple itup)
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 539d4b212ad..6d1c61212e9 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.18 1999/07/16 04:58:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.19 1999/07/17 20:16:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,6 @@
#include "access/iqual.h"
#include "access/rtree.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index aa24c3546dc..bb666627acf 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.23 1999/07/16 04:58:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.24 1999/07/17 20:16:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,11 +16,6 @@
#include "utils/builtins.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
BOX
*
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 1d1891ecbbd..37da716df1d 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.35 1999/07/16 04:58:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.36 1999/07/17 20:16:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,11 +21,6 @@
#include "executor/executor.h"
#include "utils/geo_decls.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
typedef struct SPLITVEC
{
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 6f08fa271d9..30bf065d121 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.28 1999/07/16 04:58:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.29 1999/07/17 20:16:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,6 @@
#include "access/genam.h"
#include "access/rtree.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* routines defined and used here */
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 1d824cabc48..1bf3d405069 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: xid.c,v 1.25 1999/07/15 23:03:04 momjian Exp $
+ * $Id: xid.c,v 1.26 1999/07/17 20:16:45 momjian Exp $
*
* OLD COMMENTS
* XXX WARNING
@@ -18,7 +18,6 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include "postgres.h"
#include "access/xact.h"
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index b601d49cba6..ce2d7d496ec 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -8,12 +8,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.26 1999/07/16 04:58:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.27 1999/07/17 20:16:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <time.h>
#include "postgres.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index d5a513d0198..22fd7f483d7 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -8,18 +8,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.13 1999/07/16 04:58:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.14 1999/07/17 20:16:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <time.h>
-#include <string.h>
#include "postgres.h"
-
-
-
#include "access/attnum.h"
#include "access/funcindex.h"
#include "access/htup.h"
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 6253bf5cd5a..fc357d87a79 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,16 +7,14 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.64 1999/07/16 04:58:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.65 1999/07/17 20:16:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <unistd.h>
#include <time.h>
-#include <stdio.h>
#include <signal.h>
#include <setjmp.h>
-#include <string.h>
#ifdef __CYGWIN32__
#include <getopt.h>
#endif
@@ -39,10 +37,6 @@
#include "utils/lsyscache.h"
#include "utils/portal.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#endif
-
#define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t))
#define FIRST_TYPE_OID 16 /* OID of the first type */
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index e53599fc0ae..685985e79a0 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,14 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.25 1999/07/16 04:58:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.26 1999/07/17 20:16:47 momjian Exp $
*
* NOTES
* See acl.h.
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index abaa68f08e4..1ad931e8b21 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.24 1999/07/16 04:58:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.25 1999/07/17 20:16:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 0ee9aa2cac3..1592be2687b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.92 1999/07/16 04:58:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.93 1999/07/17 20:16:48 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -52,11 +52,6 @@
#include "utils/syscache.h"
#include "utils/temprel.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static void AddNewRelationTuple(Relation pg_class_desc,
Relation new_rel_desc, Oid new_rel_oid, unsigned natts,
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index e7763b045b7..607f48fd4b6 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.84 1999/07/16 04:58:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.85 1999/07/17 20:16:49 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -19,11 +19,6 @@
*/
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "access/genam.h"
#include "access/heapam.h"
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 21ced7031b7..92a3385f4e9 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,11 +8,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.39 1999/07/15 22:38:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.40 1999/07/17 20:16:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index b96df411548..c8f02287cb8 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.23 1999/07/16 04:58:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.24 1999/07/17 20:16:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,11 +21,6 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------
* AggregateCreate
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 06c558821fb..8cab520f520 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.40 1999/07/16 04:58:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.41 1999/07/17 20:16:49 momjian Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -26,11 +26,6 @@
#include "utils/builtins.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static Oid OperatorGetWithOpenRelation(Relation pg_operator_desc,
const char *operatorName,
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 30902fbb91d..f0a10cf8f89 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.32 1999/07/16 04:58:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.33 1999/07/17 20:16:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,11 +28,6 @@
#include "utils/sets.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/* ----------------------------------------------------------------
* ProcedureCreate
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index ac9d248ba80..a219767858c 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.39 1999/07/16 04:58:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.40 1999/07/17 20:16:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,11 +22,6 @@
#include "utils/builtins.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc,
char *typeName);
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index eddc79392da..1d53690c1e5 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -9,7 +9,7 @@
* doesn't work! - jolly 8/19/95
*
*
- * $Id: version.c,v 1.21 1999/07/15 23:03:09 momjian Exp $
+ * $Id: version.c,v 1.22 1999/07/17 20:16:55 momjian Exp $
*
* NOTES
* At the point the version is defined, 2 physical relations are created
@@ -20,8 +20,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 7fa337c196f..090acbefa58 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.52 1999/07/17 20:16:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -78,7 +78,6 @@
#include <unistd.h>
#include <signal.h>
-#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <netinet/in.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a02aba5fa05..6f99a920f5a 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,11 +14,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.43 1999/07/16 04:58:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.44 1999/07/17 20:16:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index ef6f25efd44..93559a55c41 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.52 1999/07/17 20:16:51 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,7 +20,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 9d649fb1456..98a0fb92439 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,12 +6,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.84 1999/07/16 04:58:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.85 1999/07/17 20:16:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index d5177d86627..b93a40e7ba3 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.44 1999/07/16 04:58:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.45 1999/07/17 20:16:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 2e420d2f518..b779715fe8e 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.38 1999/07/16 04:58:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.39 1999/07/17 20:16:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <signal.h>
#include <sys/stat.h>
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 5bf42d182ee..c7dc7d3ad1c 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.33 1999/07/16 04:58:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.34 1999/07/17 20:16:52 momjian Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -32,9 +32,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <ctype.h>
-#include <string.h>
#include <math.h>
#include "postgres.h"
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 168d2037e7d..460fdcc1f91 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,11 +4,9 @@
*
* Copyright (c) 1994-5, Regents of the University of California
*
- * $Id: explain.c,v 1.42 1999/07/17 19:01:21 tgl Exp $
+ * $Id: explain.c,v 1.43 1999/07/17 20:16:52 momjian Exp $
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 69297201189..3644d1ba042 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.8 1999/07/16 04:58:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.9 1999/07/17 20:16:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 194333fbe97..21fde2af579 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -6,7 +6,6 @@
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 0ae6b151bae..af20c79f17d 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.35 1999/07/16 04:58:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.36 1999/07/17 20:16:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,11 +24,6 @@
#include "utils/acl.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
/*
* RemoveOperator
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index ec5f574e7c8..1a93027b4a3 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,16 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.31 1999/07/16 05:41:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.32 1999/07/17 20:16:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "access/heapam.h"
#include "catalog/catname.h"
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 548b3311a07..b7f959cd65e 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -5,8 +5,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 35b3356de4d..55f67711c77 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -5,7 +5,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 63de3aa699b..984fc33453f 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,12 +5,10 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: user.c,v 1.31 1999/07/16 04:58:41 momjian Exp $
+ * $Id: user.c,v 1.32 1999/07/17 20:16:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 91ce729ebda..de4282ccec3 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,13 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.113 1999/07/16 04:58:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.114 1999/07/17 20:16:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
#include <sys/file.h>
-#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 6669eb7440e..d34b97c90df 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,12 +2,10 @@
* Routines for handling of 'SET var TO',
* 'SHOW var' and 'RESET var' statements.
*
- * $Id: variable.c,v 1.24 1999/07/16 04:58:41 momjian Exp $
+ * $Id: variable.c,v 1.25 1999/07/17 20:16:54 momjian Exp $
*
*/
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
#include <time.h>
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 069d92237b8..5baf4eceac8 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,12 +5,10 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: view.c,v 1.36 1999/07/16 04:58:42 momjian Exp $
+ * $Id: view.c,v 1.37 1999/07/17 20:16:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 8a03d92abae..40a94fd02c8 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.40 1999/07/16 04:58:44 momjian Exp $
+ * $Id: execAmi.c,v 1.41 1999/07/17 20:16:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,6 @@
* ExecCreatR function to create temporary relations
*
*/
-#include <stdio.h>
#include "postgres.h"
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index d541f34825d..04847867942 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.19 1999/07/15 22:39:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.20 1999/07/17 20:16:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 5459f06be85..48c0a885f3c 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,11 +26,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.92 1999/07/16 04:58:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.93 1999/07/17 20:16:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 3eb569acb64..649c189ea97 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.56 1999/07/16 04:58:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.57 1999/07/17 20:16:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,6 @@
* instead of doing needless copying. -cim 5/31/91
*
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index bebcb17a977..6e2e249c9a8 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.28 1999/07/16 04:58:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.29 1999/07/17 20:16:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -116,7 +116,6 @@
* and the TupleTableSlot node in execnodes.h.
*
*/
-#include <string.h>
#include "postgres.h"
#include "executor/executor.h"
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 0653c048b9b..f6b716c44ca 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,11 +8,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.29 1999/07/16 04:58:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.30 1999/07/17 20:16:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 45196dfdf6c..fc95d2ce5bc 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -15,7 +15,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 3c25447e247..f856d4780bc 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,11 +13,10 @@
* columns. (ie. tuples from the same group are consecutive)
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.29 1999/07/17 20:16:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 71da86f9c56..214cc7f0696 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
*
- * $Id: nodeHash.c,v 1.37 1999/07/15 22:39:08 momjian Exp $
+ * $Id: nodeHash.c,v 1.38 1999/07/17 20:16:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,9 +19,7 @@
*/
#include <sys/types.h>
-#include <stdio.h>
#include <math.h>
-#include <string.h>
#include "postgres.h"
#include "executor/execdebug.h"
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index fa46c603ecc..439b8634cda 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.25 1999/07/16 04:58:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.26 1999/07/17 20:16:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 311938a7435..f82fecf0d6f 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.22 1999/07/16 04:58:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.23 1999/07/17 20:16:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "executor/executor.h"
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index af07ab83c0b..13547d4b3cd 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.23 1999/07/16 04:58:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.24 1999/07/17 20:16:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,6 @@
* sorted order.
*
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index fec4f25ecb0..e98a5c5f4d5 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -8,13 +8,11 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: stringinfo.c,v 1.19 1999/07/15 15:19:02 momjian Exp $
+ * $Id: stringinfo.c,v 1.20 1999/07/17 20:16:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "lib/stringinfo.h"
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 24def9d755c..d42503f3c18 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.39 1999/07/16 04:58:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.40 1999/07/17 20:17:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,8 +17,6 @@
* backend (postmaster) routines:
* be_recvauth receive authentication information
*/
-#include <stdio.h>
-#include <string.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index b15eaad617b..288ff70f523 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: be-dumpdata.c,v 1.29 1999/07/16 04:58:58 momjian Exp $
+ * $Id: be-dumpdata.c,v 1.30 1999/07/17 20:17:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,6 @@
* puts portals on the stack and the PQ functions remove them.
*
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 9f020bdea29..280fdd9410d 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.40 1999/07/16 04:58:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.41 1999/07/17 20:17:01 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -33,7 +33,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 8131662a2a9..e92efd503fd 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.23 1999/07/16 04:59:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.24 1999/07/17 20:17:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,11 +26,6 @@
#include "tcop/fastpath.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static char *strmake(char *str, int len);
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index c10efca9ff0..7c3bd35e243 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,14 +9,11 @@
* Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed.
*
- * $Id: crypt.c,v 1.22 1999/07/16 04:59:00 momjian Exp $
+ * $Id: crypt.c,v 1.23 1999/07/17 20:17:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
#include "postgres.h"
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 38c49bbf01d..5012d22263a 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,12 +5,10 @@
* wherein you authenticate a user by seeing what IP address the system
* says he comes from and possibly using ident).
*
- * $Id: hba.c,v 1.46 1999/07/16 04:59:01 momjian Exp $
+ * $Id: hba.c,v 1.47 1999/07/17 20:17:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <errno.h>
#include <pwd.h>
#include <sys/types.h>
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 831e80c66af..3e3b8401e15 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,12 +1,12 @@
/*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: password.c,v 1.24 1999/07/16 04:59:01 momjian Exp $
+ * $Id: password.c,v 1.25 1999/07/17 20:17:02 momjian Exp $
*
*/
-#include <string.h>
#include <unistd.h>
+
#include "postgres.h"
#ifdef HAVE_CRYPT_H
#include "crypt.h"
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index f8a6db73589..abc69686e6d 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: portal.c,v 1.26 1999/07/16 04:59:02 momjian Exp $
+ * $Id: portal.c,v 1.27 1999/07/17 20:17:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,8 +50,6 @@
* see utils/mmgr/portalmem.c for why. -cim 2/22/91
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index a9c3e9506be..b61c7a7b731 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.20 1999/07/16 04:59:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.21 1999/07/17 20:17:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,7 +47,6 @@
* see utils/mmgr/portalmem.c for why. -cim 2/22/91
*
*/
-#include <string.h>
#include <sys/types.h>
#include "postgres.h"
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 062488184e5..e8361b85353 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.c,v 1.79 1999/07/17 05:16:15 momjian Exp $
+ * $Id: pqcomm.c,v 1.80 1999/07/17 20:17:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,7 +58,6 @@
*
*------------------------
*/
-#include <stdio.h>
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
@@ -74,12 +73,6 @@
#include "postgres.h"
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
#include "libpq/libpq.h"
#include "utils/trace.h" /* needed for HAVE_FCNTL_SETLK */
#include "miscadmin.h"
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 7bb502b984e..e5da571886d 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -15,7 +15,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqformat.c,v 1.6 1999/07/16 04:59:04 momjian Exp $
+ * $Id: pqformat.c,v 1.7 1999/07/17 20:17:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,8 +51,8 @@
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
#endif
-#include <string.h>
#ifdef HAVE_ENDIAN_H
+#include "endian.h"
#endif
#ifndef BYTE_ORDER
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index febfb374367..160944cc5fb 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,14 +8,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.21 1999/07/15 23:03:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.22 1999/07/17 20:17:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <unistd.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 3d9ba30b496..c331298dbd5 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: util.c,v 1.12 1999/07/16 03:12:57 momjian Exp $
+ * $Id: util.c,v 1.13 1999/07/17 20:17:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,8 +17,6 @@
* PQuntrace - turn off pqdebug() tracing
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "libpq/libpq.h"
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 77b6bc035b1..de85b5469e5 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.26 1999/07/16 03:12:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.27 1999/07/17 20:17:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <unistd.h>
#if defined(__alpha__) && !defined(linux)
@@ -22,6 +20,7 @@
#include <sys/proc.h>
#undef ASSEMBLER
#endif
+
#include "postgres.h"
#ifdef USE_LOCALE
#include <locale.h>
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 1e93c93e977..217bfc54471 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.85 1999/07/16 04:59:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.86 1999/07/17 20:17:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 1ac318980b8..9f16875f343 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.42 1999/07/16 04:59:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.43 1999/07/17 20:17:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 457072150b1..066f7704e08 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.21 1999/07/15 22:39:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.22 1999/07/17 20:17:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 623d34d7b2d..549be7571ba 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.24 1999/07/15 22:39:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.25 1999/07/17 20:17:06 momjian Exp $
*
* NOTES
* XXX a few of the following functions are duplicated to handle
@@ -21,7 +21,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdarg.h>
#include "postgres.h"
#include "nodes/parsenodes.h"
diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c
index c8c335df125..0e60597949d 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -8,14 +8,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.9 1999/07/15 15:19:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.10 1999/07/17 20:17:07 momjian Exp $
*
* HISTORY
* Andrew Yu Oct 20, 1994 file creation
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "nodes/nodes.h"
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index bdcd0dc39de..6d389eef184 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: outfuncs.c,v 1.88 1999/07/16 04:59:05 momjian Exp $
+ * $Id: outfuncs.c,v 1.89 1999/07/17 20:17:07 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -19,9 +19,8 @@
* representation plus some other information (string length, etc.)
*
*/
-#include <stdio.h>
-#include "postgres.h"
+#include "postgres.h"
#include "access/heapam.h"
#include "access/htup.h"
#include "catalog/pg_type.h"
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index bf3d584f8af..995e226c163 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.30 1999/07/16 04:59:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.31 1999/07/17 20:17:08 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -15,8 +15,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index d86450a9429..e80385e6e17 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.17 1999/07/16 04:59:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.18 1999/07/17 20:17:08 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -16,8 +16,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
#include "postgres.h"
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index f0859598215..9d46b7e39da 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.68 1999/07/16 04:59:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.69 1999/07/17 20:17:08 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -22,9 +22,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <math.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 21e438958b4..615c4354611 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.c,v 1.22 1999/07/16 04:59:09 momjian Exp $
+ * $Id: geqo_misc.c,v 1.23 1999/07/17 20:17:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,6 @@
*/
-#include <stdio.h>
#include "postgres.h"
#include "optimizer/geqo_misc.h"
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 26b23f9791f..da2e5178ac4 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
-* $Id: geqo_params.c,v 1.20 1999/07/16 04:59:11 momjian Exp $
+* $Id: geqo_params.c,v 1.21 1999/07/17 20:17:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,11 +18,9 @@
=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
*/
-#include <stdio.h>
#include <time.h>
#include <math.h>
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "miscadmin.h"
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index f6330a637b3..16957495328 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,14 +9,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.8 1999/07/16 04:59:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.9 1999/07/17 20:17:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <math.h>
#include <values.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index cf93248f91e..220b3cd0471 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.49 1999/07/16 04:59:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.50 1999/07/17 20:17:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdio.h>
#include "postgres.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index e12ca3f60e3..1dc0e9a0d5d 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.61 1999/07/16 04:59:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.62 1999/07/17 20:17:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <sys/types.h>
#include "postgres.h"
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 218777fa4c6..41bb025e286 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.60 1999/07/16 04:59:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.61 1999/07/17 20:17:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c
index 914779b4f69..9a8ef5da4f5 100644
--- a/src/backend/optimizer/prep/prepkeyset.c
+++ b/src/backend/optimizer/prep/prepkeyset.c
@@ -7,8 +7,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "optimizer/planmain.h"
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index a0df069b2ff..035d6fe6bb3 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,17 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.26 1999/07/16 04:59:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.27 1999/07/17 20:17:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
-
-
-
-
#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index db928519e51..931faabe13f 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,18 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.36 1999/07/16 04:59:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.37 1999/07/17 20:17:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <sys/types.h>
#include "postgres.h"
-
-
-
#include "optimizer/plancat.h"
#include "optimizer/planmain.h"
#include "optimizer/planner.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 73ba86e6a09..deb1d021165 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,18 +8,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.34 1999/07/16 04:59:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.35 1999/07/17 20:17:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <math.h>
-#include "postgres.h"
-
-
-
-
+#include "postgres.h"
#include "access/genam.h"
#include "access/heapam.h"
#include "catalog/catname.h"
@@ -29,11 +24,6 @@
#include "optimizer/plancat.h"
#include "parser/parsetree.h"
#include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
static void IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index c2b3889a0db..40a66b48738 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,15 +5,11 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: analyze.c,v 1.114 1999/07/16 04:59:28 momjian Exp $
+ * $Id: analyze.c,v 1.115 1999/07/17 20:17:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b4e089fb07a..5749e484065 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.92 1999/07/16 22:29:42 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.93 1999/07/17 20:17:21 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -32,7 +32,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <ctype.h>
#include "postgres.h"
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index 22b21f7056c..bd5b43ad1fd 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.59 1999/07/15 15:19:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.60 1999/07/17 20:17:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "nodes/parsenodes.h"
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 7470476aaa3..a0757666431 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.25 1999/07/16 04:59:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.26 1999/07/17 20:17:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "postgres.h"
#include "catalog/pg_aggregate.h"
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 4fb6369951c..ce9583c174a 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.40 1999/07/16 04:59:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.41 1999/07/17 20:17:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index c8208da3fc3..df1bb3f2c21 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.20 1999/07/16 04:59:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.21 1999/07/17 20:17:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 049605348c4..a936554ad9d 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.53 1999/07/16 22:32:25 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.54 1999/07/17 20:17:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "postgres.h"
#include "nodes/makefuncs.h"
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 1116304500d..33d93fc9eb8 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.49 1999/07/16 04:59:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.50 1999/07/17 20:17:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 25c34a4e8a9..53c756670c3 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.27 1999/07/16 04:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.28 1999/07/17 20:17:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index cfb822f40e9..9a5ab042da6 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.28 1999/07/16 04:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.29 1999/07/17 20:17:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 219d4ff35ec..d3662aea826 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.24 1999/07/16 04:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.25 1999/07/17 20:17:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 4ebb28a05bc..35d064b0980 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.44 1999/07/16 04:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.45 1999/07/17 20:17:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "postgres.h"
#include "nodes/makefuncs.h"
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 6e8529ee78e..ae826adcd90 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,14 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.23 1999/07/15 22:39:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.24 1999/07/17 20:17:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
-
#include "catalog/pg_type.h"
#include "parser/parse_type.h"
#include "utils/syscache.h"
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 50e633a750a..1f6b99f759d 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,12 +6,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.41 1999/07/16 04:59:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.42 1999/07/17 20:17:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdio.h>
#include "postgres.h"
#include "parser/analyze.h"
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 881c7132c70..35d42356bb4 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.51 1999/07/16 04:59:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.52 1999/07/17 20:17:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,7 @@
#include <unistd.h>
#ifndef __linux__
#include <math.h>
-#else
-#include <stdlib.h>
-#endif /* __linux__ */
-#include <string.h>
+#endif
#include <errno.h>
#include "postgres.h"
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 160b05329b7..df3ea1d931a 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -8,13 +8,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.15 1999/07/17 04:00:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.16 1999/07/17 20:17:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "miscadmin.h"
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 3cac00d117d..a8a833e84fa 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -4,14 +4,12 @@
* 30159 Hannover, Germany
*/
-#include <stdio.h>
#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
#include <sys/types.h>
#include "sys/ldr.h"
#include <a.out.h>
#include "ldfcn.h"
+
#include "postgres.h"
#include "dynloader.h"
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index caf5bea95f3..71ac793ef8b 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -15,7 +15,6 @@
*-------------------------------------------------------------------------
*/
#ifdef PRE_BSDI_2_1
-#include <stdio.h>
#include "postgres.h"
extern char *pg_pathname;
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 64a26c3e020..76f7b970bd4 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.10 1999/07/16 04:59:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.11 1999/07/17 20:17:30 momjian Exp $
*
* NOTES
* all functions are defined here -- it's impossible to trace the
@@ -16,7 +16,6 @@
*-------------------------------------------------------------------------
*/
/* System includes */
-#include <stdio.h>
#include <a.out.h>
#include "postgres.h"
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 8e042a24bd2..cd89fdfded3 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,12 +10,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.14 1999/07/16 04:59:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.15 1999/07/17 20:17:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#ifdef HAVE_DLD_H
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index b9b988de182..851362c1599 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,11 +9,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.8 1999/07/16 04:59:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.9 1999/07/17 20:17:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include "postgres.h"
#include "dl.h"
#include "fmgr.h"
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 17e8eb9a1d6..e6ee698e66d 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -32,15 +32,12 @@
* SUCH DAMAGE.
*/
-#include "postgres.h"
-
-
-#include <stdio.h>
-#include <stdarg.h>
-
#include <sys/ioctl.h>
#include <sys/param.h>
+#include "postgres.h"
+
+
/*
* We do all internal arithmetic in the widest available integer type,
* here called long_long (or ulong_long for unsigned).
@@ -77,7 +74,7 @@ typedef unsigned long ulong_long;
* causing nast effects.
**************************************************************/
-/*static char _id[] = "$Id: snprintf.c,v 1.24 1999/07/16 04:59:36 momjian Exp $";*/
+/*static char _id[] = "$Id: snprintf.c,v 1.25 1999/07/17 20:17:28 momjian Exp $";*/
static char *end;
static int SnprfOverflow;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a84742e741a..15a21773e96 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.113 1999/07/16 05:41:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.114 1999/07/17 20:17:32 momjian Exp $
*
* NOTES
*
@@ -49,8 +49,6 @@
#endif /* !NO_UNISTD_H */
#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
#include <time.h>
@@ -68,7 +66,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <stdio.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
diff --git a/src/backend/regex/retest.c b/src/backend/regex/retest.c
index a684212f384..eee8ef09ae3 100644
--- a/src/backend/regex/retest.c
+++ b/src/backend/regex/retest.c
@@ -1,11 +1,9 @@
/*
* a simple regexp debug program
*
- * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.3 1999/07/15 23:03:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.4 1999/07/17 20:17:34 momjian Exp $
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "regex/regex.h"
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 971fecb72b6..2916c22bba7 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.33 1999/07/16 03:13:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.34 1999/07/17 20:17:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 2130cb7878d..88bef2237aa 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,17 +6,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.53 1999/07/16 04:59:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.54 1999/07/17 20:17:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
-
-
-
-
#include "access/heapam.h"
#include "catalog/pg_type.h"
#include "miscadmin.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 5d04add6fee..38464d34387 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,11 +6,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.37 1999/07/16 04:59:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.38 1999/07/17 20:17:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index b2fefcf20ed..14ceeead848 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,17 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.27 1999/07/16 04:59:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.28 1999/07/17 20:17:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
-
-
#include "access/heapam.h"
#include "catalog/catname.h"
#include "catalog/pg_rewrite.h"
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 66c1e0077cb..88f6416e840 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -7,13 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.28 1999/07/17 04:00:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.29 1999/07/17 20:17:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
#include <sys/file.h>
-#include <stdio.h>
#include <math.h>
#include <signal.h>
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index e0b441f2957..de0d803efe2 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.60 1999/07/16 04:59:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.61 1999/07/17 20:17:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,8 +42,6 @@
*/
#include <sys/types.h>
#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
#include <math.h>
#include <signal.h>
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index eed31290043..d8f70a3287e 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.17 1999/07/16 04:59:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.18 1999/07/17 20:17:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,6 @@
* Sync: all routines in this file assume that the buffer
* semaphore has been acquired by the caller.
*/
-#include <stdio.h>
#include "postgres.h"
#include "storage/bufmgr.h"
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 81ffdb640cb..a6a2d456b26 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,14 +15,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.25 1999/07/16 04:59:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.26 1999/07/17 20:17:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
#include <math.h>
#include <signal.h>
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index 0d02a1f6841..34a049026e6 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.22 1999/07/13 20:12:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.23 1999/07/17 20:17:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <sys/time.h>
#include <unistd.h>
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 10a8f83dc90..c279528974c 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.46 1999/07/16 03:13:31 momjian Exp $
+ * $Id: fd.c,v 1.47 1999/07/17 20:17:42 momjian Exp $
*
* NOTES:
*
@@ -37,13 +37,11 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
-#include <string.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index b9ec1d171f5..59c991bd0a7 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.37 1999/05/25 16:11:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.38 1999/07/17 20:17:43 momjian Exp $
*
* NOTES
*
@@ -26,8 +26,6 @@
*/
#include <sys/types.h>
#include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
#include <errno.h>
@@ -42,7 +40,6 @@
#include "utils/trace.h"
#if defined(solaris_sparc)
-#include <string.h>
#include <sys/ipc.h>
#endif
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 97bf1a3ee7d..16c5266c6cd 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.29 1999/07/16 04:59:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.30 1999/07/17 20:17:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <sys/types.h>
#include "postgres.h"
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 2b785251c59..b057aaa578a 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.44 1999/07/15 22:39:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.45 1999/07/17 20:17:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -57,8 +57,6 @@
* shmem index.
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "storage/proc.h"
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 317af7f0243..bf57b27652a 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.11 1999/07/16 03:13:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.12 1999/07/17 20:17:44 momjian Exp $
*
* NOTES
*
@@ -22,7 +22,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
+
#include "postgres.h"
#include "storage/shmem.h"
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index fb6170faf43..cffc4aac229 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.22 1999/07/15 22:39:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.23 1999/07/17 20:17:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <signal.h>
#include <unistd.h>
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index b6ba758849c..7740b5fc53a 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,13 +8,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.56 1999/07/16 04:59:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.57 1999/07/17 20:17:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 032abac1ad9..df8f991fae7 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.32 1999/07/16 04:59:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.33 1999/07/17 20:17:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,14 +18,8 @@
#define LOCKDEBUG 1
#endif /* LOCKDEBUGALL */
-#include <string.h>
#include "postgres.h"
-
-
-
-
-
#include "access/transam.h"
#include "catalog/catalog.h"
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 711f56efb8f..427cc749c84 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.60 1999/07/16 04:59:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.61 1999/07/17 20:17:46 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -29,8 +29,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index d8897cd4d0d..6f138f5784a 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.32 1999/07/16 04:59:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.33 1999/07/17 20:17:47 momjian Exp $
*
* NOTES:
* (1) The lock.c module assumes that the caller here is doing
@@ -20,8 +20,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "miscadmin.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 2fca5a4e3e6..6186904ad45 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.60 1999/07/17 20:17:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,11 +46,10 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.60 1999/07/17 20:17:47 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
-#include <string.h>
#include <signal.h>
#include <sys/types.h>
diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c
index 11b9a262cd8..47e19bd09da 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -13,11 +13,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.11 1999/07/16 03:13:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.12 1999/07/17 20:17:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index cb3d2f8dce6..d67fb0018c3 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.25 1999/07/15 22:39:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.26 1999/07/17 20:17:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <sys/types.h>
#include <sys/file.h>
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 3c5dd55e79c..a6b2a586705 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,13 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.50 1999/07/16 04:59:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.51 1999/07/17 20:17:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
#include <fcntl.h>
#include <sys/file.h>
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 2eeb0a0eae1..ef2818e16ec 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,11 +10,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.27 1999/07/15 22:39:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.28 1999/07/17 20:17:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "storage/smgr.h"
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index a695903a547..5035c8e38bd 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.14 1999/07/15 22:39:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.15 1999/07/17 20:17:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "storage/smgr.h"
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 2e76d7862ed..3e08c726d8f 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.35 1999/07/16 04:59:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.36 1999/07/17 20:17:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,8 +32,6 @@
* versa --- so I think I'll just leave 'em alone for now. tgl 1/99.
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index fa7045a9d97..8bc5b28ee92 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.28 1999/07/16 04:59:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.29 1999/07/17 20:17:50 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -57,7 +57,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 777641477ee..6dfd32f6b10 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.124 1999/07/16 05:23:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.125 1999/07/17 20:17:51 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -17,8 +17,6 @@
*/
#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
#include <signal.h>
#include <time.h>
#include <sys/time.h>
@@ -1496,7 +1494,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.124 $ $Date: 1999/07/16 05:23:18 $\n");
+ puts("$Revision: 1.125 $ $Date: 1999/07/17 20:17:51 $\n");
}
/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 6e08ed82fe6..6307f0cd6a3 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.26 1999/07/16 04:59:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.27 1999/07/17 20:17:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index 8b77db4fa26..d64b874873d 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,12 +11,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.14 1999/07/16 04:59:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.15 1999/07/17 20:17:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdlib.h>
#include "postgres.h"
#include "catalog/catalog.h"
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 9f64a77a3ee..c3fa3396ef6 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.39 1999/07/16 04:59:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.40 1999/07/17 20:17:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "catalog/catalog.h"
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 8e09385ba4f..c604ff85222 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,15 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.46 1999/07/16 05:00:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.47 1999/07/17 20:17:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index 3f2ac134f15..5ed0d4b0270 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.19 1999/07/16 03:13:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.20 1999/07/17 20:17:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index df817569269..0bc44f4b95b 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,11 +9,9 @@
* workings can be found in the book "Software Solutions in C" by
* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.31 1999/07/16 05:00:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.32 1999/07/17 20:17:54 momjian Exp $
*/
-#include <stdio.h>
-#include <string.h>
#include <limits.h>
#include <ctype.h>
#include <locale.h>
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index cbef5655f0c..c3a4746978d 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -8,12 +8,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.25 1999/07/16 05:00:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.26 1999/07/17 20:17:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
-#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index 00924009895..d64ed0cf02d 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.22 1999/07/16 05:00:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.23 1999/07/17 20:17:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,11 +15,6 @@
#include <fcntl.h>
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
-#else
-#include <string.h>
-#endif
#include "catalog/pg_type.h"
#include "fmgr.h"
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index e4255ebeb51..6d98fe6ffff 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.36 1999/07/16 05:00:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.37 1999/07/17 20:17:54 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -24,11 +24,9 @@
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <stdio.h>
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <string.h>
#include "postgres.h"
#ifdef HAVE_FLOAT_H
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index cd1f0327de3..218ee74b962 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.37 1999/07/16 03:13:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.38 1999/07/17 20:17:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <limits.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index 84d33049c5f..3c0d4a53000 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.15 1999/07/15 22:39:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.16 1999/07/17 20:17:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,6 @@
* particular instance of the type and about its value.
*
*/
-#include <string.h>
#include "postgres.h"
#include "utils/datum.h"
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index ba32e0a9743..43da134d97c 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,16 +7,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.75 1999/07/16 05:00:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.76 1999/07/17 20:17:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <ctype.h>
#include <math.h>
-#include <string.h>
#include <sys/types.h>
#include <errno.h>
+
#include "postgres.h"
#ifdef HAVE_FLOAT_H
#include <float.h>
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index b6cefbab1fe..eb705b9f6b4 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,13 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.21 1999/07/16 03:14:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.22 1999/07/17 20:17:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdio.h>
#include <pwd.h>
#include <sys/param.h>
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index e9bbe719895..7738e99a577 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.46 1999/07/16 03:14:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.47 1999/07/17 20:17:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,10 +45,7 @@
* for calls to pow(), exp() since on some machines (my Linux box
* included) these routines do not set errno. - tgl 97/05/10
*/
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
-#include <stdlib.h>
#include <errno.h>
#include <float.h> /* faked on sunos4 */
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index a3f0179212c..7bb2aba7adc 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,16 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.44 1999/07/16 03:14:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.45 1999/07/17 20:17:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <math.h>
#include <limits.h>
#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c
index 45f8978a1ed..c38ecc5a6f2 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.7 1999/07/15 23:03:26 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.8 1999/07/17 20:17:56 momjian Exp $";
#endif
@@ -26,9 +26,6 @@ static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.7 1999/07/15 23:03:26 momj
#include <arpa/inet.h>
#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index f5687f25330..977c7ed4ed5 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.9 1999/07/15 23:03:27 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 1999/07/17 20:17:56 momjian Exp $";
#endif
@@ -28,9 +28,6 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.9 1999/07/15 23:03:27 momj
#include <assert.h>
#include <ctype.h>
#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 1f971ff97a7..3d37054d7cc 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.26 1999/07/16 05:00:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.27 1999/07/17 20:17:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,8 +28,6 @@
* XXX makes massive and possibly unwarranted type promotion assumptions.
* fix me when we figure out what we want to do about ANSIfication...
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#ifdef HAVE_LIMITS_H
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 1c930fb5fab..2e5e4ebf776 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -5,9 +5,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include <time.h>
#include <math.h>
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 9d13b2c42a9..73115522f2a 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -17,7 +17,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "mb/pg_wchar.h"
#include "utils/builtins.h"
@@ -110,7 +109,7 @@ textnlike(struct varlena * s, struct varlena * p)
}
-/* $Revision: 1.29 $
+/* $Revision: 1.30 $
** "like.c" A first attempt at a LIKE operator for Postgres95.
**
** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 631fa75e699..28fa20057e2 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,11 +1,9 @@
/*
* PostgreSQL type definitions for MAC addresses.
*
- * $Id: mac.c,v 1.12 1999/07/15 23:03:27 momjian Exp $
+ * $Id: mac.c,v 1.13 1999/07/17 20:17:57 momjian Exp $
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 4fe29a46d38..13d1e1565dd 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -4,12 +4,10 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nabstime.c,v 1.60 1999/07/16 05:23:19 momjian Exp $
+ * $Id: nabstime.c,v 1.61 1999/07/17 20:17:57 momjian Exp $
*
*/
-#include <stdio.h>
#include <ctype.h>
-#include <string.h>
#include <sys/types.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index b2941d0617e..b4d0a7da728 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,11 +11,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.22 1999/07/16 05:00:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.23 1999/07/17 20:17:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 889fc260c86..92580cfe965 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,15 +3,13 @@
* is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate.
*
- * $Id: network.c,v 1.14 1999/07/15 23:03:27 momjian Exp $
+ * $Id: network.c,v 1.15 1999/07/17 20:17:58 momjian Exp $
* Jon Postel RIP 16 Oct 1998
*/
#include <sys/types.h>
#include <sys/socket.h>
-#include <stdio.h>
-#include <string.h>
#include <errno.h>
#include <netinet/in.h>
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 107824eada5..2ef45f63e42 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.19 1999/07/16 05:00:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.20 1999/07/17 20:17:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,8 +22,7 @@
* columns are ******REALLY****** implemented!!!!!!!!!!!
*
*/
-#include <stdio.h>
-#include <string.h>
+
#include "postgres.h"
#include "access/heapam.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index cfe6beaff76..97a03d23b83 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -5,14 +5,11 @@
*
* 1998 Jan Wieck
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.18 1999/07/15 15:20:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.19 1999/07/17 20:17:58 momjian Exp $
*
* ----------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include <float.h>
#include <math.h>
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index b31dad564ca..c28e2d367be 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,11 +10,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.37 1999/07/16 05:00:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.38 1999/07/17 20:17:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <errno.h>
#include <math.h>
@@ -22,11 +21,6 @@
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "utils/builtins.h"
#ifndef INT_MAX
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 74422d4e3fe..ab53a4e86c0 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,13 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.27 1999/07/16 05:00:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.28 1999/07/17 20:17:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 1861115fcff..082b1dba62a 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.27 1999/07/16 05:00:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.28 1999/07/17 20:17:59 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -27,7 +27,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index bc2fcebc068..754eea3a96e 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.41 1999/07/16 05:00:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.42 1999/07/17 20:17:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/genam.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 53763414f44..8f365f2efbe 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.20 1999/07/15 22:40:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.21 1999/07/17 20:17:59 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -35,13 +35,10 @@
*
**********************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
#include <unistd.h>
#include <fcntl.h>
-#include <string.h>
+#include "postgres.h"
#include "executor/spi.h"
#include "optimizer/clauses.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 2e57e2a1b94..db78c485256 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,16 +12,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.34 1999/07/16 05:00:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.35 1999/07/17 20:17:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
-
#include "access/heapam.h"
#include "catalog/catname.h"
#include "catalog/pg_statistic.h"
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 15084778a49..05bc16b92af 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,12 +9,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.24 1999/07/16 05:00:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.25 1999/07/17 20:18:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 383dcbbdd9c..9e4b81ec095 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,17 +7,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.10 1999/07/16 03:14:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.11 1999/07/17 20:18:00 momjian Exp $
*
* NOTES
* input routine largely stolen from boxin().
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
-#include "postgres.h"
+#include "postgres.h"
#include "utils/builtins.h"
#define LDELIM '('
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 4ad2ab3dea7..cdbac4c7f13 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1,7 +1,6 @@
-#include <stdio.h>
-#include <string.h>
#include <time.h>
#include <ctype.h>
+
#include "postgres.h"
#include "access/xact.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 7fa2480acd9..8d27a1ca6d8 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.53 1999/07/17 16:25:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.54 1999/07/17 20:18:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "access/htup.h"
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 94011f04fa1..08eac37460a 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.52 1999/07/16 05:00:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.53 1999/07/17 20:18:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
index a756a2ca9c8..2d4dd5cf273 100644
--- a/src/backend/utils/adt/version.c
+++ b/src/backend/utils/adt/version.c
@@ -5,12 +5,11 @@
*
* IDENTIFICATION
*
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.8 1999/07/15 15:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.9 1999/07/17 20:18:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "version.h"
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 137d3ceed47..f6ef0fecac2 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.47 1999/07/16 05:00:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.48 1999/07/17 20:18:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/genam.h"
#include "access/heapam.h"
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 312b9257173..33ba637b13c 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,16 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.25 1999/07/16 05:00:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.26 1999/07/17 20:18:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#include "catalog/pg_language.h"
#include "catalog/pg_proc.h"
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 871699ee7d7..07583a4b72a 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,13 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.30 1999/07/16 05:23:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.31 1999/07/17 20:18:01 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 4e147035606..b6802d71f73 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.66 1999/07/16 05:23:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.67 1999/07/17 20:18:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,11 +30,9 @@
*
*/
#include <sys/types.h>
-#include <stdio.h>
#include <errno.h>
#include <sys/file.h>
#include <fcntl.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index be33936a7eb..3a7f524ccce 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.30 1999/07/16 05:23:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.31 1999/07/17 20:18:02 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
@@ -17,7 +17,6 @@
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 54ca5844584..015737d4b77 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.9 1999/07/16 05:23:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.10 1999/07/17 20:18:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,8 +22,6 @@
*/
#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 0f7b6eb8a6c..a642203e0ca 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,14 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.15 1999/07/16 03:14:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.16 1999/07/17 20:18:03 momjian Exp $
*
* NOTE
* This should eventually work with elog(), dlog(), etc.
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <unistd.h>
#include "postgres.h"
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 06dad245db5..05679545700 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,19 +7,16 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.46 1999/07/16 05:23:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.47 1999/07/17 20:18:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <time.h>
#include <fcntl.h>
#ifndef O_RDONLY
#include <sys/file.h>
#endif /* O_RDONLY */
#include <sys/types.h>
-#include <stdarg.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index bc246eedf58..d15715a8e67 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.27 1999/07/16 05:23:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.28 1999/07/17 20:18:04 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -15,9 +15,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <errno.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 0f64a0c9098..99a9c0004d5 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13 1999/06/19 05:00:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.14 1999/07/17 20:18:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdarg.h>
#include "postgres.h"
#define FormMaxSize 1024
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index c6772ae7c59..d48d8b8840a 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,14 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.30 1999/07/16 23:05:45 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.31 1999/07/17 20:18:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 7575ae7d863..6b95c4c11e3 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.31 1999/07/16 05:23:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.32 1999/07/17 20:18:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
#include "postgres.h"
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 4d9b339cd84..5e7fcd0fdfa 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.26 1999/07/16 05:23:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.27 1999/07/17 20:18:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,9 +39,8 @@
* Modified by sullivan@postgres.berkeley.edu April 1990
* changed ctl structure for shared memory
*/
-#include <stdio.h>
#include <sys/types.h>
-#include <string.h>
+
#include "postgres.h"
#include "utils/dynahash.h"
#include "utils/hsearch.h"
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 34f0966b8a7..4541023f192 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.9 1999/02/13 23:19:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.10 1999/07/17 20:18:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
#include "utils/hsearch.h"
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index baef1f6fffd..fc22d0da2d2 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -6,14 +6,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.15 1999/07/16 03:14:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.16 1999/07/17 20:18:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <grp.h>
#include <pwd.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index ae27be31ba3..1cde72e6b2f 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.35 1999/07/16 05:23:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.36 1999/07/17 20:18:08 momjian Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -16,8 +16,6 @@
*-------------------------------------------------------------------------
*/
#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
#include <sys/file.h>
#include <sys/types.h>
#include <math.h>
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 0198850d295..88baaf4a891 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,24 +7,19 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.33 1999/07/16 05:23:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.34 1999/07/17 20:18:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
-#include <stdio.h>
#include <unistd.h>
#include <grp.h>
#include <pwd.h>
#include "postgres.h"
-
-
-
#include "catalog/catname.h"
#include "catalog/pg_shadow.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 022866b0a43..4118fe16a18 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.47 1999/07/17 16:25:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.48 1999/07/17 20:18:08 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -27,8 +27,6 @@
*-------------------------------------------------------------------------
*/
#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
#include <sys/file.h>
#include <sys/types.h>
#include <math.h>
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index aa5b01ad569..a63cd37332d 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -3,10 +3,8 @@
* client encoding and server internal encoding.
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
- * $Id: mbutils.c,v 1.7 1999/07/17 16:25:26 momjian Exp $ */
+ * $Id: mbutils.c,v 1.8 1999/07/17 20:18:10 momjian Exp $ */
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index eb097e1b810..39270f35c0c 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.27 1999/07/16 05:23:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.28 1999/07/17 20:18:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c
index 27fbf486cc2..baf8ce61218 100644
--- a/src/backend/utils/misc/trace.c
+++ b/src/backend/utils/misc/trace.c
@@ -9,9 +9,6 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
#include <unistd.h>
#include <signal.h>
#include <sys/time.h>
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index bb5dedd6854..28f4417525d 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.19 1999/07/16 05:23:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.20 1999/07/17 20:18:13 momjian Exp $
*
* NOTE:
* This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -21,14 +21,8 @@
* Jan Wieck
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include "postgres.h"
#include "utils/memutils.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
#undef AllocSetReset
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 6a5f32b19e8..6954452ce75 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,11 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.18 1999/07/16 05:23:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.19 1999/07/17 20:18:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include "postgres.h"
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 4eb27ccbc6f..5b2cc419e84 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,16 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.13 1999/07/15 15:20:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.14 1999/07/17 20:18:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
#include "postgres.h"
-
#include "nodes/memnodes.h"
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 606e5839edb..a49dca40b6a 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.27 1999/07/16 05:23:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.28 1999/07/17 20:18:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -73,13 +73,9 @@
* PortalHeapMemory y y y *
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h"
-
-
#include "lib/hasht.h"
#include "utils/module.h"
#include "utils/portal.h"
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index afabb4165f3..7f521b821f4 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,12 +8,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.18 1999/07/16 05:23:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.19 1999/07/17 20:18:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdio.h>
#include "postgres.h"
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 40805818a70..b1ac2528075 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: psort.c,v 1.55 1999/07/16 05:23:30 momjian Exp $
+ * $Id: psort.c,v 1.56 1999/07/17 20:18:16 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -30,9 +30,7 @@
* MAXMERGE, MAXTAPES
*
*/
-#include <stdio.h>
#include <math.h>
-#include <string.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index d0737b4b114..73aae724a3d 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.32 1999/05/27 16:29:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.33 1999/07/17 20:18:18 momjian Exp $
*
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
*
@@ -19,9 +19,6 @@
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
#ifdef solaris_sparc
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index f7e4ad21c03..c1597d7f26c 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.116 1999/07/15 15:20:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.117 1999/07/17 20:18:18 momjian Exp $
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
@@ -51,10 +51,7 @@
*-------------------------------------------------------------------------
*/
-#include <stdlib.h>
#include <unistd.h> /* for getopt() */
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
#ifdef solaris_sparc
diff --git a/src/bin/pg_encoding/pg_encoding.c b/src/bin/pg_encoding/pg_encoding.c
index a6b16e0d6f4..e03005338a7 100644
--- a/src/bin/pg_encoding/pg_encoding.c
+++ b/src/bin/pg_encoding/pg_encoding.c
@@ -7,12 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.3 1999/02/13 23:20:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.4 1999/07/17 20:18:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdlib.h>
-#include <stdio.h>
#include "postgres.h"
#include "mb/pg_wchar.h"
diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c
index 4acdc3054b2..001ce9a7720 100644
--- a/src/bin/pg_passwd/pg_passwd.c
+++ b/src/bin/pg_passwd/pg_passwd.c
@@ -1,15 +1,7 @@
/*
* @(#) pg_passwd.c 1.8 09:13:16 97/07/02 Y. Ichikawa
*/
-#include <stdio.h>
-#include <stdlib.h>
-
#include "postgres.h"
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
#include <unistd.h>
#include <errno.h>
#include <time.h>
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index e0108ba65cb..5b042bdab6b 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,13 +7,10 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.182 1999/06/04 21:21:13 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.183 1999/07/17 20:18:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
@@ -29,6 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>
+
#include "postgres.h"
#include "libpq-fe.h"
#include "pqsignal.h"
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index bf6bece7dab..f3cedd39a68 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -7,14 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.16 1999/02/13 23:20:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.17 1999/07/17 20:18:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
-#include <stdlib.h>
#include "postgres.h"
#ifndef HAVE_STRDUP
diff --git a/src/include/c.h b/src/include/c.h
index 1fd1aa0421e..174d20cb1c4 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.60 1999/07/17 04:12:09 momjian Exp $
+ * $Id: c.h,v 1.61 1999/07/17 20:18:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,7 +50,9 @@
#include "config.h"
+#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#ifdef STDC_HEADERS
#include <stddef.h>
#include <stdarg.h>
@@ -789,12 +791,14 @@ extern char *vararg_format(const char *fmt,...);
#ifndef HAVE_SNPRINTF
extern int snprintf(char *str, size_t count, const char *fmt,...);
-
#endif
#ifndef HAVE_VSNPRINTF
extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+#endif
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
#endif
/* ----------------
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 20ce01a2501..a23c81227e6 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,14 +6,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: executor.h,v 1.36 1999/07/15 23:03:47 momjian Exp $
+ * $Id: executor.h,v 1.37 1999/07/17 20:18:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef EXECUTOR_H
#define EXECUTOR_H
-#include <stdio.h>
#include "executor/execdesc.h"
/* ----------------
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 80af87f16a4..9c5f8d5cfc2 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -8,7 +8,6 @@
#ifndef SPI_H
#define SPI_H
-#include <string.h>
#include "postgres.h"
/*
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index fe979ebdd56..9b38673d41e 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,14 +7,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $
+ * $Id: libpq-be.h,v 1.16 1999/07/17 20:18:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef LIBPQ_BE_H
#define LIBPQ_BE_H
-#include <stdio.h>
#include <sys/types.h>
#include "libpq/hba.h"
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 31a2db54222..d9481970372 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -8,7 +8,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.37 1999/07/15 23:03:50 momjian Exp $
+ * $Id: pqcomm.h,v 1.38 1999/07/17 20:18:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,6 @@
#include "postgres.h"
-#include <stdio.h>
#include <sys/types.h>
#ifdef WIN32
#include "winsock.h"
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index abb6398a70a..434b90fae21 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $
+ * $Id: geqo_misc.h,v 1.13 1999/07/17 20:18:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,8 +21,6 @@
#ifndef GEQO_MISC_H
#define GEQO_MISC_H
-#include <stdio.h>
-
#include "optimizer/geqo_recombination.h"
#include "nodes/relation.h"
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index de36c6ffb56..bf51a8b8e74 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -37,7 +37,7 @@
* @(#)utils.h 8.3 (Berkeley) 3/20/94
*/
-#include "config.h" /* HAVE_MEMMOVE */
+#include "config.h"
/* utility definitions */
#define DUPMAX 100000000 /* xxx is this right? */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index c434d1beec4..195401e23fc 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,14 +6,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufmgr.h,v 1.28 1999/07/15 23:04:09 momjian Exp $
+ * $Id: bufmgr.h,v 1.29 1999/07/17 20:18:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef BUFMGR_H
#define BUFMGR_H
-#include <stdio.h>
#include "storage/ipc.h"
#include "storage/block.h"
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 361b8c15ebc..beb93bf699c 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: fd.h,v 1.16 1999/05/26 12:56:53 momjian Exp $
+ * $Id: fd.h,v 1.17 1999/07/17 20:18:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,8 +38,6 @@
#ifndef FD_H
#define FD_H
-#include <stdio.h>
-
/*
* FileSeek uses the standard UNIX lseek(2) flags.
*/
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index ed4705184db..f31c9d385d0 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $
+ * $Id: array.h,v 1.20 1999/07/17 20:18:35 momjian Exp $
*
* NOTES
* XXX the data array should be LONGALIGN'd -- notice that the array
@@ -22,7 +22,6 @@
#ifndef ARRAY_H
#define ARRAY_H
-#include <stdio.h>
#include "utils/memutils.h"
typedef struct
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index 71154579f5c..4598c2ab86c 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,15 +6,13 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $
+ * $Id: lselect.h,v 1.14 1999/07/17 20:18:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef LSELECT_H
#define LSELECT_H
-#include <stdio.h>
-
#include "utils/syscache.h"
struct leftist
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 43941fd6481..63f9b137c46 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -13,7 +13,6 @@
#ifdef linux
-#include <stdio.h>
#include <string.h>
extern char *ps_status_buffer;
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index dcfaf16e95f..4bcdee3ae57 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -12,10 +12,8 @@
#ifndef TRACE_H
#define TRACE_H
-#include <stdio.h>
#include <string.h>
#include <time.h>
-#include <stdarg.h>
#ifdef ELOG_TIMESTAMPS
char *tprintf_timestamp(void);
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 9a8b94bd256..4d04c00dd9c 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -6,7 +6,6 @@
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index aa6c2c274b3..6bfabd338de 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -4,7 +4,6 @@
#include "postgres.h"
-#include <stdio.h>
#if HAVE_GETOPT_H
#include <getopt.h>
#else
@@ -12,12 +11,6 @@
extern int optind;
extern char *optarg;
-#endif
-#include <stdlib.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
#endif
#include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 8ecd9a92e9f..c5c2f936527 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -6,7 +6,6 @@
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 70865ff3ee4..fe72134a98a 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,12 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.15 1999/07/15 15:21:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.16 1999/07/17 20:18:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
-#include <string.h>
#include "postgres.h"
#include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 1585e395b0c..493d6e3c706 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1,24 +1,15 @@
/* This is a modified version of src/backend/parser/scan.l */
%{
-#include "config.h"
-
#include <ctype.h>
#include <sys/types.h>
#include <limits.h>
+#include <errno.h>
+#include "postgres.h"
#ifndef PATH_MAX
#include <sys/param.h>
#define PATH_MAX MAXPATHLEN
#endif
-
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <errno.h>
-
-#include "postgres.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
#include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index ff1f9907f9c..04b27c5f1fe 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,9 +1,5 @@
/* Copyright comment */
%{
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
#include "postgres.h"
#include "access/htup.h"
#include "catalog/catname.h"
diff --git a/src/interfaces/libpgtcl/pgtcl.c b/src/interfaces/libpgtcl/pgtcl.c
index 0a8f3265a8f..724a69b3691 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -9,13 +9,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.15 1999/05/25 22:43:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.16 1999/07/17 20:18:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdlib.h>
-
#include "postgres.h"
#include "libpgtcl.h"
#include "pgtclCmds.h"
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index e8a1e09ef50..dbe81771b3b 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,14 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.44 1999/05/25 22:43:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.45 1999/07/17 20:18:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include "postgres.h"
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index 2dee00573fb..1efd6bf7968 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -12,13 +12,11 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.20 1999/05/25 22:43:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.21 1999/07/17 20:18:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#include "postgres.h"
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 534e8eda58d..62f5ad4f8eb 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.29 1999/05/25 16:15:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.30 1999/07/17 20:18:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,7 +33,6 @@
#ifdef WIN32
#include "win32.h"
#else
-#include <string.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index aac11463522..8f7540d57e6 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.98 1999/06/17 15:16:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.99 1999/07/17 20:18:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,6 @@
#include "fe-auth.h"
#include "postgres.h"
-#include <stdlib.h>
#ifdef WIN32
#include "win32.h"
#else
@@ -28,7 +27,6 @@
#include <netinet/tcp.h>
#endif
#include <fcntl.h>
-#include <string.h>
#include <errno.h>
#include <ctype.h> /* for isspace() */
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 446a70c821a..1ca2440c635 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.81 1999/05/28 01:54:53 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.82 1999/07/17 20:18:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,8 +22,6 @@
#include <unistd.h>
#endif
#endif
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#include <ctype.h>
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index e618615d140..b5757a0b9fe 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.20 1999/05/10 00:46:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.21 1999/07/17 20:18:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,6 @@
#include <unistd.h>
#endif
#endif
-#include <string.h>
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index a16b89e5c3a..d31ee45647d 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -24,18 +24,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.25 1999/05/28 01:54:53 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.26 1999/07/17 20:18:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "libpq-fe.h"
#include "libpq-int.h"
+
#include "postgres.h"
#include "pqsignal.h"
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#include <signal.h>
#include <time.h>
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index d5793af0852..1b8c73b07fc 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -9,7 +9,7 @@
* didn't really belong there.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.23 1999/05/25 16:15:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.24 1999/07/17 20:18:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,9 +31,7 @@
#include <termios.h>
#endif
#endif /* WIN32 */
-#include <stdlib.h>
#include <signal.h>
-#include <string.h>
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index 2d0a57cd2d0..9d0573bcd7f 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -3,7 +3,7 @@
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.3 1999/01/27 16:15:22 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.4 1999/07/17 20:18:47 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -37,8 +37,6 @@
#ifndef PLPGSQL_H
#define PLPGSQL_H
-#include <stdio.h>
-#include <stdarg.h>
#include "postgres.h"
#include "executor/spi.h"
#include "commands/trigger.h"
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index cb5d35bacf6..da19fa49aae 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -26,8 +26,6 @@ tuple 1: got
*
*/
-#include <stdio.h>
-#include <string.h>
#include "postgres.h" /* -> "c.h" -> int16, in access/attnum.h */
#include "libpq-fe.h"
#include "utils/geo_decls.h" /* for the POLYGON type */
diff --git a/src/test/locale/test-pgsql-locale.c b/src/test/locale/test-pgsql-locale.c
index 560962a6129..8369e671ddd 100644
--- a/src/test/locale/test-pgsql-locale.c
+++ b/src/test/locale/test-pgsql-locale.c
@@ -1,5 +1,4 @@
-#include <stdio.h>
#include "postgres.h"
int
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 6cfa26017e4..3f3b0ede4bc 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,12 +1,10 @@
/*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.32 1999/05/25 16:15:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.33 1999/07/17 20:18:52 momjian Exp $
*/
#include <float.h> /* faked on sunos */
-#include <stdio.h>
-#include <string.h> /* for MemSet() */
-#include <postgres.h>
+#include "postgres.h"
#include "utils/geo_decls.h" /* includes <math.h> */
#include "executor/executor.h" /* For GetAttributeByName */
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index b44bbc067da..0a8f1408271 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -4,9 +4,6 @@
format for these routines is dictated by Postgres architecture.
******************************************************************************/
-#include <stdio.h>
-/* do not include libpq-fe.h for backend-loaded functions*/
-/* #include "libpq-fe.h" */
#include "postgres.h"
typedef struct Complex
diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index 8da815c2fef..5cb8d95c736 100644
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -6,8 +6,6 @@
SQL statement that binds them to the backend.
*****************************************************************************/
-#include <string.h>
-#include <stdio.h>
#include "postgres.h" /* for variable length type */
#include "executor/executor.h" /* for GetAttributeByName() */
#include "utils/geo_decls.h" /* for point type */
diff --git a/src/utils/version.c b/src/utils/version.c
index 9ed16feb60c..2284093eab8 100644
--- a/src/utils/version.c
+++ b/src/utils/version.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.11 1999/02/13 23:22:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.12 1999/07/17 20:18:55 momjian Exp $
*
* NOTES
* XXX eventually, should be able to handle version identifiers
@@ -22,8 +22,6 @@
#include <fcntl.h> /* For open() flags */
#include <sys/stat.h>
#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
#include <unistd.h>
#include <errno.h>
--
GitLab