From 173c555948b9002b3b899d7331682e8812d171dc Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 8 Oct 1998 18:30:52 +0000
Subject: [PATCH] Make functions static or ifdef NOT_USED.  Prevent pg_version
 creation.

---
 src/backend/access/common/heaptuple.c |  4 ++-
 src/backend/access/heap/heapam.c      |  6 ++--
 src/backend/access/index/genam.c      |  8 ++---
 src/backend/access/transam/xact.c     |  4 +--
 src/backend/access/transam/xid.c      |  4 ++-
 src/backend/catalog/Makefile          |  4 +--
 src/backend/commands/variable.c       | 56 ++++++++++++++++++++++++-----------
 src/backend/executor/execTuples.c     |  6 ++--
 src/backend/executor/nodeTee.c        |  4 ++-
 src/backend/optimizer/plan/setrefs.c  |  5 ++--
 src/backend/optimizer/util/plancat.c  |  5 +++-
 src/backend/parser/gram.c             |  6 ++--
 src/backend/parser/gram.y             |  6 ++--
 src/backend/parser/parse_coerce.c     |  6 ++--
 src/backend/parser/parse_func.c       |  6 ++--
 src/backend/parser/parse_oper.c       |  7 +++--
 src/backend/parser/parse_target.c     |  6 ++--
 src/backend/parser/parse_type.c       |  4 ++-
 src/backend/parser/scan.c             |  8 ++---
 src/backend/parser/scan.l             |  6 ++--
 src/backend/rewrite/rewriteManip.c    |  7 ++++-
 src/backend/storage/buffer/bufmgr.c   |  7 +++--
 src/backend/storage/lmgr/lock.c       |  4 ++-
 src/backend/storage/lmgr/multi.c      |  4 ++-
 src/backend/storage/smgr/smgr.c       |  7 ++++-
 src/backend/utils/adt/date.c          |  4 ++-
 src/backend/utils/adt/dt.c            | 11 ++++---
 src/backend/utils/adt/nabstime.c      |  5 ++--
 src/backend/utils/adt/name.c          |  4 ++-
 src/backend/utils/adt/varlena.c       |  8 +++--
 src/backend/utils/fmgr/dfmgr.c        |  5 ++--
 src/backend/utils/init/miscinit.c     |  7 +++--
 src/include/access/genam.h            |  4 +--
 src/include/access/heapam.h           |  4 +--
 src/include/access/xact.h             |  4 +--
 src/include/commands/variable.h       | 30 +------------------
 src/include/executor/executor.h       |  4 +--
 src/include/executor/nodeTee.h        |  3 +-
 src/include/miscadmin.h               |  5 +---
 src/include/optimizer/plancat.h       |  3 +-
 src/include/optimizer/planmain.h      |  3 +-
 src/include/parser/parse_coerce.h     |  3 +-
 src/include/parser/parse_func.h       |  5 +---
 src/include/parser/parse_type.h       |  3 +-
 src/include/rewrite/rewriteManip.h    |  5 +---
 src/include/storage/bufmgr.h          |  4 +--
 src/include/storage/lock.h            |  3 +-
 src/include/storage/multilev.h        |  3 +-
 src/include/storage/smgr.h            |  3 +-
 src/include/utils/builtins.h          |  5 +---
 src/include/utils/dt.h                |  6 +---
 src/include/utils/nabstime.h          |  3 +-
 52 files changed, 173 insertions(+), 164 deletions(-)

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index f7b53083e4..1659484434 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.44 1998/09/07 05:35:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.45 1998/10/08 18:29:10 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -274,6 +274,7 @@ heap_sysattrbyval(AttrNumber attno)
 	return byval;
 }
 
+#ifdef NOT_USED
 /* ----------------
  *		heap_getsysattr
  * ----------------
@@ -300,6 +301,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 	}
 	return (Datum) NULL;
 }
+#endif
 
 /* ----------------
  *		nocachegetattr
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 3b66dd57b2..b0500c9b6a 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.35 1998/09/01 04:26:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.36 1998/10/08 18:29:12 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -96,6 +96,8 @@
 #include <string.h>
 #endif
 
+static void doinsert(Relation relation, HeapTuple tup);
+
 static bool ImmediateInvalidation;
 
 /* ----------------------------------------------------------------
@@ -475,7 +477,7 @@ heapgettup(Relation relation,
 	}
 }
 
-void
+static void
 doinsert(Relation relation, HeapTuple tup)
 {
 	RelationPutHeapTupleAtEnd(relation, tup);
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index d4de958218..6e270913db 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.14 1998/09/01 03:21:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.15 1998/10/08 18:29:14 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -167,9 +167,6 @@ IndexScanRestart(IndexScanDesc scan,
 				scan->numberOfKeys * sizeof(ScanKeyData));
 }
 
-#endif
-
-#ifdef NOT_USED
 /* ----------------
  *	IndexScanEnd -- End and index scan.
  *
@@ -192,7 +189,6 @@ IndexScanEnd(IndexScanDesc scan)
 	pfree(scan);
 }
 
-#endif
 
 /* ----------------
  *	IndexScanMarkPosition -- Mark current position in a scan.
@@ -274,3 +270,5 @@ IndexScanRestorePosition(IndexScanDesc scan)
 
 	scan->flags = 0x0;			/* XXX should have a symbolic name */
 }
+#endif
+
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 24db5befb9..35bcbfed6a 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.24 1998/10/06 02:39:58 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.25 1998/10/08 18:29:15 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -262,7 +262,6 @@ SetTransactionFlushEnabled(bool state)
 	TransactionFlushState = (state == true);
 }
 
-#endif
 
 /* --------------------------------
  *		IsTransactionState
@@ -297,6 +296,7 @@ IsTransactionState(void)
 	 */
 	return false;
 }
+#endif
 
 /* --------------------------------
  *		IsAbortedTransactionBlockState
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 60bd7e774f..4f4692a36d 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.17 1998/09/01 03:21:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -53,6 +53,7 @@ xidout(TransactionId transactionId)
 
 }
 
+#ifdef NOT_USED
 /* ----------------------------------------------------------------
  *		TransactionIdIsLessThan
  * ----------------------------------------------------------------
@@ -62,6 +63,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
 {
 	return (bool) (id1 < id2);
 }
+#endif
 
 /* ----------------------------------------------------------------
  *		xideq
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 80c90e7a15..6d5d26a143 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for catalog
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.13 1998/08/25 04:19:14 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.14 1998/10/08 18:29:19 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
 
 LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
                  pg_proc.h pg_type.h pg_attribute.h pg_class.h \
-                 pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
+                 pg_inherits.h pg_index.h pg_statistic.h \
                  pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
                  pg_language.h pg_parg.h \
                  pg_aggregate.h pg_ipl.h pg_inheritproc.h \
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 9cd2c5d699..a5dcf6c257 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.13 1998/09/03 02:34:29 momjian Exp $
+ * $Id: variable.c,v 1.14 1998/10/08 18:29:20 momjian Exp $
  *
  */
 
@@ -19,6 +19,28 @@
 #include "mb/pg_wchar.h"
 #endif
 
+static bool show_date(void);
+static bool reset_date(void);
+static bool parse_date(const char *);
+static bool show_timezone(void);
+static bool reset_timezone(void);
+static bool parse_timezone(const char *);
+static bool show_cost_heap(void);
+static bool reset_cost_heap(void);
+static bool parse_cost_heap(const char *);
+static bool show_cost_index(void);
+static bool reset_cost_index(void);
+static bool parse_cost_index(const char *);
+static bool show_r_plans(void);
+static bool reset_r_plans();
+static bool parse_r_plans(const char *);
+static bool reset_geqo(void);
+static bool show_geqo(void);
+static bool parse_geqo(const char *);
+static bool show_ksqo(void);
+static bool reset_ksqo(void);
+static bool parse_ksqo(const char *);
+
 extern Cost _cpu_page_wight_;
 extern Cost _cpu_index_page_wight_;
 extern bool _use_geqo_;
@@ -128,7 +150,7 @@ get_token(char **tok, char **val, const char *str)
 }
 
 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_geqo(const char *value)
 {
 	const char *rest;
@@ -175,7 +197,7 @@ parse_geqo(const char *value)
 	return TRUE;
 }
 
-bool
+static bool
 show_geqo()
 {
 
@@ -186,7 +208,7 @@ show_geqo()
 	return TRUE;
 }
 
-bool
+static bool
 reset_geqo(void)
 {
 
@@ -199,7 +221,7 @@ reset_geqo(void)
 	return TRUE;
 }
 
-bool
+static bool
 parse_r_plans(const char *value)
 {
 	if (value == NULL)
@@ -219,7 +241,7 @@ parse_r_plans(const char *value)
 }
 
 /*-----------------------------------------------------------------------*/
-bool
+static bool
 show_r_plans()
 {
 
@@ -230,7 +252,7 @@ show_r_plans()
 	return TRUE;
 }
 
-bool
+static bool
 reset_r_plans()
 {
 
@@ -243,7 +265,7 @@ reset_r_plans()
 }
 
 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_cost_heap(const char *value)
 {
 	float32		res;
@@ -268,7 +290,7 @@ show_cost_heap()
 	return TRUE;
 }
 
-bool
+static bool
 reset_cost_heap()
 {
 	_cpu_page_wight_ = _CPU_PAGE_WEIGHT_;
@@ -276,7 +298,7 @@ reset_cost_heap()
 }
 
 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_cost_index(const char *value)
 {
 	float32		res;
@@ -301,7 +323,7 @@ show_cost_index()
 	return TRUE;
 }
 
-bool
+static bool
 reset_cost_index()
 {
 	_cpu_index_page_wight_ = _CPU_INDEX_PAGE_WEIGHT_;
@@ -309,7 +331,7 @@ reset_cost_index()
 }
 
 /*-----------------------------------------------------------------------*/
-bool
+static bool
 parse_date(const char *value)
 {
 	char	   *tok;
@@ -379,7 +401,7 @@ parse_date(const char *value)
 	return TRUE;
 }
 
-bool
+static bool
 show_date()
 {
 	char		buf[64];
@@ -431,7 +453,7 @@ static char tzbuf[64];
  * Try to save existing TZ environment variable for later use in RESET TIME ZONE.
  * - thomas 1997-11-10
  */
-bool
+static bool
 parse_timezone(const char *value)
 {
 	char	   *tok;
@@ -468,7 +490,7 @@ parse_timezone(const char *value)
 	return TRUE;
 }	/* parse_timezone() */
 
-bool
+static bool
 show_timezone()
 {
 	char	   *tz;
@@ -625,7 +647,7 @@ indexes when multiple ORs are specified in the where clause.
 See optimizer/prep/prepkeyset.c for more on this.
 	daveh@insightdist.com    6/16/98
 -----------------------------------------------------------------------*/
-bool
+static bool
 parse_ksqo(const char *value)
 {
 	if (value == NULL)
@@ -644,7 +666,7 @@ parse_ksqo(const char *value)
 	return TRUE;
 }
 
-bool
+static bool
 show_ksqo()
 {
 
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 9517b731b2..a0fe00bed3 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.20 1998/09/01 03:22:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.21 1998/10/08 18:29:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -446,7 +446,6 @@ ExecSlotPolicy(TupleTableSlot *slot)	/* slot to inspect */
 	return slot->ttc_shouldFree;
 }
 
-#endif
 
 /* --------------------------------
  *		ExecSetSlotPolicy
@@ -468,6 +467,7 @@ ExecSetSlotPolicy(TupleTableSlot *slot, /* slot to change */
 
 	return old_shouldFree;
 }
+#endif
 
 /* --------------------------------
  *		ExecSlotDescriptor
@@ -638,6 +638,7 @@ ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate)
 	commonscanstate->css_ScanTupleSlot = (TupleTableSlot *) slot;
 }
 
+#ifdef NOT_USED
 /* ----------------
  *		ExecInitMarkedTupleSlot
  * ----------------
@@ -649,6 +650,7 @@ ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate)
 	INIT_SLOT_ALLOC;
 	mergestate->mj_MarkedTupleSlot = (TupleTableSlot *) slot;
 }
+#endif
 
 /* ----------------
  *		ExecInitOuterTupleSlot
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index 9a39e649a9..623a43b9e0 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
  *		ExecEndTee
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.23 1998/09/01 04:28:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.24 1998/10/08 18:29:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -420,6 +420,7 @@ ExecTee(Tee *node, Plan *parent)
 	return result;
 }
 
+#ifdef NOT_USED
 /* ----------------------------------------------------------------
  *		ExecTeeReScan(node)
  *
@@ -462,6 +463,7 @@ ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent)
 		}
 	}
 }
+#endif
 
 
 /* ---------------------------------------------------------------------
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 72c5bc66fe..488fd2b9e3 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.27 1998/09/09 03:48:02 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.28 1998/10/08 18:29:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,6 +46,7 @@ static void replace_result_clause(Node *clause, List *subplanTargetList);
 static bool OperandIsInner(Node *opnd, int inner_relid);
 static List *replace_agg_clause(Node *expr, List *targetlist);
 static Node *del_agg_clause(Node *clause);
+static void set_result_tlist_references(Result *resultNode);
 
 /*****************************************************************************
  *
@@ -522,7 +523,7 @@ tlist_temp_references(Oid tempid,
  *	2) this routine will probably *NOT* work with nested dot
  *	   fields....
  */
-void
+static void
 set_result_tlist_references(Result *resultNode)
 {
 	Plan	   *subplan;
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index a27989184f..f7e4ea456c 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.22 1998/09/23 04:22:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.23 1998/10/08 18:29:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -423,6 +423,7 @@ find_inheritance_children(Oid inhparent)
 	return list;
 }
 
+#ifdef NOT_USED
 /*
  * VersionGetParents--
  *
@@ -461,6 +462,8 @@ VersionGetParents(Oid verrelid)
 	heap_close(relation);
 	return list;
 }
+#endif
+
 
 /*****************************************************************************
  *
diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index 76e80c6d71..38ded341b2 100644
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -229,7 +229,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.40 1998/10/03 05:40:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.41 1998/10/08 18:29:33 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -288,7 +288,7 @@ static char *xlateSqlFunc(char *);
 static char *xlateSqlType(char *);
 static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
 static Node *makeRowExpr(char *opr, List *largs, List *rargs);
-void mapTargetColumns(List *source, List *target);
+static void mapTargetColumns(List *source, List *target);
 static List *makeConstantList( A_Const *node);
 static char *FlattenStringList(List *list);
 static char *fmtId(char *rawid);
@@ -10636,7 +10636,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
 	return expr;
 }
 
-void
+static void
 mapTargetColumns(List *src, List *dst)
 {
 	ColumnDef *s;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 05366b6cbf..2b330b2b06 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.34 1998/10/02 16:23:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.35 1998/10/08 18:29:41 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -69,7 +69,7 @@ static char *xlateSqlFunc(char *);
 static char *xlateSqlType(char *);
 static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
 static Node *makeRowExpr(char *opr, List *largs, List *rargs);
-void mapTargetColumns(List *source, List *target);
+static void mapTargetColumns(List *source, List *target);
 static List *makeConstantList( A_Const *node);
 static char *FlattenStringList(List *list);
 static char *fmtId(char *rawid);
@@ -4837,7 +4837,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
 	return expr;
 }
 
-void
+static void
 mapTargetColumns(List *src, List *dst)
 {
 	ColumnDef *s;
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index d91de78565..1a34e4ea58 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.7 1998/10/01 22:45:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.8 1998/10/08 18:29:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,8 @@
 Oid			DemoteType(Oid inType);
 Oid			PromoteTypeToNext(Oid inType);
 
+static Oid PreferredType(CATEGORY category, Oid type);
+
 
 /* coerce_type()
  * Convert a function argument to a different type.
@@ -347,7 +349,7 @@ IsPreferredType(CATEGORY category, Oid type)
 /* PreferredType()
  * Return the preferred type OID for the specified category.
  */
-Oid
+static Oid
 PreferredType(CATEGORY category, Oid type)
 {
 	Oid			result;
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 9428d55a0f..dc533d1dbd 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.29 1998/09/25 13:36:04 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.30 1998/10/08 18:29:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,6 +74,8 @@ static int match_argtypes(int nargs,
 			   CandidateList *candidates);
 static List *setup_tlist(char *attname, Oid relid);
 static List *setup_base_tlist(Oid typeid);
+static Oid *func_select_candidate(int nargs, Oid *input_typeids,
+				CandidateList candidates);
 
 #define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false)
 
@@ -626,7 +628,7 @@ match_argtypes(int nargs,
  * But for now, return NULL and make the user give a better hint.
  * - thomas 1998-03-17
  */
-Oid *
+static Oid *
 func_select_candidate(int nargs,
 					  Oid *input_typeids,
 					  CandidateList candidates)
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 5e4683230d..7719e517ac 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.19 1998/09/25 13:36:07 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.20 1998/10/08 18:29:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,8 @@
 #include "storage/bufmgr.h"
 #include "utils/syscache.h"
 
-Oid * oper_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates);
+static Oid * oper_select_candidate(int nargs, Oid *input_typeids,
+							CandidateList candidates);
 static int binary_oper_get_candidates(char *opname,
 						   Oid leftTypeId,
 						   Oid rightTypeId,
@@ -169,7 +170,7 @@ binary_oper_get_candidates(char *opname,
  * some sense. (see equivalentOpersAfterPromotion for details.)
  * - ay 6/95
  */
-Oid *
+static Oid *
 oper_select_candidate(int nargs,
 					  Oid *input_typeids,
 					  CandidateList candidates)
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index d811386b07..f05764e765 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.29 1998/09/25 13:36:08 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.30 1998/10/08 18:29:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,7 @@
 static List *ExpandAllTables(ParseState *pstate);
 static char *FigureColname(Node *expr, Node *resval);
 
-Node *SizeTargetExpr(ParseState *pstate,
+static Node *SizeTargetExpr(ParseState *pstate,
 			   Node *expr,
 			   Oid attrtype,
 			   int32 attrtypmod);
@@ -664,7 +664,7 @@ CoerceTargetExpr(ParseState *pstate,
  * Apparently going to a fixed-length string?
  * Then explicitly size for storage...
  */
-Node *
+static Node *
 SizeTargetExpr(ParseState *pstate,
 			   Node *expr,
 			   Oid attrtype,
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 3b3d0c37d9..4f0494318f 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.16 1998/09/01 04:30:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.17 1998/10/08 18:29:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,6 +154,7 @@ stringTypeString(Type tp, char *string, int32 atttypmod)
 }
 
 /* Given a type id, returns the out-conversion function of the type */
+#ifdef NOT_USED
 Oid
 typeidOutfunc(Oid type_id)
 {
@@ -171,6 +172,7 @@ typeidOutfunc(Oid type_id)
 	outfunc = type->typoutput;
 	return outfunc;
 }
+#endif
 
 Oid
 typeidTypeRelid(Oid type_id)
diff --git a/src/backend/parser/scan.c b/src/backend/parser/scan.c
index 3482293873..4db7c84f79 100644
--- a/src/backend/parser/scan.c
+++ b/src/backend/parser/scan.c
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $
+ * /master/usr.bin/lex/skel.c,v 1.3 1997/09/25 00:10:23 jch Exp
  */
 
 #define FLEX_SCANNER
@@ -556,7 +556,7 @@ char *yytext;
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.28 1998/09/15 02:25:09 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.29 1998/10/08 18:29:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -592,7 +592,7 @@ static char *parseCh;
 /* MAX_PARSE_BUFFER is defined in miscadmin.h */
 #define YYLMAX MAX_PARSE_BUFFER
 #define YY_NO_UNPUT
-extern int myinput(char* buf, int max);
+static int myinput(char* buf, int max);
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
 #else
@@ -2259,7 +2259,7 @@ unput(char c)
 
 #ifdef FLEX_SCANNER
 /* input routine for flex to read input from a string instead of a file */
-int
+static int
 myinput(char* buf, int max)
 {
 	int len, copylen;
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 4c0b7fbd0e..9c6f5ea150 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.43 1998/09/01 03:24:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.44 1998/10/08 18:29:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,7 @@ static char *parseCh;
 /* MAX_PARSE_BUFFER is defined in miscadmin.h */
 #define YYLMAX MAX_PARSE_BUFFER
 #define YY_NO_UNPUT
-extern int myinput(char* buf, int max);
+static int myinput(char* buf, int max);
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) {result = myinput(buf,max);}
 #else
@@ -479,7 +479,7 @@ unput(char c)
 
 #ifdef FLEX_SCANNER
 /* input routine for flex to read input from a string instead of a file */
-int
+static int
 myinput(char* buf, int max)
 {
 	int len, copylen;
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 87786d9cdd..25c1a7f7cb 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.19 1998/10/02 16:27:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.20 1998/10/08 18:29:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -313,6 +313,7 @@ make_null(Oid type)
 	return (Node *) c;
 }
 
+#ifdef NOT_USED
 void
 FixResdomTypes(List *tlist)
 {
@@ -331,6 +332,7 @@ FixResdomTypes(List *tlist)
 		}
 	}
 }
+#endif
 
 static Node *
 FindMatchingNew(List *tlist, int attno)
@@ -793,6 +795,7 @@ nodeHandleViewRule(Node **nodePtr,
 	}
 }
 
+#ifdef NOT_USED
 void
 HandleViewRule(Query *parsetree,
 			   List *rtable,
@@ -814,3 +817,5 @@ HandleViewRule(Query *parsetree,
 	nodeHandleViewRule((Node **) (&(parsetree->groupClause)), rtable, targetlist, rt_index,
 					   modified, 0);
 }
+#endif
+
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index f283887eb0..cab1e8084e 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.43 1998/09/01 04:31:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.44 1998/10/08 18:29:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,6 +96,7 @@ static BufferDesc *BufferAlloc(Relation reln, BlockNumber blockNum,
 static int	FlushBuffer(Buffer buffer, bool release);
 static void BufferSync(void);
 static int	BufferReplace(BufferDesc *bufHdr, bool bufferLockHeld);
+static void PrintBufferDescs(void);
 
 /* not static but used by vacuum only ... */
 int			BlowawayRelationBuffers(Relation rel, BlockNumber block);
@@ -1263,6 +1264,7 @@ BufferGetBlockNumber(Buffer buffer)
 		return BufferDescriptors[buffer - 1].tag.blockNum;
 }
 
+#ifdef NOT_USED
 /*
  * BufferGetRelation --
  *		Returns the relation desciptor associated with a buffer.
@@ -1297,6 +1299,7 @@ BufferGetRelation(Buffer buffer)
 
 	return relation;
 }
+#endif
 
 /*
  * BufferReplace
@@ -1464,7 +1467,7 @@ DropBuffers(Oid dbid)
  *		use only.
  * -----------------------------------------------------------------
  */
-void
+static void
 PrintBufferDescs()
 {
 	int			i;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index fb1d5bf736..adc4d1a42e 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.37 1998/09/09 18:32:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.38 1998/10/08 18:29:57 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -1712,6 +1712,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check)
 	return false;
 }
 
+#ifdef NOT_USED
 /*
  * Return an array with the pids of all processes owning a lock.
  * This works only for user locks because normal locks have no
@@ -1898,6 +1899,7 @@ LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag)
 
 	return array;
 }
+#endif
 
 #ifdef DEADLOCK_DEBUG
 /*
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 9bc6a59815..97aa9c0b47 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.25 1998/09/01 04:32:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.26 1998/10/08 18:29:59 momjian Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -194,6 +194,7 @@ MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode)
 	return MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL);
 }
 
+#ifdef NOT_USED
 /*
  * MultiLockTuple -- Lock the TID associated with a tuple
  *
@@ -220,6 +221,7 @@ MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
 	tag.tupleId = *tidPtr;
 	return MultiAcquire(MultiTableId, &tag, lockmode, TUPLE_LEVEL);
 }
+#endif
 
 /*
  * same as above at page level
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index f3d6cbfafc..b8ed161aed 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.20 1998/09/01 04:32:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.21 1998/10/08 18:30:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,12 +72,15 @@ static f_smgr smgrsw[] = {
  *	write-once storage managers.
  */
 
+#ifdef NOT_USED
 static bool smgrwo[] = {
 	false,						/* magnetic disk */
 #ifdef STABLE_MEMORY_STORAGE
 	false,						/* main memory */
 #endif
 };
+#endif
+
 static int	NSmgr = lengthof(smgrsw);
 
 /*
@@ -396,6 +399,7 @@ smgrabort()
 
 #endif
 
+#ifdef NOT_USED
 bool
 smgriswo(int16 smgrno)
 {
@@ -404,3 +408,4 @@ smgriswo(int16 smgrno)
 
 	return smgrwo[smgrno];
 }
+#endif
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index efbb8e45dc..5d7a596824 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.27 1998/09/01 04:32:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.28 1998/10/08 18:30:05 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -941,6 +941,7 @@ intervalend(TimeInterval i)
  *	 PRIVATE ROUTINES														 *
  *****************************************************************************/
 
+#ifdef NOT_USED
 /*
  *		isreltime		- returns 1, iff datestring is of type reltime
  *								  2, iff datestring is 'invalid time' identifier
@@ -987,6 +988,7 @@ isreltime(char *str)
 
 	return 0;
 }	/* isreltime() */
+#endif
 
 #if FALSE
 int
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index e1ce2882ad..fc9a71cc59 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.58 1998/09/23 17:51:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.59 1998/10/08 18:30:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,6 +46,9 @@ static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
 static DateTime dt2local(DateTime dt, int timezone);
 static void dt2time(DateTime dt, int *hour, int *min, double *sec);
 static int	j2day(int jd);
+static double time2t(const int hour, const int min, const double sec);
+static int	timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
+static int	tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
 
 #define USE_DATE_CACHE 1
 #define ROUND_ALL 0
@@ -2529,7 +2532,7 @@ tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *result)
 /* timespan2tm()
  * Convert a timespan data type to a tm structure.
  */
-int
+static int
 timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
 {
 	double		time;
@@ -2566,7 +2569,7 @@ timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec)
 	return 0;
 }	/* timespan2tm() */
 
-int
+static int
 tm2timespan(struct tm * tm, double fsec, TimeSpan *span)
 {
 	span->month = ((tm->tm_year * 12) + tm->tm_mon);
@@ -2590,7 +2593,7 @@ dt2local(DateTime dt, int tz)
 	return dt;
 }	/* dt2local() */
 
-double
+static double
 time2t(const int hour, const int min, const double sec)
 {
 	return (((hour * 60) + min) * 60) + sec;
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index e5dd3c0316..96688676fe 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.45 1998/09/01 03:26:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.46 1998/10/08 18:30:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -361,6 +361,7 @@ AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2)
 	return time1 < time2;
 }
 
+#ifdef NOT_USED
 bool
 AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)
 {
@@ -375,7 +376,7 @@ AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2)
 
 	return time1 > time2;
 }
-
+#endif
 
 /* abstime_finite()
  */
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index f3a813ca01..e4f02f77c0 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.15 1998/09/01 04:32:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.16 1998/10/08 18:30:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,11 +155,13 @@ namecat(Name n1, Name n2)
 
 #endif
 
+#ifdef NOT_USED
 int
 namecmp(Name n1, Name n2)
 {
 	return strncmp(n1->data, n2->data, NAMEDATALEN);
 }
+#endif
 
 int
 namestrcpy(Name name, char *str)
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 0de5ec07b9..4be36bbba8 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.43 1998/09/02 23:37:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.44 1998/10/08 18:30:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,9 @@
 
 #include "mb/pg_wchar.h"
 
+static int	text_cmp(text *arg1, text *arg2);
+
+
 /*****************************************************************************
  *	 USER I/O ROUTINES														 *
  *****************************************************************************/
@@ -515,6 +518,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
 	return result;
 }	/* varstr_cmp() */
 
+
 /* text_cmp()
  * Comparison function for text strings.
  * Includes locale support, but must copy strings to temporary memory
@@ -523,7 +527,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
  *	but it appears that most routines (incl. this one) assume not! - tgl 97/04/07
  * Returns -1, 0 or 1
  */
-int
+static int
 text_cmp(text *arg1, text *arg2)
 {
 	char	   *a1p,
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index fa91249b10..563ed2d28e 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.20 1998/09/01 03:26:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.21 1998/10/08 18:30:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,8 +47,6 @@ static int	pronargs_save;
 static func_ptr user_fn_save = (func_ptr) NULL;
 static func_ptr handle_load(char *filename, char *funcname);
 
-func_ptr	trigger_dynamic(char *filename, char *funcname);
-
 func_ptr
 fmgr_dynamic(Oid procedureId, int *pronargs)
 {
@@ -279,6 +277,7 @@ load_file(char *filename)
 	handle_load(filename, (char *) NULL);
 }
 
+/* Is this used? bjm 1998/10/08 */
 func_ptr
 trigger_dynamic(char *filename, char *funcname)
 {
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 8fbc2a8b83..564be81ec4 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.23 1998/10/05 02:48:49 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.24 1998/10/08 18:30:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -114,7 +114,6 @@ AbortPostgres()
 		proc_exit(FatalExitStatus);
 }
 
-#endif
 
 /* ----------------
  *		StatusBackendExit
@@ -138,6 +137,8 @@ StatusPostmasterExit(int status)
 	/* someday, do some real cleanup and then call the LISP exit */
 	proc_exit(status);
 }
+#endif
+
 
 /* ----------------------------------------------------------------
  *		processing mode support stuff (used to be in pmod.c)
@@ -145,6 +146,7 @@ StatusPostmasterExit(int status)
  */
 static ProcessingMode Mode = NoProcessing;
 
+#ifdef NOT_USED
 /*
  * IsNoProcessingMode --
  *		True iff processing mode is NoProcessing.
@@ -154,6 +156,7 @@ IsNoProcessingMode()
 {
 	return (bool) (Mode == NoProcessing);
 }
+#endif
 
 /*
  * IsBootstrapProcessingMode --
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 647d2d7ff8..e3aefb6c0a 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.16 1998/09/01 04:34:06 momjian Exp $
+ * $Id: genam.h,v 1.17 1998/10/08 18:30:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,5 @@ extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
 /* in genam.c */
 extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
 					 uint16 numberOfKeys, ScanKey key);
-extern void IndexScanMarkPosition(IndexScanDesc scan);
-extern void IndexScanRestorePosition(IndexScanDesc scan);
 
 #endif	 /* GENAM_H */
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index ecaed32c9f..35aad2fb14 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.37 1998/09/01 04:34:12 momjian Exp $
+ * $Id: heapam.h,v 1.38 1998/10/08 18:30:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -242,7 +242,6 @@ extern HeapAccessStatistics heap_access_stats;	/* in stats.c */
 /* heap_create, heap_creatr, and heap_destroy are declared in catalog/heap.h */
 
 /* heapam.c */
-extern void doinsert(Relation relation, HeapTuple tup);
 
 extern Relation heap_open(Oid relationId);
 extern Relation heap_openr(char *relationName);
@@ -268,7 +267,6 @@ extern void DataFill(char *data, TupleDesc tupleDesc,
 extern int	heap_attisnull(HeapTuple tup, int attnum);
 extern int	heap_sysattrlen(AttrNumber attno);
 extern bool heap_sysattrbyval(AttrNumber attno);
-extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
 extern Datum nocachegetattr(HeapTuple tup, int attnum,
 			   TupleDesc att, bool *isnull);
 extern HeapTuple heap_copytuple(HeapTuple tuple);
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index d006264ae1..e4c1e0a88c 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.16 1998/10/06 02:40:06 tgl Exp $
+ * $Id: xact.h,v 1.17 1998/10/08 18:30:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,7 +86,6 @@ typedef TransactionStateData *TransactionState;
 extern int	TransactionFlushEnabled(void);
 extern void SetTransactionFlushEnabled(bool state);
 
-extern bool IsTransactionState(void);
 extern bool IsAbortedTransactionBlockState(void);
 extern void OverrideTransactionSystem(bool flag);
 extern TransactionId GetCurrentTransactionId(void);
@@ -115,7 +114,6 @@ extern TransactionId DisabledTransactionId;
 extern TransactionId xidin(char *representation);
 extern char *xidout(TransactionId transactionId);
 extern bool xideq(TransactionId xid1, TransactionId xid2);
-extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2);
 extern void TransactionIdAdd(TransactionId *xid, int value);
 
 #endif	 /* XACT_H */
diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h
index 2a92f327bf..a5110e883f 100644
--- a/src/include/commands/variable.h
+++ b/src/include/commands/variable.h
@@ -2,7 +2,7 @@
  * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
  * statements
  *
- * $Id: variable.h,v 1.7 1998/09/03 02:34:34 momjian Exp $
+ * $Id: variable.h,v 1.8 1998/10/08 18:30:27 momjian Exp $
  *
  */
 #ifndef VARIABLE_H
@@ -30,32 +30,4 @@ bool		SetPGVariable(const char *, const char *);
 bool		GetPGVariable(const char *);
 bool		ResetPGVariable(const char *);
 
-extern bool set_date(void);
-extern bool show_date(void);
-extern bool reset_date(void);
-extern bool parse_date(const char *);
-extern bool set_timezone(void);
-extern bool show_timezone(void);
-extern bool reset_timezone(void);
-extern bool parse_timezone(const char *);
-extern bool set_cost_heap(void);
-extern bool show_cost_heap(void);
-extern bool reset_cost_heap(void);
-extern bool parse_cost_heap(const char *);
-extern bool set_cost_index(void);
-extern bool show_cost_index(void);
-extern bool reset_cost_index(void);
-extern bool parse_cost_index(const char *);
-extern bool set_r_plans(void);
-extern bool show_r_plans(void);
-extern bool reset_r_plans(void);
-extern bool parse_r_plans(const char *);
-extern bool set_geqo(void);
-extern bool show_geqo(void);
-extern bool reset_geqo(void);
-extern bool parse_geqo(const char *);
-extern bool show_ksqo(void);
-extern bool reset_ksqo(void);
-extern bool parse_ksqo(const char *);
-
 #endif	 /* VARIABLE_H */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index cf218dcd7f..3e6ae39e57 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.25 1998/09/01 04:35:49 momjian Exp $
+ * $Id: executor.h,v 1.26 1998/10/08 18:30:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,14 +132,12 @@ extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple,
 			   Buffer buffer,
 			   bool shouldFree);
 extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot);
-extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree);
 extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot,
 					  TupleDesc tupdesc);
 extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew);
 extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate);
 extern void ExecInitScanTupleSlot(EState *estate,
 					  CommonScanState *commonscanstate);
-extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate);
 extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate);
 
 extern TupleDesc ExecGetTupType(Plan *node);
diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h
index 349c091e6a..797b3cbad0 100644
--- a/src/include/executor/nodeTee.h
+++ b/src/include/executor/nodeTee.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeTee.h,v 1.6 1998/09/01 04:36:09 momjian Exp $
+ * $Id: nodeTee.h,v 1.7 1998/10/08 18:30:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 
 extern TupleTableSlot *ExecTee(Tee *node, Plan *parent);
 extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent);
-extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent);
 extern void ExecEndTee(Tee *node, Plan *parent);
 extern int	ExecCountSlotsTee(Tee *node);
 
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 6fe0bec78b..436b6cbf24 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.33 1998/09/01 04:33:59 momjian Exp $
+ * $Id: miscadmin.h,v 1.34 1998/10/08 18:30:18 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -197,10 +197,7 @@ extern void InitPostgres(char *name);
 
 /* in miscinit.c */
 extern void ExitPostgres(ExitStatus status);
-extern void StatusBackendExit(int status);
-extern void StatusPostmasterExit(int status);
 
-extern bool IsNoProcessingMode(void);
 extern bool IsBootstrapProcessingMode(void);
 extern bool IsInitProcessingMode(void);
 extern bool IsNormalProcessingMode(void);
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 8b4ec88894..f15e516a33 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.9 1998/09/01 04:37:16 momjian Exp $
+ * $Id: plancat.h,v 1.10 1998/10/08 18:30:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,6 +58,5 @@ extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId,
 				 Oid relationObjectId2, AttrNumber attributeNumber2);
 
 extern List *find_inheritance_children(Oid inhparent);
-extern List *VersionGetParents(Oid verrelid);
 
 #endif	 /* PLANCAT_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 9860af8a75..83f6977a0c 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.16 1998/09/03 02:34:35 momjian Exp $
+ * $Id: planmain.h,v 1.17 1998/10/08 18:30:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,6 @@ extern List *join_references(List *clauses, List *outer_tlist,
 				List *inner_tlist);
 extern List *index_outerjoin_references(List *inner_indxqual,
 						   List *outer_tlist, Index inner_relid);
-extern void set_result_tlist_references(Result *resultNode);
 extern List *set_agg_tlist_references(Agg *aggNode);
 extern void set_agg_agglist_references(Agg *aggNode);
 extern void del_agg_tlist_references(List *tlist);
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 7531e5c754..8820a3e3c3 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.5 1998/09/01 04:37:32 momjian Exp $
+ * $Id: parse_coerce.h,v 1.6 1998/10/08 18:30:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,7 +108,6 @@ typedef enum CATEGORY
 
 
 extern bool IsPreferredType(CATEGORY category, Oid type);
-extern Oid	PreferredType(CATEGORY category, Oid type);
 extern CATEGORY TypeCategory(Oid type);
 
 extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids);
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index eab4b06ade..a4933426be 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.11 1998/09/01 04:37:34 momjian Exp $
+ * $Id: parse_func.h,v 1.12 1998/10/08 18:30:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,9 +47,6 @@ extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
 extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 				  int *curr_resno, int precedence);
 
-extern Oid *
-			func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates);
-
 extern void
 			func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg);
 
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 3a01dd292e..bc906090b0 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_type.h,v 1.8 1998/09/01 04:37:40 momjian Exp $
+ * $Id: parse_type.h,v 1.9 1998/10/08 18:30:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@ extern bool typeByVal(Type t);
 extern char *typeTypeName(Type t);
 extern char typeTypeFlag(Type t);
 extern char *stringTypeString(Type tp, char *string, int32 atttypmod);
-extern Oid	typeidOutfunc(Oid type_id);
 extern Oid	typeidTypeRelid(Oid type_id);
 extern Oid	typeTypeRelid(Type typ);
 extern Oid	typeidTypElem(Oid type_id);
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index dd3ba1ff15..7924f93161 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteManip.h,v 1.9 1998/09/01 04:38:03 momjian Exp $
+ * $Id: rewriteManip.h,v 1.10 1998/10/08 18:30:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,13 +25,10 @@ void		AddQual(Query *parsetree, Node *qual);
 void		AddHavingQual(Query *parsetree, Node *havingQual);
 
 void		AddNotQual(Query *parsetree, Node *qual);
-void		FixResdomTypes(List *user_tlist);
 void		FixNew(RewriteInfo *info, Query *parsetree);
 
 void HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist,
 					   int rt_index, int attr_num, int *modified,
 					   int *badpostquel);
-void HandleViewRule(Query *parsetree, List *rtable, List *targetlist,
-			   int rt_index, int *modified);
 
 #endif	 /* REWRITEMANIP_H */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index cfd4a73bc5..1948e813ee 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.22 1998/09/01 04:38:12 momjian Exp $
+ * $Id: bufmgr.h,v 1.23 1998/10/08 18:30:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -143,11 +143,9 @@ extern void ResetBufferPool(void);
 extern int	BufferPoolCheckLeak(void);
 extern void FlushBufferPool(int StableMainMemoryFlag);
 extern BlockNumber BufferGetBlockNumber(Buffer buffer);
-extern Relation BufferGetRelation(Buffer buffer);
 extern BlockNumber RelationGetNumberOfBlocks(Relation relation);
 extern void ReleaseRelationBuffers(Relation rel);
 extern void DropBuffers(Oid dbid);
-extern void PrintBufferDescs(void);
 extern void PrintPinnedBufs(void);
 extern int	BufferShmemSize(void);
 extern int	ReleaseBuffer(Buffer buffer);
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 09292c4f74..329aa758a7 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.18 1998/09/01 04:38:24 momjian Exp $
+ * $Id: lock.h,v 1.19 1998/10/08 18:30:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -247,7 +247,6 @@ extern int	LockShmemSize(void);
 extern bool LockingDisabled(void);
 extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock,
 			  bool skip_check);
-ArrayType  *LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag);
 
 #ifdef DEADLOCK_DEBUG
 extern void DumpLocks(void);
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index a09a6077bd..43d8fc4ba4 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.13 1998/09/01 04:38:25 momjian Exp $
+ * $Id: multilev.h,v 1.14 1998/10/08 18:30:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@ extern LOCKMETHOD ShortTermTableId;
  */
 extern LOCKMETHOD InitMultiLevelLocks(void);
 extern bool MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode);
-extern bool MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
 extern bool MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
 extern bool MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode);
 
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index a2852ad846..917201d995 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: smgr.h,v 1.12 1998/09/01 04:38:37 momjian Exp $
+ * $Id: smgr.h,v 1.13 1998/10/08 18:30:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,6 @@ extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid,
 extern int	smgrnblocks(int16 which, Relation reln);
 extern int	smgrtruncate(int16 which, Relation reln, int nblocks);
 extern int	smgrcommit(void);
-extern bool smgriswo(int16 smgrno);
 
 
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 235ee0a829..f3c57d4deb 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.59 1998/10/08 02:08:47 momjian Exp $
+ * $Id: builtins.h,v 1.60 1998/10/08 18:30:49 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -141,7 +141,6 @@ extern bool namelt(NameData *arg1, NameData *arg2);
 extern bool namele(NameData *arg1, NameData *arg2);
 extern bool namegt(NameData *arg1, NameData *arg2);
 extern bool namege(NameData *arg1, NameData *arg2);
-extern int	namecmp(Name n1, Name n2);
 extern int	namecpy(Name n1, Name n2);
 extern int	namestrcpy(Name name, char *str);
 extern int	namestrcmp(Name name, char *str);
@@ -229,7 +228,6 @@ extern bool intervalct(TimeInterval i1, TimeInterval i2);
 extern bool intervalov(TimeInterval i1, TimeInterval i2);
 extern AbsoluteTime intervalstart(TimeInterval i);
 extern AbsoluteTime intervalend(TimeInterval i);
-extern int	isreltime(char *timestring);
 extern text *timeofday(void);
 
 /* filename.c */
@@ -440,7 +438,6 @@ extern text *textcat(text *arg1, text *arg2);
 extern bool texteq(text *arg1, text *arg2);
 extern bool textne(text *arg1, text *arg2);
 extern int	varstr_cmp(char *arg1, int len1, char *arg2, int len2);
-extern int	text_cmp(text *arg1, text *arg2);
 extern bool text_lt(text *arg1, text *arg2);
 extern bool text_le(text *arg1, text *arg2);
 extern bool text_gt(text *arg1, text *arg2);
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 10c229beb6..5b93abac76 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.32 1998/09/01 04:38:59 momjian Exp $
+ * $Id: dt.h,v 1.33 1998/10/08 18:30:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -315,14 +315,10 @@ extern void GetCurrentTime(struct tm * tm);
 extern DateTime SetDateTime(DateTime datetime);
 extern int	tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
 extern int	datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
-extern int	timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
-extern int	tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
 
 extern void j2date(int jd, int *year, int *month, int *day);
 extern int	date2j(int year, int month, int day);
 
-extern double time2t(const int hour, const int min, const double sec);
-
 extern int ParseDateTime(char *timestr, char *lowstr,
 			  char **field, int *ftype, int maxfields, int *numfields);
 extern int DecodeDateTime(char **field, int *ftype,
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 7c6828e84c..d1784c7cfb 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.16 1998/09/01 04:39:23 momjian Exp $
+ * $Id: nabstime.h,v 1.17 1998/10/08 18:30:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -116,7 +116,6 @@ extern AbsoluteTime datetime_abstime(DateTime *datetime);
 extern DateTime *abstime_datetime(AbsoluteTime abstime);
 
 extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2);
-extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2);
 
 extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn);
 
-- 
2.11.0