Mark functions as static and ifdef NOT_USED as appropriate.

25 files changed, 27 insertions, 87 deletions

diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 9a7a370630..99d4901bcd 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.16 2000/01/26 05:57:50 momjian Exp $
+ * $Id: istrat.h,v 1.17 2000/06/08 22:37:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,9 +55,6 @@ extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
 extern StrategyNumber RelationGetStrategy(Relation relation,
 			   AttrNumber attributeNumber, StrategyEvaluation evaluation,
 					RegProcedure procedure);
-extern bool RelationInvokeStrategy(Relation relation,
-			   StrategyEvaluation evaluation, AttrNumber attributeNumber,
-					   StrategyNumber strategy, Datum left, Datum right);
 extern void IndexSupportInitialize(IndexStrategy indexStrategy,
 					   RegProcedure *indexSupport, Oid indexObjectId,
 			  Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 94d27b1a23..5880a4047e 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.35 2000/04/12 17:16:26 momjian Exp $
+ * $Id: nbtree.h,v 1.36 2000/06/08 22:37:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -205,8 +205,6 @@ typedef struct BTPageState
  */
 extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
 			 bool index_is_unique, Relation heapRel);
-extern int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
-				 IndexTuple tuple1, IndexTuple tuple2);
 extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey,
 			BTItem item1, BTItem item2, StrategyNumber strat);
 
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 787b4402d2..960538f4b5 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.25 2000/06/05 07:28:57 tgl Exp $
+ * $Id: xact.h,v 1.26 2000/06/08 22:37:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -102,7 +102,6 @@ extern bool CommandIdIsCurrentCommandId(CommandId cid);
 extern bool CommandIdGEScanCommandId(CommandId cid);
 extern void CommandCounterIncrement(void);
 extern void InitializeTransactionSystem(void);
-extern bool CurrentXactInProgress(void);
 extern void StartTransactionCommand(void);
 extern void CommitTransactionCommand(void);
 extern void AbortCurrentTransaction(void);
diff --git a/src/include/c.h b/src/include/c.h
index 4e981f9238..36caac611f 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.73 2000/06/02 16:40:09 momjian Exp $
+ * $Id: c.h,v 1.74 2000/06/08 22:37:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -751,8 +751,6 @@ extern int	assert_enabled;
 #define LogAssertState(condition, printArgs) \
 		LogTrap(!(condition), BadState, printArgs)
 
-extern int	assertEnable(int val);
-
 #ifdef ASSERT_CHECKING_TEST
 extern int	assertTest(int val);
 
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 4a74367421..66021d6405 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.23 2000/04/12 17:16:27 momjian Exp $
+ * $Id: index.h,v 1.24 2000/06/08 22:37:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,6 @@ extern void index_build(Relation heapRelation, Relation indexRelation,
 extern bool IndexIsUnique(Oid indexId);
 extern bool IndexIsUniqueNoCache(Oid indexId);
 
-extern bool activate_index(Oid indexId, bool activate);
 extern bool reindex_index(Oid indexId, bool force);
 extern bool activate_indexes_of_a_table(Oid relid, bool activate);
 extern bool reindex_relation(Oid relid, bool force);
diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index 7f400411b4..c9a5b63821 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -23,9 +23,8 @@
  *------------------------------------------------------------------
  */
 
-void		CreateComments(Oid oid, char *comment);
-void		DeleteComments(Oid oid);
-void CommentObject(int objtype, char *objname, char *objproperty,
-			  List *objlist, char *comment);
+extern void	DeleteComments(Oid oid);
+extern void CommentObject(int objtype, char *objname, char *objproperty,
+				List *objlist, char *comment);
 
 #endif	 /* COMMENT_H */
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index c6d5b5413c..22dac3f5fe 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: trigger.h,v 1.20 2000/05/29 01:59:11 tgl Exp $
+ * $Id: trigger.h,v 1.21 2000/06/08 22:37:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,9 +137,6 @@ extern void DeferredTriggerAbortXact(void);
 
 extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt);
 
-extern void DeferredTriggerSaveEvent(Relation rel, int event,
-						 HeapTuple oldtup, HeapTuple newtup);
-
 
 /*
  * in utils/adt/ri_triggers.c
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index 58f18e4b8f..5cefac6666 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeTidscan.h,v 1.3 2000/04/12 17:16:33 momjian Exp $
+ * $Id: nodeTidscan.h,v 1.4 2000/06/08 22:37:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@ extern TupleTableSlot *ExecTidScan(TidScan *node);
 extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);
 extern void ExecEndTidScan(TidScan *node);
 extern void ExecTidMarkPos(TidScan *node);
-extern void ExecTidRestrPos(TidScan *node);
 extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsTidScan(TidScan *node);
 extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index 46192e1333..9e357a7fd7 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -27,7 +27,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dllist.h,v 1.12 2000/04/12 17:16:34 momjian Exp $
+ * $Id: dllist.h,v 1.13 2000/06/08 22:37:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,6 @@ extern void DLFreeElem(Dlelem *);
 extern Dlelem *DLGetHead(Dllist *);
 extern Dlelem *DLGetTail(Dllist *);
 extern Dlelem *DLRemTail(Dllist *l);
-extern Dlelem *DLGetPred(Dlelem *);		/* get predecessor */
 extern Dlelem *DLGetSucc(Dlelem *);		/* get successor */
 extern void DLRemove(Dlelem *); /* removes node from list */
 extern void DLAddHead(Dllist *list, Dlelem *node);
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 95a05164aa..dd778e7e3e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.57 2000/05/31 00:28:36 petere Exp $
+ * $Id: miscadmin.h,v 1.58 2000/06/08 22:37:35 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -142,7 +142,6 @@ extern char *getpgusername(void);
 extern void SetPgUserName(void);
 extern int	GetUserId(void);
 extern void SetUserId(void);
-extern int	ValidateBinary(char *path);
 extern int	FindExec(char *backend, char *argv0, char *binary_name);
 extern int	CheckPathAccess(char *path, char *name, int open_mode);
 
@@ -233,7 +232,6 @@ extern void SetWaitingForLock(bool);
 #define PIDFNAME	"postmaster.pid"
 
 extern void SetPidFname(char *datadir);
-extern char *GetPidFname(void);
 extern void UnlinkPidFile(void);
 extern int	SetPidFile(pid_t pid);
 
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 964e9fb0f2..24ffaeb425 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.11 2000/01/26 05:58:16 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.12 2000/06/08 22:37:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,5 @@ extern bool single_node(Node *node);
 extern bool var_is_outer(Var *var);
 extern bool var_is_rel(Var *var);
 extern Oper *replace_opid(Oper *oper);
-extern bool non_null(Expr *c);
 
 #endif	 /* NODEFUNCS_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 783dd96e48..7bb0262e9a 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.33 2000/05/31 00:28:38 petere Exp $
+ * $Id: cost.h,v 1.34 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,8 +81,5 @@ extern Selectivity restrictlist_selectivity(Query *root,
 extern Selectivity clauselist_selectivity(Query *root,
 					   List *clauses,
 					   int varRelid);
-extern Selectivity clause_selectivity(Query *root,
-				   Node *clause,
-				   int varRelid);
 
 #endif	 /* COST_H */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index d28bcbe621..f3b0c57384 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.15 2000/01/26 05:58:20 momjian Exp $
+ * $Id: joininfo.h,v 1.16 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "nodes/relation.h"
 
-extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
 
 #endif	 /* JOININFO_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 9a14d2ea59..e76ba20144 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.40 2000/05/31 00:28:38 petere Exp $
+ * $Id: planmain.h,v 1.41 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@ extern Plan *query_planner(Query *root, List *tlist, List *qual,
  * prototypes for plan/createplan.c
  */
 extern Plan *create_plan(Query *root, Path *best_path);
-extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
 extern Sort *make_sort(List *tlist, Oid nonameid, Plan *lefttree,
 		  int keycount);
 extern Agg *make_agg(List *tlist, List *qual, Plan *lefttree);
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index c4b01263eb..f641f4a0fa 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.21 2000/01/26 05:58:21 momjian Exp $
+ * $Id: prep.h,v 1.22 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
  */
 extern List *canonicalize_qual(Expr *qual, bool removeAndFlag);
 extern List *cnfify(Expr *qual, bool removeAndFlag);
-extern Expr *dnfify(Expr *qual);
 
 /*
  * prototypes for preptlist.c
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 3f1c17c995..8d3eb20d02 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.25 2000/04/12 17:16:42 momjian Exp $
+ * $Id: tlist.h,v 1.26 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,6 @@
 
 #include "nodes/relation.h"
 
-extern TargetEntry *tlistentry_member(Node *node, List *targetlist);
-extern Node *matching_tlist_expr(Node *node, List *targetlist);
 extern Resdom *tlist_member(Node *node, List *targetlist);
 
 extern void add_var_to_tlist(RelOptInfo *rel, Var *var);
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 15945680bc..4f89bcc65c 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.17 2000/06/03 04:41:33 momjian Exp $
+ * $Id: parse_relation.h,v 1.18 2000/06/08 22:37:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,8 +32,6 @@ extern List *expandAll(ParseState *pstate, char *relname, Attr *ref,
 		  int *this_resno);
 extern int	attnameAttNum(Relation rd, char *a);
 extern int	specialAttNum(char *a);
-extern bool attnameIsSet(Relation rd, char *name);
-extern int	attnumAttNelems(Relation rd, int attid);
 extern Oid	attnumTypeId(Relation rd, int attid);
 extern void warnAutoRange(ParseState *pstate, char *refname);
 
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 190d65db4d..e2cfd7f4a2 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_type.h,v 1.13 2000/03/16 06:35:06 tgl Exp $
+ * $Id: parse_type.h,v 1.14 2000/06/08 22:37:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,10 +30,6 @@ extern char typeTypeFlag(Type t);
 extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
 extern Oid	typeidTypeRelid(Oid type_id);
 extern Oid	typeTypeRelid(Type typ);
-extern Oid	typeTypElem(Type typ);
-extern Oid	GetArrayElementType(Oid typearray);
-extern Oid	typeInfunc(Type typ);
-extern Oid	typeOutfunc(Type typ);
 
 #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid)
 
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 3f79e5bfab..078abebae5 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buffile.h,v 1.4 2000/04/12 17:16:51 momjian Exp $
+ * $Id: buffile.h,v 1.5 2000/06/08 22:37:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,13 +37,10 @@ typedef struct BufFile BufFile;
  */
 
 extern BufFile *BufFileCreateTemp(void);
-extern BufFile *BufFileCreate(File file);
 extern void BufFileClose(BufFile *file);
 extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
 extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
 extern int	BufFileSeek(BufFile *file, int fileno, long offset, int whence);
-extern void BufFileTell(BufFile *file, int *fileno, long *offset);
 extern int	BufFileSeekBlock(BufFile *file, long blknum);
-extern long BufFileTellBlock(BufFile *file);
 
 #endif	 /* BUFFILE_H */
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index e7cb6ac54f..71a59cb9cc 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.24 2000/01/26 05:58:33 momjian Exp $
+ * $Id: lmgr.h,v 1.25 2000/06/08 22:37:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,6 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode);
 
 /* and this is for transactions */
 extern void XactLockTableInsert(TransactionId xid);
-extern void XactLockTableDelete(TransactionId xid);
 extern void XactLockTableWait(TransactionId xid);
 
 /* proc.c */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 98018c321c..a19e75a085 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.28 2000/05/31 00:28:39 petere Exp $
+ * $Id: tcopprot.h,v 1.29 2000/06/08 22:37:56 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -37,7 +37,6 @@ extern List *pg_parse_and_rewrite(char *query_string,
 					 Oid *typev, int nargs,
 					 bool aclOverride);
 extern Plan *pg_plan_query(Query *querytree);
-extern void pg_exec_query_acl_override(char *query_string);
 extern void pg_exec_query_dest(char *query_string,
 				   CommandDest dest,
 				   bool aclOverride);
@@ -45,9 +44,7 @@ extern void pg_exec_query_dest(char *query_string,
 #endif	 /* BOOTSTRAP_INCLUDE */
 
 extern void handle_warn(SIGNAL_ARGS);
-extern void quickdie(SIGNAL_ARGS);
 extern void die(SIGNAL_ARGS);
-extern void FloatExceptionHandler(SIGNAL_ARGS);
 extern void CancelQuery(void);
 extern int PostgresMain(int argc, char *argv[],
 			 int real_argc, char *real_argv[]);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 6dc9aa8165..c53398f9a7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.113 2000/06/05 07:29:07 tgl Exp $
+ * $Id: builtins.h,v 1.114 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,7 +209,6 @@ extern char *filename_in(char *file);
 extern char *filename_out(char *s);
 
 /* float.c */
-extern void CheckFloat8Val(double val); /* used by lex */
 extern float32 float4in(char *num);
 extern char *float4out(float32 num);
 extern float64 float8in(char *num);
@@ -408,9 +407,6 @@ extern char *make_greater_string(const char *str, Oid datatype);
 extern ItemPointer tidin(const char *str);
 extern char *tidout(ItemPointer itemPtr);
 extern bool tideq(ItemPointer, ItemPointer);
-extern bool tidne(ItemPointer, ItemPointer);
-extern text *tid_text(ItemPointer);
-extern ItemPointer text_tid(const text *);
 extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer);
 extern ItemPointer currtid_byrelname(const text *relName, ItemPointer);
 
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 2e8ca5bc9b..15d8ab9284 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.14 2000/05/29 19:16:56 tgl Exp $
+ * $Id: datetime.h,v 1.15 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -255,19 +255,8 @@ extern int	EncodeTimeOnly(struct tm * tm, double fsec, int *tzp, int style, char
 extern int	EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
 extern int	EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
 
-extern int	DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
-extern int DecodeNumber(int flen, char *field,
-			 int fmask, int *tmask,
-			 struct tm * tm, double *fsec, int *is2digits);
-extern int DecodeNumberField(int len, char *str,
-				  int fmask, int *tmask,
-				  struct tm * tm, double *fsec, int *is2digits);
 extern int	DecodeSpecial(int field, char *lowtoken, int *val);
-extern int DecodeTime(char *str, int fmask, int *tmask,
-		   struct tm * tm, double *fsec);
-extern int	DecodeTimezone(char *str, int *tzp);
 extern int	DecodeUnits(int field, char *lowtoken, int *val);
-extern datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
 
 extern int	j2day(int jd);
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index b6c02a1192..5c6c09ccbc 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.23 2000/04/12 17:16:55 momjian Exp $
+ * $Id: lsyscache.h,v 1.24 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,6 @@ extern Oid	get_negator(Oid opid);
 extern RegProcedure get_oprrest(Oid opid);
 extern RegProcedure get_oprjoin(Oid opid);
 extern Oid	get_func_rettype(Oid funcid);
-extern int	get_relnatts(Oid relid);
 extern char *get_rel_name(Oid relid);
 extern struct varlena *get_relstub(Oid relid, int no, bool *islast);
 extern Oid	get_ruleid(char *rulename);
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index bce73ae080..b7c1d0dc3a 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: timestamp.h,v 1.4 2000/04/12 17:16:56 momjian Exp $
+ * $Id: timestamp.h,v 1.5 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -158,11 +158,6 @@ extern int	tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *dt);
 extern int	timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
 extern Timestamp SetTimestamp(Timestamp timestamp);
-extern Timestamp dt2local(Timestamp dt, int timezone);
-extern void dt2time(Timestamp dt, int *hour, int *min, double *sec);
-extern int	EncodeSpecialTimestamp(Timestamp dt, char *str);
-extern int	interval2tm(Interval span, struct tm * tm, float8 *fsec);
-extern int	tm2interval(struct tm * tm, double fsec, Interval *span);
 extern Timestamp *now(void);
 
 #endif	 /* TIMESTAMP_H */