diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 0b2470fcd0..5ae59ccf12 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.35 1999/02/13 23:14:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.36 1999/02/21 03:48:27 scrappy Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -372,7 +372,7 @@ btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
 	pfree(btitem);
 	pfree(itup);
 
-#if 0
+#ifdef NOT_USED
 	/* adjust any active scans that will be affected by this insertion */
 	_bt_adjscans(rel, &(res->pointerData), BT_INSERT);
 #endif
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 7ab3da107d..9d9cc0f9aa 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.40 1999/02/13 23:14:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.41 1999/02/21 03:48:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -613,7 +613,7 @@ _bt_compare(Relation rel,
 		if (!P_RIGHTMOST(opaque))
 			elog(ERROR, "_bt_compare: invalid comparison to high key");
 
-#if 0
+#ifdef NOT_USED
 
 		/*
 		 * We just have to belive that right answer will not break
@@ -1398,7 +1398,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 		 * maxoff). Scanning in BackwardScanDirection is not
 		 * understandable at all. Well - new stuff. - vadim 12/06/96
 		 */
-#if 0
+#ifdef NOT_USED
 		if (PageIsEmpty(page) || start > maxoff)
 		{
 			ItemPointerSet(current, blkno, maxoff);
@@ -1444,7 +1444,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 		 * empty why do scanning in ForwardScanDirection ??? Well - new
 		 * stuff. - vadim 12/06/96
 		 */
-#if 0
+#ifdef NOT_USED
 		if (PageIsEmpty(page))
 		{
 			ItemPointerSet(current, blkno, FirstOffsetNumber);
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index ba14563c9d..c3a8012da2 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.36 1999/02/13 23:14:36 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.37 1999/02/21 03:48:27 scrappy Exp $
  *
  * NOTES
  *
@@ -397,7 +397,7 @@ _bt_tapeclear(BTTapeBlock *tape)
 {
 	/* blow away the contents of the old file */
 	_bt_taperewind(tape);
-#if 0
+#ifdef NOT_USED
 	FileSync(tape->bttb_fd);
 #endif
 	FileTruncate(tape->bttb_fd, 0);
@@ -781,7 +781,7 @@ _bt_blnewpage(Relation index, Buffer *buf, Page *page, int flags)
 	BTPageOpaque opaque;
 
 	*buf = _bt_getbuf(index, P_NEW, BT_WRITE);
-#if 0
+#ifdef NOT_USED
 	printf("\tblk=%d\n", BufferGetBlockNumber(*buf));
 #endif
 	*page = BufferGetPage(*buf);
@@ -962,7 +962,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 			if (PageAddItem(npage, PageGetItem(opage, ii),
 						  ii->lp_len, n, LP_USED) == InvalidOffsetNumber)
 				elog(FATAL, "btree: failed to add item to the page in _bt_sort (1)");
-#if 0
+#ifdef NOT_USED
 #if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_MERGE)
 			{
 				bool		isnull;
@@ -1048,7 +1048,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 	off = OffsetNumberNext(last_off);
 	if (PageAddItem(npage, (Item) bti, btisz, off, LP_USED) == InvalidOffsetNumber)
 		elog(FATAL, "btree: failed to add item to the page in _bt_sort (2)");
-#if 0
+#ifdef NOT_USED
 #if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_MERGE)
 	{
 		bool		isnull;
@@ -1382,7 +1382,7 @@ _bt_upperbuild(Relation index)
 	/* for each page... */
 	do
 	{
-#if 0
+#ifdef NOT_USED
 		printf("\t\tblk=%d\n", blk);
 #endif
 		rbuf = _bt_getbuf(index, blk, BT_READ);
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index e36391c3e3..ffd15225cf 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.23 1999/02/13 23:14:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.24 1999/02/21 03:48:28 scrappy Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -300,7 +300,7 @@ TransactionLogUpdate(TransactionId transactionId,		/* trans id to update */
 static void
 TransRecover(Relation logRelation)
 {
-#if 0
+#ifdef NOT_USED
 	/* ----------------
 	 *	  first get the last recorded transaction in the log.
 	 * ----------------
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index b4c89dd9e4..71cb21822e 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.25 1999/02/13 23:14:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.26 1999/02/21 03:48:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -172,7 +172,7 @@ ProcedureCreate(char *procedureName,
 		{
 			elog(NOTICE, "ProcedureCreate: type '%s' is not yet defined",
 				 returnTypeName);
-#if 0
+#ifdef NOT_USED
 			elog(NOTICE, "ProcedureCreate: creating a shell for type '%s'",
 				 returnTypeName);
 #endif
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index e1bdafebe5..6b9b0ce0a1 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.95 1999/02/13 23:15:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.96 1999/02/21 03:48:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1463,7 +1463,7 @@ vc_vaconeind(VPageList vpl, Relation indrel, int num_tuples)
 
 		if ((vp = vc_tidreapped(heapptr, vpl)) != (VPageDescr) NULL)
 		{
-#if 0
+#ifdef NOT_USED
 			elog(DEBUG, "<%x,%x> -> <%x,%x>",
 				 ItemPointerGetBlockNumber(&(res->index_iptr)),
 				 ItemPointerGetOffsetNumber(&(res->index_iptr)),
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index d31506ca0c..379a7be04b 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.77 1999/02/13 23:15:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.78 1999/02/21 03:48:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1519,7 +1519,7 @@ lreplace:;
 		ExecARUpdateTriggers(estate, tupleid, tuple);
 }
 
-#if 0
+#ifdef NOT_USED
 static HeapTuple
 ExecAttrDefault(Relation rel, HeapTuple tuple)
 {
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 337c8ac482..fa1bdc4761 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.43 1999/02/13 23:15:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.44 1999/02/21 03:48:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1609,7 +1609,7 @@ ExecTargetList(List *targetlist,
 				 curNode < nNodes;
 				 curNode++, fjTlist = lnext(fjTlist))
 			{
-#if 0							/* what is this?? */
+#ifdef NOT_USED						/* what is this?? */
 				Node	   *outernode = lfirst(fjTlist);
 
 				fjRes = (Resdom *) outernode->iterexpr;
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 17b002091e..8a096ef0f8 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.17 1999/02/13 23:15:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.18 1999/02/21 03:48:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -332,7 +332,7 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
 	 */
 	appendstate->as_whichplan = 0;
 	exec_append_initialize_next(node);
-#if 0
+#ifdef NOT_USED
 	result = (List *) initialized[0];
 #endif
 	return TRUE;
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 18ac218230..cdf13c5e19 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.32 1999/02/13 23:15:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.33 1999/02/21 03:48:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -469,7 +469,7 @@ ExecIndexMarkPos(IndexScan *node)
 	indexScanDescs = indexstate->iss_ScanDescs;
 	scanDesc = indexScanDescs[indexPtr];
 
-#if 0
+#ifdef NOT_USED
 	IndexScanMarkPosition(scanDesc);
 #endif
 	index_markpos(scanDesc);
@@ -498,7 +498,7 @@ ExecIndexRestrPos(IndexScan *node)
 	indexScanDescs = indexstate->iss_ScanDescs;
 	scanDesc = indexScanDescs[indexPtr];
 
-#if 0
+#ifdef NOT_USED
 	IndexScanRestorePosition(scanDesc);
 #endif
 	index_restrpos(scanDesc);
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 9cf494c926..6babe4bd74 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.42 1999/02/18 05:26:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.43 1999/02/21 03:48:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,7 +192,7 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed)
 
 		root->join_rel_list = rels = joined_rels;
 
-#if 0
+#ifdef NOT_USED
 		/*
 		 * * for each expensive predicate in each path in each distinct
 		 * rel, * consider doing pullup  -- JMH
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 630e125c31..e23b65067c 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.51 1999/02/18 00:49:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.52 1999/02/21 03:48:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1317,7 +1317,7 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
 		pathnode->path.loc_restrictinfo = set_difference(copyObject((Node *) rel->restrictinfo),
 						   clausegroup);
 
-#if 0							/* fix xfunc */
+#ifdef NOT_USED						/* fix xfunc */
 		/* add in cost for expensive functions!  -- JMH, 7/7/92 */
 		if (XfuncMode != XFUNC_OFF)
 		{
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index cc14716dc9..4637807cc8 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.20 1999/02/13 23:16:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.21 1999/02/21 03:48:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -125,7 +125,7 @@ create_or_index_paths(Query *root,
 				pathnode->path.loc_restrictinfo = set_difference(copyObject((Node *) rel->restrictinfo),
 								   lcons(clausenode, NIL));
 
-#if 0							/* fix xfunc */
+#ifdef NOT_USED						/* fix xfunc */
 				/* add in cost for expensive functions!  -- JMH, 7/7/92 */
 				if (XfuncMode != XFUNC_OFF)
 				{
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index c870b1d81e..68e40a4e08 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.48 1999/02/15 02:04:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.49 1999/02/21 03:48:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,7 +130,7 @@ create_plan(Path *best_path)
 		pages = 1;
 	plan_node->plan_tupperpage = tuples / pages;
 
-#if 0							/* fix xfunc */
+#ifdef NOT_USED						/* fix xfunc */
 	/* sort clauses by cost/(1-selectivity) -- JMH 2/26/92 */
 	if (XfuncMode != XFUNC_OFF)
 	{
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 24b746e606..0e0842f357 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.33 1999/02/15 03:22:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.34 1999/02/21 03:48:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -259,7 +259,7 @@ subplanner(Query *root,
 
 	final_rel = make_one_rel(root, root->base_rel_list);
 
-#if 0							/* fix xfunc */
+#ifdef NOT_USED						/* fix xfunc */
 
 	/*
 	 * Perform Predicate Migration on each path, to optimize and correctly
@@ -443,7 +443,7 @@ make_groupPlan(List **tlist,
 
 		if (IsA(expr, Var))
 		{
-#if 0							/* subplanVar->resdom->resno expected to
+#ifdef NOT_USED							/* subplanVar->resdom->resno expected to
 								 * be = te->resdom->resno */
 			TargetEntry *subplanVar;
 
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 5884391b0b..1847c2d986 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.44 1999/02/13 23:16:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.45 1999/02/21 03:48:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -542,7 +542,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
 		tlist = lnext(tlist);
 		tletype = exprType(thenode);
 
-#if 0							/* fix me */
+#ifdef NOT_USED						/* fix me */
 		/* this is tedious */
 		if (IsA(thenode, Var))
 			tletype = (Oid) ((Var *) thenode)->vartype;
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 7011f053c0..4e3d2fe353 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.39 1999/02/20 19:02:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.40 1999/02/21 03:48:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -301,7 +301,7 @@ create_seqscan_path(RelOptInfo *rel)
 	pathnode->path_cost = cost_seqscan(relid,
 									   rel->pages, rel->tuples);
 	/* add in expensive functions cost!  -- JMH, 7/7/92 */
-#if 0
+#ifdef NOT_USED
 	if (XfuncMode != XFUNC_OFF)
 	{
 		pathnode->path_cost += xfunc_get_path_cost(pathnode);
@@ -388,7 +388,7 @@ create_index_path(Query *root,
 											   index->pages,
 											   index->tuples,
 											   false);
-#if 0
+#ifdef NOT_USED
 		/* add in expensive functions cost!  -- JMH, 7/7/92 */
 		if (XfuncMode != XFUNC_OFF)
 		{
@@ -439,7 +439,7 @@ create_index_path(Query *root,
 											   index->tuples,
 											   false);
 
-#if 0
+#ifdef NOT_USED
 		/* add in expensive functions cost!  -- JMH, 7/7/92 */
 		if (XfuncMode != XFUNC_OFF)
 		{
@@ -515,7 +515,7 @@ create_nestloop_path(RelOptInfo *joinrel,
 								outer_rel->width),
 					  IsA(inner_path, IndexPath));
 	/* add in expensive function costs -- JMH 7/7/92 */
-#if 0
+#ifdef NOT_USED
 	if (XfuncMode != XFUNC_OFF)
 		pathnode->path_cost += xfunc_get_path_cost((Path *) pathnode);
 #endif
@@ -579,7 +579,7 @@ create_mergejoin_path(RelOptInfo *joinrel,
 					   outerwidth,
 					   innerwidth);
 	/* add in expensive function costs -- JMH 7/7/92 */
-#if 0
+#ifdef NOT_USED
 	if (XfuncMode != XFUNC_OFF)
 	{
 		pathnode->path_cost += xfunc_get_path_cost((Path *) pathnode);
@@ -645,7 +645,7 @@ create_hashjoin_path(RelOptInfo *joinrel,
 					  outersize, innersize,
 					  outerwidth, innerwidth);
 	/* add in expensive function costs -- JMH 7/7/92 */
-#if 0
+#ifdef NOT_USED
 	if (XfuncMode != XFUNC_OFF)
 	{
 		pathnode->path_cost += xfunc_get_path_cost((Path *) pathnode);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 79d6c2fe31..b1d43db2ab 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.25 1999/02/13 23:16:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.26 1999/02/21 03:48:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -598,7 +598,7 @@ IndexSelectivity(Oid indexrelid,
 										(char *) constFlags[n],
 										(char *) nIndexKeys,
 										(char *) indexrelid);
-#if 0
+#ifdef NOT_USED
 /*
  * So cool guys! Npages for x > 10 and x < 20 is twice as
  * npages for x > 10!	- vadim 04/09/97
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 21f68a7a26..283ac83a49 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.27 1999/02/15 05:56:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.28 1999/02/21 03:48:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,7 +155,7 @@ get_actual_tlist(List *tlist)
 	/*
 	 * this function is not making sense. - ay 10/94
 	 */
-#if 0
+#ifdef NOT_USED
 	List	   *element = NIL;
 	List	   *result = NIL;
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 3a06e856a0..f193a98dac 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: analyze.c,v 1.99 1999/02/13 23:16:51 momjian Exp $
+ *  $Id: analyze.c,v 1.100 1999/02/21 03:48:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -658,7 +658,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
 						break;
 
 					case CONSTR_UNIQUE:
-#if FALSE
+#ifdef NOT_USED
 						if (constraint->name == NULL)
 							constraint->name = makeTableName(stmt->relname, "key", NULL);
 #endif
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 523b8728cc..358920806c 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.55 1999/02/13 23:17:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.56 1999/02/21 03:49:00 scrappy Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -5250,7 +5250,7 @@ makeRowExpr(char *opr, List *largs, List *rargs)
 		elog(ERROR,"Operator '%s' not implemented for row expressions",opr);
 	}
 
-#if FALSE
+#ifdef NOT_USED
 	while ((largs != NIL) && (rargs != NIL))
 	{
 		larg = lfirst(largs);
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 4af1f7eafa..df9077616c 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.10 1998/12/04 15:34:30 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.11 1999/02/21 03:49:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -404,7 +404,7 @@ PreferredType(CATEGORY category, Oid type)
 }	/* PreferredType() */
 
 
-#if FALSE
+#ifdef NOT_USED
 Oid
 PromoteTypeToNext(Oid inType)
 {
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 9f40bcb317..3388edb337 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.17 1999/02/13 23:17:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.18 1999/02/21 03:49:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -438,7 +438,7 @@ checkTargetTypes(ParseState *pstate, char *target_colname,
 	resdomno_target = attnameAttNum(pstate->p_target_relation, target_colname);
 	attrtype_target = attnumTypeId(pstate->p_target_relation, resdomno_target);
 
-#if FALSE
+#ifdef NOT_USED
 	if ((attrtype_id != attrtype_target)
 		|| (get_atttypmod(rte->relid, resdomno_id) !=
 	   get_atttypmod(pstate->p_target_relation->rd_id, resdomno_target)))
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 34ff0ff63b..1ab5ff1afb 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.10 1999/02/13 23:17:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.11 1999/02/21 03:49:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@
 #include "utils/elog.h"
 #include "fmgr.h"
 
-#if FALSE
+#ifdef NOT_USED
 extern char *pg_pathname;
 
 void *
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 1a9f87a7cc..705989b6ca 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#if 0
+#ifdef NOT_USED
 #include "sendmail.h"
 #include "pathnames.h"
 #endif
@@ -80,7 +80,7 @@ typedef unsigned long		ulong_long;
  * causing nast effects.
  **************************************************************/
 
-/*static char _id[] = "$Id: snprintf.c,v 1.20 1999/02/06 21:51:03 tgl Exp $";*/
+/*static char _id[] = "$Id: snprintf.c,v 1.21 1999/02/21 03:49:08 scrappy Exp $";*/
 static char *end;
 static int	SnprfOverflow;
 
@@ -464,7 +464,7 @@ dostr(char *str, int cut)
 static void
 dopr_outch(int c)
 {
-#if 0
+#ifdef NOT_USED
 	if (iscntrl(c) && c != '\n' && c != '\t')
 	{
 		c = '@' + (c & 0x1F);
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index bb046c5e45..e9c4d7af2f 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.25 1999/02/13 23:17:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.26 1999/02/21 03:49:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,7 +155,7 @@ ValidateRule(int event_type,
 		"rules not allowed for insert or delete events to an attribute");
 	}
 
-#if 0
+#ifdef NOT_USED
 
 	/*
 	 * on retrieve to class.attribute do instead nothing is converted to
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index b7c91ec07b..989f135346 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.35 1999/02/13 23:17:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.36 1999/02/21 03:49:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2697,7 +2697,7 @@ void check_targetlists_are_compatible(List *prev_target, List *current_target)
 	  /* propagate a known type forward, if available */
 	  if (itype != InvalidOid)
 	    ((TargetEntry *) lfirst(prev_target))->resdom->restype = itype;
-#if FALSE
+#ifdef NOT_USED
 	  else
 	    {
 	      ((TargetEntry *) lfirst(prev_target))->resdom->restype = UNKNOWNOID;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 19ed9f3afd..8d0a299e72 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.48 1999/02/13 23:17:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.49 1999/02/21 03:49:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1474,7 +1474,7 @@ PrintBufferDescs()
 	if (IsUnderPostmaster)
 	{
 		SpinAcquire(BufMgrLock);
-#if 0
+#ifdef NOT_USED
 		for (i = 0; i < NBuffers; ++i, ++buf)
 		{
 			elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, relname=%s, \
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 29424e060f..58bd8d0449 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.43 1999/02/21 01:41:46 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.44 1999/02/21 03:49:22 scrappy Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -1569,7 +1569,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check)
 		MemSet(&item, 0, XID_TAGSIZE);
 		TransactionIdStore(MyProc->xid, &item.tag.xid);
 		item.tag.lock = MAKE_OFFSET(findlock);
-#if 0
+#ifdef NOT_USED
 		item.tag.pid = pid;
 #endif
 
@@ -1648,7 +1648,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check)
 					MemSet(&item, 0, XID_TAGSIZE);
 					TransactionIdStore(proc->xid, &item.tag.xid);
 					item.tag.lock = MAKE_OFFSET(findlock);
-#if 0
+#ifdef NOT_USED
 					item.tag.pid = pid;
 #endif
 
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 772a59b7c2..8185b77f5d 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.103 1999/02/18 06:00:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.104 1999/02/21 03:49:27 scrappy Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -74,19 +74,19 @@
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
 
-#if FALSE
+#ifdef NOT_USED
 #include "nodes/relation.h"
 #endif
 
-#if 0
+#ifdef NOT_USED
 #include "optimizer/xfunc.h"
 #endif
 
-#if FALSE
+#ifdef NOT_USED
 #include "nodes/plannodes.h"
 #endif
 
-#if FALSE
+#ifdef NOT_USED
 #include "nodes/memnodes.h"
 #endif
 
@@ -1267,7 +1267,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 				break;
 
 			case 'x':
-#if 0							/* planner/xfunc.h */
+#ifdef NOT_USED						/* planner/xfunc.h */
 
 				/*
 				 * control joey hellerstein's expensive function
@@ -1522,7 +1522,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.103 $ $Date: 1999/02/18 06:00:49 $\n");
+		puts("$Revision: 1.104 $ $Date: 1999/02/21 03:49:27 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 7bb7fdf596..afad0ecbf7 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.29 1999/02/13 23:19:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.30 1999/02/21 03:49:27 scrappy Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -73,7 +73,7 @@
 #define ABSTIMEMIN(t1, t2) abstimele((t1),(t2)) ? (t1) : (t2)
 #define ABSTIMEMAX(t1, t2) abstimelt((t1),(t2)) ? (t2) : (t1)
 
-#if FALSE
+#ifdef NOT_USED
 static char *unit_tab[] = {
 	"second", "seconds", "minute", "minutes",
 	"hour", "hours", "day", "days", "week", "weeks",
@@ -96,7 +96,7 @@ static int	sec_tab[] = {
 
 static void reltime2tm(int32 time, struct tm * tm);
 
-#if FALSE
+#ifdef NOT_USED
 static int	correct_unit(char *unit, int *unptr);
 static int	correct_dir(char *direction, int *signptr);
 
@@ -205,7 +205,7 @@ reltime2tm(int32 time, struct tm * tm)
 	return;
 }	/* reltime2tm() */
 
-#if FALSE
+#ifdef NOT_USED
 int
 dummyfunc()
 {
@@ -990,7 +990,7 @@ isreltime(char *str)
 }	/* isreltime() */
 #endif
 
-#if FALSE
+#ifdef NOT_USED
 int
 dummyfunc()
 {
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 658526678a..cae2000130 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.28 1999/02/13 23:19:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.29 1999/02/21 03:49:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 
 static int	date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
-#if 0
+#ifdef NOT_USED
 static int	day_tab[2][12] = {
 	{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
 {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
@@ -100,7 +100,7 @@ date_in(char *str)
 			elog(ERROR, "Unrecognized date external representation %s", str);
 	}
 
-#if 0
+#ifdef NOT_USED
 	if (tm->tm_year < 0 || tm->tm_year > 32767)
 		elog(ERROR, "date_in: year must be limited to values 0 through 32767 in '%s'", str);
 	if (tm->tm_mon < 1 || tm->tm_mon > 12)
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 63f6be0cad..72166c5a54 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.40 1999/02/13 23:19:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.41 1999/02/21 03:49:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -218,7 +218,7 @@ path_decode(int opentype, int npts, char *str, int *isopen, char **ss, Point *p)
 			cp++;
 		if (*cp == LDELIM)
 		{
-#if FALSE
+#ifdef NOT_USED
 			/* nested delimiters with only one point? */
 			if (npts <= 1)
 				return FALSE;
@@ -821,7 +821,7 @@ line_out(LINE *line)
 #ifdef GEODEBUG
 		printf("line_construct_pp- line is vertical\n");
 #endif
-#if FALSE
+#ifdef NOT_USED
 		result->m = DBL_MAX;
 #endif
 
@@ -835,7 +835,7 @@ line_out(LINE *line)
 #ifdef GEODEBUG
 		printf("line_construct_pp- line is horizontal\n");
 #endif
-#if FALSE
+#ifdef NOT_USED
 		result->m = 0.0;
 #endif
 
@@ -882,7 +882,7 @@ line_construct_pm(Point *pt, double m)
 	result->B = -1.0;
 	result->C = pt->y - m * pt->x;
 
-#if FALSE
+#ifdef NOT_USED
 	result->m = m;
 #endif
 
@@ -907,7 +907,7 @@ line_construct_pp(Point *pt1, Point *pt2)
 #ifdef GEODEBUG
 		printf("line_construct_pp- line is vertical\n");
 #endif
-#if FALSE
+#ifdef NOT_USED
 		result->m = DBL_MAX;
 #endif
 
@@ -921,7 +921,7 @@ line_construct_pp(Point *pt1, Point *pt2)
 #ifdef GEODEBUG
 		printf("line_construct_pp- line is horizontal\n");
 #endif
-#if FALSE
+#ifdef NOT_USED
 		result->m = 0.0;
 #endif
 
@@ -929,7 +929,7 @@ line_construct_pp(Point *pt1, Point *pt2)
 	else
 	{
 		/* use "mx - y + yinter = 0" */
-#if FALSE
+#ifdef NOT_USED
 		result->A = (pt1->y - pt2->y) / (pt1->x - pt2->x);
 #endif
 		result->A = (pt2->y - pt1->y) / (pt2->x - pt1->x);
@@ -939,7 +939,7 @@ line_construct_pp(Point *pt1, Point *pt2)
 		printf("line_construct_pp- line is neither vertical nor horizontal (diffs x=%.*g, y=%.*g\n",
 			   digits8, (pt2->x - pt1->x), digits8, (pt2->y - pt1->y));
 #endif
-#if FALSE
+#ifdef NOT_USED
 		result->m = result->A;
 #endif
 	}
@@ -960,7 +960,7 @@ line_intersect(LINE *l1, LINE *l2)
 bool
 line_parallel(LINE *l1, LINE *l2)
 {
-#if FALSE
+#ifdef NOT_USED
 	return FPeq(l1->m, l2->m);
 #endif
 	if (FPzero(l1->B))
@@ -972,7 +972,7 @@ line_parallel(LINE *l1, LINE *l2)
 bool
 line_perp(LINE *l1, LINE *l2)
 {
-#if FALSE
+#ifdef NOT_USED
 	if (l1->m)
 		return FPeq(l2->m / l1->m, -1.0);
 	else if (l2->m)
@@ -989,7 +989,7 @@ line_perp(LINE *l1, LINE *l2)
 bool
 line_vertical(LINE *line)
 {
-#if FALSE
+#ifdef NOT_USED
 	return FPeq(line->A, -1.0) && FPzero(line->B);
 #endif
 	return FPzero(line->B);
@@ -998,7 +998,7 @@ line_vertical(LINE *line)
 bool
 line_horizontal(LINE *line)
 {
-#if FALSE
+#ifdef NOT_USED
 	return FPzero(line->m);
 #endif
 	return FPzero(line->A);
@@ -1065,7 +1065,7 @@ line_interpt(LINE *l1, LINE *l2)
 
 	if (line_parallel(l1, l2))
 		return NULL;
-#if FALSE
+#ifdef NOT_USED
 	if (line_vertical(l1))
 		result = point_construct(l2->m * l1->C + l2->C, l1->C);
 	else if (line_vertical(l2))
@@ -1079,7 +1079,7 @@ line_interpt(LINE *l1, LINE *l2)
 
 	if (line_vertical(l1))
 	{
-#if FALSE
+#ifdef NOT_USED
 		x = l1->C;
 		y = -((l2->A * x + l2->C) / l2->B);
 #endif
@@ -1089,7 +1089,7 @@ line_interpt(LINE *l1, LINE *l2)
 	}
 	else if (line_vertical(l2))
 	{
-#if FALSE
+#ifdef NOT_USED
 		x = l2->C;
 		y = -((l1->A * x + l1->C) / l1->B);
 #endif
@@ -1099,7 +1099,7 @@ line_interpt(LINE *l1, LINE *l2)
 	}
 	else
 	{
-#if FALSE
+#ifdef NOT_USED
 		x = (l2->B * l1->C - l1->B * l2->C) / (l2->A * l1->B - l1->A * l2->B);
 		y = -((l1->A * x + l1->C) / l1->B);
 #endif
@@ -1654,7 +1654,7 @@ lseg_in(char *str)
 		|| (*s != '\0'))
 		elog(ERROR, "Bad lseg external representation '%s'", str);
 
-#if FALSE
+#ifdef NOT_USED
 	lseg->m = point_sl(&lseg->p[0], &lseg->p[1]);
 #endif
 
@@ -1685,7 +1685,7 @@ lseg_construct(Point *pt1, Point *pt2)
 	result->p[1].x = pt2->x;
 	result->p[1].y = pt2->y;
 
-#if FALSE
+#ifdef NOT_USED
 	result->m = point_sl(pt1, pt2);
 #endif
 
@@ -1701,7 +1701,7 @@ statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2)
 	lseg->p[1].x = pt2->x;
 	lseg->p[1].y = pt2->y;
 
-#if FALSE
+#ifdef NOT_USED
 	lseg->m = point_sl(pt1, pt2);
 #endif
 }
@@ -1750,7 +1750,7 @@ lseg_intersect(LSEG *l1, LSEG *l2)
 bool
 lseg_parallel(LSEG *l1, LSEG *l2)
 {
-#if FALSE
+#ifdef NOT_USED
 	return FPeq(l1->m, l2->m);
 #endif
 	return (FPeq(point_sl(&(l1->p[0]), &(l1->p[1])),
@@ -2010,7 +2010,7 @@ dist_ps(Point *pt, LSEG *lseg)
 	}
 	else
 	{
-#if FALSE
+#ifdef NOT_USED
 		m = (-1) * (lseg->p[1].y - lseg->p[0].y) /
 			(lseg->p[1].x - lseg->p[0].x);
 #endif
@@ -2303,7 +2303,7 @@ close_pl(Point *pt, LINE *line)
 	double		invm;
 
 	result = palloc(sizeof(Point));
-#if FALSE
+#ifdef NOT_USED
 	if (FPeq(line->A, -1.0) && FPzero(line->B))
 	{							/* vertical */
 	}
@@ -2314,7 +2314,7 @@ close_pl(Point *pt, LINE *line)
 		result->y = pt->y;
 		return result;
 
-#if FALSE
+#ifdef NOT_USED
 	}
 	else if (FPzero(line->m))
 	{							/* horizontal */
@@ -2327,7 +2327,7 @@ close_pl(Point *pt, LINE *line)
 		return result;
 	}
 	/* drop a perpendicular and find the intersection point */
-#if FALSE
+#ifdef NOT_USED
 	invm = -1.0 / line->m;
 #endif
 	/* invert and flip the sign on the slope to get a perpendicular */
@@ -3059,7 +3059,7 @@ poly_same(POLYGON *polya, POLYGON *polyb)
 
 	return plist_same(polya->npts, polya->p, polyb->p);
 
-#if FALSE
+#ifdef NOT_USED
 	for (i = 0; i < polya->npts; i++)
 	{
 		if ((polya->p[i].x != polyb->p[i].x)
@@ -3085,7 +3085,7 @@ poly_overlap(POLYGON *polya, POLYGON *polyb)
  * Determine if polygon A contains polygon B by determining if A's
  * bounding box contains B's bounding box.
  *-----------------------------------------------------------------*/
-#if FALSE
+#ifdef NOT_USED
 bool
 poly_contain(POLYGON *polya, POLYGON *polyb)
 {
@@ -3139,7 +3139,7 @@ poly_contain(POLYGON *polya, POLYGON *polyb)
  * Determine if polygon A is contained by polygon B by determining
  * if A's bounding box is contained by B's bounding box.
  *-----------------------------------------------------------------*/
-#if FALSE
+#ifdef NOT_USED
 bool
 poly_contained(POLYGON *polya, POLYGON *polyb)
 {
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index f4a0da8181..8e3b1463ee 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: nabstime.c,v 1.52 1999/02/13 23:19:24 momjian Exp $
+ *	  $Id: nabstime.c,v 1.53 1999/02/21 03:49:32 scrappy Exp $
  *
  */
 #include <stdio.h>
@@ -63,7 +63,7 @@ GetCurrentAbsoluteTime(void)
 		CTimeZone = -tm->tm_gmtoff;		/* tm_gmtoff is Sun/DEC-ism */
 		CDayLight = (tm->tm_isdst > 0);
 
-#if 0
+#ifdef NOT_USED
 		/*
 		 * XXX is there a better way to get local timezone string w/o
 		 * tzname? - tgl 97/03/18
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 084e0911a4..ce24c4635a 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
 /*
  *	Edmund Mergl <E.Mergl@bawue.de>
  *
- *	$Id: oracle_compat.c,v 1.16 1998/09/01 04:32:45 momjian Exp $
+ *	$Id: oracle_compat.c,v 1.17 1999/02/21 03:49:32 scrappy Exp $
  *
  */
 
@@ -444,7 +444,7 @@ rtrim(text *string, text *set)
 
 	ret = (text *) palloc(VARHDRSZ + m);
 	VARSIZE(ret) = VARHDRSZ + m;
-#if FALSE
+#ifdef NOT_USED
 	memcpy(VARDATA(ret), ptr - VARSIZE(ret) + m, m);
 #endif
 
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 335d98915e..54c930173c 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.24 1999/02/13 23:19:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.25 1999/02/21 03:49:33 scrappy Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -217,7 +217,7 @@ get_opname(Oid opno)
 	else
 	{
 		/* don't throw an error anymore; we want to continue... */
-#if FALSE
+#ifdef NOT_USED
 		elog(ERROR, "can't look up operator %d\n", opno);
 #endif
 		return NULL;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index c9d008a055..464d94021a 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.58 1999/02/13 23:19:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.59 1999/02/21 03:49:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -235,7 +235,7 @@ do { \
 static void formrdesc(char *relationName, u_int natts,
 		  FormData_pg_attribute *att);
 
-#if 0							/* See comments at line 1304 */
+#ifdef NOT_USED					/* See comments at line 1304 */
 static void RelationFlushIndexes(Relation *r, Oid accessMethodId);
 
 #endif
@@ -1298,7 +1298,7 @@ RelationFlushRelation(Relation *relationPtr,
 
 		FreeTriggerDesc(relation);
 
-#if 0
+#ifdef NOT_USED
 		if (relation->rd_rules)
 		{
 			int			j;
@@ -1427,7 +1427,7 @@ RelationFlushIndexes(Relation *r,
 void
 RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId)
 {
-#if 0
+#ifdef NOT_USED
 
 	/*
 	 * 25 aug 1992:  mao commented out the ht walk below.  it should be
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 7d863a5e83..5de5a2a83f 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.170 1999/02/13 23:20:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.171 1999/02/21 03:49:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2829,7 +2829,7 @@ main(int argc, char **argv)
 				settings.opt.align = 0;
 				break;
 			case 'a':
-#if 0							/* this no longer does anything */
+#ifdef NOT_USED					/* this no longer does anything */
 				fe_setauthsvc(optarg, errbuf);
 #endif
 				break;
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index 26078fc1b0..fddc4d1edb 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.9 1999/02/13 23:21:26 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.10 1999/02/21 03:49:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@ extern int	ExecCountSlotsMaterial(Material *node);
 extern void ExecEndMaterial(Material *node);
 extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent);
 
-#if 0
+#ifdef NOT_USED
 extern List ExecMaterialMarkPos(Material *node);
 extern void ExecMaterialRestrPos(Material *node);
 
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index b60b4b8404..d6023332be 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -22,7 +22,7 @@ extern int	pwd_cache_count;
 extern char *crypt_getpwdfilename(void);
 extern char *crypt_getpwdreloadfilename(void);
 
-#if 0
+#ifdef NOT_USED
 extern MsgType crypt_salt(const char *user);
 
 #endif
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 79b10aec04..83480c842a 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.93 1999/02/18 06:01:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.94 1999/02/21 03:49:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -755,7 +755,7 @@ connectDB(PGconn *conn)
 	 * send an empty query to test for startup.
 	 */
 
-#if 0
+#ifdef NOT_USED
 
 	/*
 	 * Send a blank query to make sure everything works; in particular,
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 02bfa10839..d95ccb8bee 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.29 1999/02/03 21:18:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.30 1999/02/21 03:49:55 scrappy Exp $
  */
 
 #include <float.h>				/* faked on sunos */
@@ -137,7 +137,7 @@ PATH	   *p2;
 	LSEG		seg1,
 				seg2;
 
-#if FALSE
+#ifdef NOT_USED
 	LINE	   *ln;
 
 #endif
@@ -154,7 +154,7 @@ PATH	   *p2;
 				found = true;
 		}
 
-#if FALSE
+#ifdef NOT_USED
 	ln = line_construct_pp(&seg2.p[0], &seg2.p[1]);
 	retval = interpt_sl(&seg1, ln);
 #endif