This patch...

1. Removes the unnecessary "#define AbcRegProcedure 123"'s from
pg_proc.h.

2. Changes those #defines to use the names already defined in
fmgr.h.

3. Forces the make of fmgr.h in backend/Makefile instead of having
it
   made as a dependency in access/common/Makefile  *hack*hack*hack*

4. Rearranged the #includes to a less helter-skelter arrangement,
also
    changing <file.h> to "file.h" to signify a non-system header.

5. Removed "pg_proc.h" from files where its only purpose was for
the
   #defines removed in item #1.

6. Added "fmgr.h" to each file changed for completeness sake.

Turns out that #6 was not necessary for some files because fmgr.h
was being included in a roundabout way SIX levels deep by the first
include.

"access/genam.h"
 ->"access/relscan.h"
   ->"utils/rel.h"
     ->"access/strat.h"
       ->"access/skey.h"
	 ->"fmgr.h"

So adding fmgr.h really didn't add anything to the compile, hopefully
just made it clearer to the programmer.

S Darren.

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.32 1998/04/06 16:49:14 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.33 1998/04/27 04:04:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -62,7 +62,7 @@ endif
 all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
 				global1.description local1_template1.description
 
-postgres: $(OBJS) ../utils/version.o
+postgres: fmgr.h $(OBJS) ../utils/version.o
 	$(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
 
 $(OBJS): $(DIRS:%=%.dir)

src/backend/access/index/istrat.c

@@ -8,23 +8,22 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.18 1998/04/06 17:27:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.19 1998/04/27 04:04:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <catalog/pg_proc.h>
-#include <catalog/pg_operator.h>
-#include <catalog/catname.h>
-#include <catalog/pg_index.h>
-#include <catalog/pg_amop.h>
-#include <catalog/pg_amproc.h>
-#include <utils/memutils.h>		/* could have been access/itup.h */
-#include <access/heapam.h>
-#include <access/istrat.h>
-#include <fmgr.h>
+#include "access/heapam.h"
+#include "access/istrat.h"
+#include "catalog/catname.h"
+#include "catalog/pg_amop.h"
+#include "catalog/pg_amproc.h"
+#include "catalog/pg_index.h"
+#include "catalog/pg_operator.h"
+#include "fmgr.h"
+#include "utils/memutils.h"		/* could have been access/itup.h */
 
 #ifdef USE_ASSERT_CHECKING
 static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
@@ -505,7 +504,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
 
 	ScanKeyEntryInitialize(&scanKeyData, 0,
 						   ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(operatorObjectId));
 
 	scan = heap_beginscan(operatorRelation, false, false,
@@ -561,7 +560,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 	maxStrategyNumber = AMStrategies(maxStrategyNumber);
 
 	ScanKeyEntryInitialize(&entry[0], 0, Anum_pg_index_indexrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(indexObjectId));
 
 	relation = heap_openr(IndexRelationName);
@@ -601,11 +600,11 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 	{
 
 		ScanKeyEntryInitialize(&entry[0], 0, Anum_pg_amproc_amid,
-							   ObjectIdEqualRegProcedure,
+							   F_OIDEQ,
 							   ObjectIdGetDatum(accessMethodObjectId));
 
 		ScanKeyEntryInitialize(&entry[1], 0, Anum_pg_amproc_amopclaid,
-							   ObjectIdEqualRegProcedure, 0);
+							   F_OIDEQ, 0);
 
 /*		relation = heap_openr(Name_pg_amproc); */
 		relation = heap_openr(AccessMethodProcedureRelationName);
@@ -646,12 +645,12 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 
 	ScanKeyEntryInitialize(&entry[0], 0,
 						   Anum_pg_amop_amopid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(accessMethodObjectId));
 
 	ScanKeyEntryInitialize(&entry[1], 0,
 						   Anum_pg_amop_amopclaid,
-						   ObjectIdEqualRegProcedure, 0);
+						   F_OIDEQ, 0);
 
 	relation = heap_openr(AccessMethodOperatorRelationName);
 	operatorRelation = heap_openr(OperatorRelationName);

src/backend/access/nbtree/nbtutils.c

@@ -7,21 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.18 1998/01/15 19:42:15 pgsql Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.19 1998/04/27 04:04:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
-#include <access/nbtree.h>
-#include <access/istrat.h>
-#include <access/iqual.h>
-#include <catalog/pg_proc.h>
-#include <executor/execdebug.h>
+#include "access/genam.h"
+#include "access/iqual.h"
+#include "access/istrat.h"
+#include "access/nbtree.h"
+#include "executor/execdebug.h"
+#include "fmgr.h"
+#include "storage/bufpage.h"
 
 extern int	NIndexTupleProcessed;
 
@@ -54,7 +53,7 @@ _bt_mkscankey(Relation rel, IndexTuple itup)
 		arg = index_getattr(itup, i + 1, itupdesc, &null);
 		if (null)
 		{
-			proc = NullValueRegProcedure;
+			proc = F_NULLVALUE;
 			flag = SK_ISNULL;
 		}
 		else

src/backend/catalog/aclchk.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.8 1998/02/26 04:30:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.9 1998/04/27 04:04:36 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -21,23 +21,22 @@
 #include "access/heapam.h"
 #include "access/htup.h"
 #include "access/tupmacs.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
-#include "utils/palloc.h"
 #include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_operator.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_func.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
-#include "fmgr.h"
 
 static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode);
 
@@ -99,7 +98,7 @@ ChangeAcl(char *relname,
 			   *new_acl;
 	Relation	relation;
 	static ScanKeyData relkey[1] = {
-		{0, Anum_pg_class_relname, NameEqualRegProcedure}
+		{0, Anum_pg_class_relname, F_NAMEEQ}
 	};
 	HeapScanDesc hsdp;
 	HeapTuple	htp;
@@ -122,7 +121,7 @@ ChangeAcl(char *relname,
 	if (!RelationIsValid(relation))
 		elog(ERROR, "ChangeAcl: could not open '%s'??",
 			 RelationRelationName);
-	fmgr_info(NameEqualRegProcedure, &relkey[0].sk_func);
+	fmgr_info(F_NAMEEQ, &relkey[0].sk_func);
 	relkey[0].sk_nargs = relkey[0].sk_func.fn_nargs;
 	relkey[0].sk_argument = NameGetDatum(relname);
 	hsdp = heap_beginscan(relation,
@@ -480,7 +479,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 #else
 	{							/* This is why the syscache is great... */
 		static ScanKeyData relkey[1] = {
-			{0, Anum_pg_class_relname, NameEqualRegProcedure}
+			{0, Anum_pg_class_relname, F_NAMEEQ}
 		};
 		HeapScanDesc hsdp;
 
@@ -491,7 +490,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 				 RelationRelationName);
 			return ACLCHECK_NO_CLASS;
 		}
-		fmgr_info(NameEqualRegProcedure,
+		fmgr_info(F_NAMEEQ,
 				  &relkey[0].sk_func,
 				  &relkey[0].sk_nargs);
 		relkey[0].sk_argument = NameGetDatum(relname);

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.47 1998/02/26 04:30:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.48 1998/04/27 04:04:47 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		heap_create()			- Create an uncataloged heap relation
@@ -25,38 +25,38 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <miscadmin.h>
-#include <fmgr.h>
-#include <access/heapam.h>
-#include <catalog/catalog.h>
-#include <catalog/catname.h>
-#include <catalog/heap.h>
-#include <catalog/index.h>
-#include <catalog/indexing.h>
-#include <catalog/pg_attrdef.h>
-#include <catalog/pg_index.h>
-#include <catalog/pg_inherits.h>
-#include <catalog/pg_ipl.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_relcheck.h>
-#include <catalog/pg_type.h>
-#include <commands/trigger.h>
-#include <nodes/plannodes.h>
-#include <optimizer/tlist.h>
-#include <parser/parse_expr.h>
-#include <parser/parse_node.h>
-#include <parser/parse_type.h>
-#include <rewrite/rewriteRemove.h>
-#include <storage/bufmgr.h>
-#include <storage/lmgr.h>
-#include <storage/smgr.h>
-#include <tcop/tcopprot.h>
-#include <utils/builtins.h>
-#include <utils/mcxt.h>
-#include <utils/relcache.h>
-#include <utils/tqual.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "catalog/catalog.h"
+#include "catalog/catname.h"
+#include "catalog/heap.h"
+#include "catalog/index.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_attrdef.h"
+#include "catalog/pg_index.h"
+#include "catalog/pg_inherits.h"
+#include "catalog/pg_ipl.h"
+#include "catalog/pg_relcheck.h"
+#include "catalog/pg_type.h"
+#include "commands/trigger.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "nodes/plannodes.h"
+#include "optimizer/tlist.h"
+#include "parser/parse_expr.h"
+#include "parser/parse_node.h"
+#include "parser/parse_type.h"
+#include "rewrite/rewriteRemove.h"
+#include "storage/bufmgr.h"
+#include "storage/lmgr.h"
+#include "storage/smgr.h"
+#include "tcop/tcopprot.h"
+#include "utils/builtins.h"
+#include "utils/mcxt.h"
+#include "utils/relcache.h"
+#include "utils/tqual.h"
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
@@ -494,7 +494,7 @@ RelationAlreadyExists(Relation pg_class_desc, char relname[])
 	ScanKeyEntryInitialize(&key,
 						   0,
 						   (AttrNumber) Anum_pg_class_relname,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) relname);
 
 	/* ----------------
@@ -892,7 +892,7 @@ RelationRemoveInheritance(Relation relation)
 	 * ----------------
 	 */
 	ScanKeyEntryInitialize(&entry, 0x0, Anum_pg_inherits_inhparent,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 					  ObjectIdGetDatum(RelationGetRelationId(relation)));
 
 	scan = heap_beginscan(catalogRelation,
@@ -987,7 +987,7 @@ RelationRemoveIndexes(Relation relation)
 	indexRelation = heap_openr(IndexRelationName);
 
 	ScanKeyEntryInitialize(&entry, 0x0, Anum_pg_index_indrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 					  ObjectIdGetDatum(RelationGetRelationId(relation)));
 
 	scan = heap_beginscan(indexRelation,
@@ -1654,7 +1654,7 @@ RemoveAttrDefault(Relation rel)
 	adrel = heap_openr(AttrDefaultRelationName);
 
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_attrdef_adrelid,
-						   ObjectIdEqualRegProcedure, rel->rd_id);
+						   F_OIDEQ, rel->rd_id);
 
 	RelationSetLockForWrite(adrel);
 
@@ -1681,7 +1681,7 @@ RemoveRelCheck(Relation rel)
 	rcrel = heap_openr(RelCheckRelationName);
 
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_relcheck_rcrelid,
-						   ObjectIdEqualRegProcedure, rel->rd_id);
+						   F_OIDEQ, rel->rd_id);
 
 	RelationSetLockForWrite(rcrel);
 

src/backend/catalog/index.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.39 1998/02/26 04:30:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.40 1998/04/27 04:04:55 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -24,7 +24,6 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "fmgr.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -39,6 +38,7 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
+#include "fmgr.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
@@ -177,7 +177,7 @@ RelationNameGetObjectId(char *relationName,
 	 * ----------------
 	 */
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_class_relname,
-						   NameEqualRegProcedure,
+						   F_NAMEEQ,
 						   PointerGetDatum(relationName));
 
 	pg_class_scan = heap_beginscan(pg_class, 0, false, 1, &key);
@@ -502,7 +502,7 @@ AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId)
 	 * ----------------
 	 */
 	ScanKeyEntryInitialize(&key, 0, ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(accessMethodObjectId));
 
 	/* ----------------
@@ -950,7 +950,7 @@ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
 	pg_index = heap_openr(IndexRelationName);
 
 	ScanKeyEntryInitialize(&entry, 0x0, Anum_pg_index_indexrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(indexoid));
 
 	scan = heap_beginscan(pg_index, 0, false, 1, &entry);
@@ -1246,7 +1246,7 @@ index_destroy(Oid indexId)
 	catalogRelation = heap_openr(RelationRelationName);
 
 	ScanKeyEntryInitialize(&entry, 0x0, ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(indexId));;
 
 	scan = heap_beginscan(catalogRelation, 0, false, 1, &entry);
@@ -1371,13 +1371,13 @@ UpdateStats(Oid relid, long reltuples, bool hasindex)
 	Relation	idescs[Num_pg_class_indices];
 
 	static ScanKeyData key[1] = {
-		{0, ObjectIdAttributeNumber, ObjectIdEqualRegProcedure}
+		{0, ObjectIdAttributeNumber, F_OIDEQ}
 	};
 	Datum		values[Natts_pg_class];
 	char		nulls[Natts_pg_class];
 	char		replace[Natts_pg_class];
 
-	fmgr_info(ObjectIdEqualRegProcedure, &key[0].sk_func);
+	fmgr_info(F_OIDEQ, &key[0].sk_func);
 	key[0].sk_nargs = key[0].sk_func.fn_nargs;
 
 	/* ----------------
@@ -1822,7 +1822,7 @@ IndexIsUniqueNoCache(Oid indexId)
 
 	ScanKeyEntryInitialize(&skey[0], (bits16) 0x0,
 						   Anum_pg_index_indexrelid,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   ObjectIdGetDatum(indexId));
 
 	scandesc = heap_beginscan(pg_index, 0, true, 1, skey);

src/backend/catalog/indexing.c

@@ -8,28 +8,29 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.16 1997/11/20 23:20:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.17 1998/04/27 04:04:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
-#include <postgres.h>
-
-#include <utils/builtins.h>
-#include <utils/oidcompos.h>
-#include <access/heapam.h>
-#include <access/genam.h>
-#include <storage/bufmgr.h>
-#include <nodes/execnodes.h>
-#include <catalog/catalog.h>
-#include <catalog/catname.h>
-#include <catalog/pg_index.h>
-#include <catalog/pg_proc.h>
-#include <utils/syscache.h>
-#include <catalog/indexing.h>
-#include <catalog/index.h>
-#include <miscadmin.h>
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "catalog/catalog.h"
+#include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_index.h"
+#include "catalog/pg_proc.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "nodes/execnodes.h"
+#include "storage/bufmgr.h"
+#include "utils/builtins.h"
+#include "utils/oidcompos.h"
+#include "utils/syscache.h"
 
 /*
  * Names of indices on the following system catalogs:
@@ -280,7 +281,7 @@ AttributeNameIndexScan(Relation heapRelation,
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) OidNameEqRegProcedure,
+						   (RegProcedure) F_OIDNAMEEQ,
 						   (Datum) keyarg);
 
 	idesc = index_openr(AttributeNameIndex);
@@ -306,7 +307,7 @@ AttributeNumIndexScan(Relation heapRelation,
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) OidInt2EqRegProcedure,
+						   (RegProcedure) F_OIDINT2EQ,
 						   (Datum) keyarg);
 
 	idesc = index_openr(AttributeNumIndex);
@@ -328,7 +329,7 @@ ProcedureOidIndexScan(Relation heapRelation, Oid procId)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   (Datum) procId);
 
 	idesc = index_openr(ProcedureOidIndex);
@@ -371,7 +372,7 @@ ProcedureNameIndexScan(Relation heapRelation,
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) procName);
 
 	idesc = index_openr(ProcedureNameIndex);
@@ -447,7 +448,7 @@ ProcedureSrcIndexScan(Relation heapRelation, text *procSrc)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) Anum_pg_proc_prosrc,
-						   (RegProcedure) TextEqualRegProcedure,
+						   (RegProcedure) F_TEXTEQ,
 						   (Datum) procSrc);
 
 	idesc = index_openr(ProcedureSrcIndex);
@@ -486,7 +487,7 @@ TypeOidIndexScan(Relation heapRelation, Oid typeId)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   (Datum) typeId);
 
 	idesc = index_openr(TypeOidIndex);
@@ -507,7 +508,7 @@ TypeNameIndexScan(Relation heapRelation, char *typeName)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) typeName);
 
 	idesc = index_openr(TypeNameIndex);
@@ -528,7 +529,7 @@ ClassNameIndexScan(Relation heapRelation, char *relName)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) relName);
 
 	idesc = index_openr(ClassNameIndex);
@@ -549,7 +550,7 @@ ClassOidIndexScan(Relation heapRelation, Oid relId)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   (Datum) relId);
 
 	idesc = index_openr(ClassOidIndex);

src/backend/catalog/pg_operator.c

@@ -7,27 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.23 1998/04/01 15:35:04 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.24 1998/04/27 04:05:00 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <catalog/pg_proc.h>
-#include <utils/syscache.h>
-#include <utils/tqual.h>
-#include <utils/builtins.h>
-#include <access/heapam.h>
-#include <catalog/catname.h>
-#include <catalog/pg_operator.h>
-#include <catalog/pg_type.h>
-#include <parser/parse_oper.h>
-#include <storage/bufmgr.h>
-#include <fmgr.h>
-#include <miscadmin.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "catalog/pg_operator.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "parser/parse_oper.h"
+#include "storage/bufmgr.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+#include "utils/tqual.h"
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
@@ -93,14 +94,14 @@ OperatorGetWithOpenRelation(Relation pg_operator_desc,
 	HeapTuple	tup;
 
 	static ScanKeyData opKey[3] = {
-		{0, Anum_pg_operator_oprname, NameEqualRegProcedure},
-		{0, Anum_pg_operator_oprleft, ObjectIdEqualRegProcedure},
-		{0, Anum_pg_operator_oprright, ObjectIdEqualRegProcedure},
+		{0, Anum_pg_operator_oprname, F_NAMEEQ},
+		{0, Anum_pg_operator_oprleft, F_OIDEQ},
+		{0, Anum_pg_operator_oprright, F_OIDEQ},
 	};
 
-	fmgr_info(NameEqualRegProcedure, &opKey[0].sk_func);
-	fmgr_info(ObjectIdEqualRegProcedure, &opKey[1].sk_func);
-	fmgr_info(ObjectIdEqualRegProcedure, &opKey[2].sk_func);
+	fmgr_info(F_NAMEEQ, &opKey[0].sk_func);
+	fmgr_info(F_OIDEQ, &opKey[1].sk_func);
+	fmgr_info(F_OIDEQ, &opKey[2].sk_func);
 	opKey[0].sk_nargs = opKey[0].sk_func.fn_nargs;
 	opKey[1].sk_nargs = opKey[1].sk_func.fn_nargs;
 	opKey[2].sk_nargs = opKey[2].sk_func.fn_nargs;
@@ -481,14 +482,14 @@ OperatorDef(char *operatorName,
 	TupleDesc	tupDesc;
 
 	static ScanKeyData opKey[3] = {
-		{0, Anum_pg_operator_oprname, NameEqualRegProcedure},
-		{0, Anum_pg_operator_oprleft, ObjectIdEqualRegProcedure},
-		{0, Anum_pg_operator_oprright, ObjectIdEqualRegProcedure},
+		{0, Anum_pg_operator_oprname, F_NAMEEQ},
+		{0, Anum_pg_operator_oprleft, F_OIDEQ},
+		{0, Anum_pg_operator_oprright, F_OIDEQ},
 	};
 
-	fmgr_info(NameEqualRegProcedure, &opKey[0].sk_func);
-	fmgr_info(ObjectIdEqualRegProcedure, &opKey[1].sk_func);
-	fmgr_info(ObjectIdEqualRegProcedure, &opKey[2].sk_func);
+	fmgr_info(F_NAMEEQ, &opKey[0].sk_func);
+	fmgr_info(F_OIDEQ, &opKey[1].sk_func);
+	fmgr_info(F_OIDEQ, &opKey[2].sk_func);
 	opKey[0].sk_nargs = opKey[0].sk_func.fn_nargs;
 	opKey[1].sk_nargs = opKey[1].sk_func.fn_nargs;
 	opKey[2].sk_nargs = opKey[2].sk_func.fn_nargs;
@@ -783,10 +784,10 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
 	Datum		values[Natts_pg_operator];
 
 	static ScanKeyData opKey[1] = {
-		{0, ObjectIdAttributeNumber, ObjectIdEqualRegProcedure},
+		{0, ObjectIdAttributeNumber, F_OIDEQ},
 	};
 
-	fmgr_info(ObjectIdEqualRegProcedure, &opKey[0].sk_func);
+	fmgr_info(F_OIDEQ, &opKey[0].sk_func);
 	opKey[0].sk_nargs = opKey[0].sk_func.fn_nargs;
 
 	for (i = 0; i < Natts_pg_operator; ++i)

src/backend/catalog/pg_proc.c

@@ -7,28 +7,29 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.16 1998/04/01 15:35:05 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.17 1998/04/27 04:05:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <fmgr.h>
-#include <miscadmin.h>
-#include <utils/syscache.h>
-#include <catalog/pg_proc.h>
-#include <access/heapam.h>
-#include <access/relscan.h>
-#include <catalog/catname.h>
-#include <catalog/indexing.h>
-#include <catalog/pg_type.h>
-#include <parser/parse_node.h>
-#include <tcop/tcopprot.h>
-#include <utils/builtins.h>
-#include <utils/sets.h>
-#include <utils/lsyscache.h>
-#include <optimizer/internal.h>
-#include <optimizer/planner.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/relscan.h"
+#include "catalog/catname.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "optimizer/internal.h"
+#include "optimizer/planner.h"
+#include "parser/parse_node.h"
+#include "tcop/tcopprot.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/sets.h"
+#include "utils/syscache.h"
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
@@ -258,8 +259,8 @@ ProcedureCreate(char *procedureName,
 	values[i++] = Int32GetDatum(percall_cpu);	/* propercall_cpu */
 	values[i++] = Int32GetDatum(outin_ratio);	/* prooutin_ratio */
 
-	values[i++] = (Datum) fmgr(TextInRegProcedure, prosrc);		/* prosrc */
-	values[i++] = (Datum) fmgr(TextInRegProcedure, probin);		/* probin */
+	values[i++] = (Datum) fmgr(F_TEXTIN, prosrc);		/* prosrc */
+	values[i++] = (Datum) fmgr(F_TEXTIN, probin);		/* probin */
 
 	rdesc = heap_openr(ProcedureRelationName);
 

src/backend/catalog/pg_type.c

@@ -7,25 +7,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.22 1998/04/01 15:35:08 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.23 1998/04/27 04:05:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <utils/syscache.h>
-#include <catalog/pg_proc.h>
-#include <access/heapam.h>
-#include <access/relscan.h>
-#include <utils/builtins.h>
-#include <utils/tqual.h>
-#include <fmgr.h>
-#include <catalog/catname.h>
-#include <catalog/indexing.h>
-#include <catalog/pg_type.h>
-#include <parser/parse_func.h>
-#include <storage/lmgr.h>
-#include <miscadmin.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/relscan.h"
+#include "catalog/catname.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+#include "utils/tqual.h"
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
@@ -55,14 +55,14 @@ TypeGetWithOpenRelation(Relation pg_type_desc,
 	HeapTuple	tup;
 
 	static ScanKeyData typeKey[1] = {
-		{0, Anum_pg_type_typname, NameEqualRegProcedure}
+		{0, Anum_pg_type_typname, F_NAMEEQ}
 	};
 
 	/* ----------------
 	 *	initialize the scan key and begin a scan of pg_type
 	 * ----------------
 	 */
-	fmgr_info(NameEqualRegProcedure, &typeKey[0].sk_func);
+	fmgr_info(F_NAMEEQ, &typeKey[0].sk_func);
 	typeKey[0].sk_nargs = typeKey[0].sk_func.fn_nargs;
 	typeKey[0].sk_argument = PointerGetDatum(typeName);
 
@@ -199,7 +199,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	 * ... and fill typdefault with a bogus value
 	 */
 	values[i++] =
-		(Datum) fmgr(TextInRegProcedure, typeName);		/* 15 */
+		(Datum) fmgr(F_TEXTIN, typeName);		/* 15 */
 
 	/* ----------------
 	 *	create a new type tuple with FormHeapTuple
@@ -322,10 +322,10 @@ TypeCreate(char *typeName,
 	Oid			argList[8];
 
 	static ScanKeyData typeKey[1] = {
-		{0, Anum_pg_type_typname, NameEqualRegProcedure}
+		{0, Anum_pg_type_typname, F_NAMEEQ}
 	};
 
-	fmgr_info(NameEqualRegProcedure, &typeKey[0].sk_func);
+	fmgr_info(F_NAMEEQ, &typeKey[0].sk_func);
 	typeKey[0].sk_nargs = typeKey[0].sk_func.fn_nargs;
 
 	/* ----------------
@@ -455,7 +455,7 @@ TypeCreate(char *typeName,
 	 *	initialize the default value for this type.
 	 * ----------------
 	 */
-	values[i] = (Datum) fmgr(TextInRegProcedure,		/* 16 */
+	values[i] = (Datum) fmgr(F_TEXTIN,		/* 16 */
 							 PointerIsValid(defaultTypeValue)
 							 ? defaultTypeValue : "-"); /* XXX default
 														 * typdefault */

src/backend/commands/async.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.30 1998/04/01 03:13:37 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.31 1998/04/27 04:05:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,25 +65,24 @@
 #include <sys/types.h>			/* Needed by in.h on Ultrix */
 #include <netinet/in.h>
 
-#include <postgres.h>
-
-#include <miscadmin.h>
-#include <utils/syscache.h>
-#include <access/relscan.h>
-#include <access/xact.h>
-#include <lib/dllist.h>
-#include <tcop/dest.h>
-#include <catalog/pg_proc.h>
-#include <catalog/catname.h>
-#include <catalog/pg_listener.h>
-#include <access/heapam.h>
-#include <storage/bufmgr.h>
-#include <nodes/memnodes.h>
-#include <utils/mcxt.h>
-#include <commands/async.h>
-#include <libpq/libpq.h>
-
-#include <storage/lmgr.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/relscan.h"
+#include "access/xact.h"
+#include "catalog/catname.h"
+#include "catalog/pg_listener.h"
+#include "commands/async.h"
+#include "fmgr.h"
+#include "lib/dllist.h"
+#include "libpq/libpq.h"
+#include "miscadmin.h"
+#include "nodes/memnodes.h"
+#include "storage/bufmgr.h"
+#include "storage/lmgr.h"
+#include "tcop/dest.h"
+#include "utils/mcxt.h"
+#include "utils/syscache.h"
 
 static int	notifyFrontEndPending = 0;
 static int	notifyIssued = 0;
@@ -199,7 +198,7 @@ Async_Notify(char *relname)
 
 	ScanKeyEntryInitialize(&key, 0,
 						   Anum_pg_listener_relname,
-						   NameEqualRegProcedure,
+						   F_NAMEEQ,
 						   PointerGetDatum(notifyName));
 
 	lRel = heap_openr(ListenerRelationName);
@@ -281,7 +280,7 @@ Async_NotifyAtCommit()
 #endif
 			ScanKeyEntryInitialize(&key, 0,
 								   Anum_pg_listener_notify,
-								   Integer32EqualRegProcedure,
+								   F_INT4EQ,
 								   Int32GetDatum(1));
 			lRel = heap_openr(ListenerRelationName);
 			RelationSetLockForWrite(lRel);
@@ -584,11 +583,11 @@ Async_NotifyFrontEnd()
 	StartTransactionCommand();
 	ScanKeyEntryInitialize(&key[0], 0,
 						   Anum_pg_listener_notify,
-						   Integer32EqualRegProcedure,
+						   F_INT4EQ,
 						   Int32GetDatum(1));
 	ScanKeyEntryInitialize(&key[1], 0,
 						   Anum_pg_listener_pid,
-						   Integer32EqualRegProcedure,
+						   F_INT4EQ,
 						   Int32GetDatum(MyProcPid));
 	lRel = heap_openr(ListenerRelationName);
 	RelationSetLockForWrite(lRel);

src/backend/commands/command.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.26 1998/02/26 04:30:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.27 1998/04/27 04:05:10 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,25 +20,25 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <access/relscan.h>
-#include <utils/portal.h>
-#include <commands/command.h>
-#include <utils/mcxt.h>
-#include <executor/executor.h>
-#include <executor/execdefs.h>
-#include <catalog/indexing.h>
-#include <utils/syscache.h>
-#include <catalog/catalog.h>
-#include <access/heapam.h>
-#include <utils/array.h>
-#include <utils/acl.h>
-#include <optimizer/prep.h>
-#include <catalog/catname.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_type.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/relscan.h"
+#include "catalog/indexing.h"
+#include "catalog/catalog.h"
+#include "catalog/catname.h"
+#include "catalog/pg_type.h"
+#include "commands/command.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "fmgr.h"
+#include "optimizer/prep.h"
+#include "utils/acl.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+#include "utils/mcxt.h"
+#include "utils/portal.h"
+#include "utils/syscache.h"
 
 /* ----------------
  *		PortalExecutorHeapMemory stuff
@@ -409,13 +409,13 @@ PerformAddAttribute(char *relationName,
 	ScanKeyEntryInitialize(&key[0],
 						   (bits16) NULL,
 						   (AttrNumber) Anum_pg_attribute_attrelid,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   (Datum) reltup->t_oid);
 
 	ScanKeyEntryInitialize(&key[1],
 						   (bits16) NULL,
 						   (AttrNumber) Anum_pg_attribute_attname,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) NULL);
 
 	attributeD.attrelid = reltup->t_oid;

src/backend/commands/dbcommands.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.12 1998/04/26 04:06:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.13 1998/04/27 04:05:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,22 +17,22 @@
 #include <sys/stat.h>
 
 #include "postgres.h"
-#include "miscadmin.h"			/* for DataDir */
+
 #include "access/heapam.h"
 #include "access/htup.h"
 #include "access/relscan.h"
-#include "utils/rel.h"
-#include "utils/elog.h"
 #include "catalog/catname.h"
-#include "catalog/pg_proc.h"
-#include "catalog/pg_shadow.h"
 #include "catalog/pg_database.h"
-#include "utils/syscache.h"
+#include "catalog/pg_shadow.h"
 #include "commands/dbcommands.h"
-#include "tcop/tcopprot.h"
+#include "fmgr.h"
+#include "miscadmin.h"			/* for DataDir */
 #include "storage/bufmgr.h"
-#include "storage/lmgr.h"
 #include "storage/fd.h"
+#include "storage/lmgr.h"
+#include "tcop/tcopprot.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
 
 
 /* non-export function prototypes */
@@ -157,7 +157,7 @@ get_pg_dbtup(char *command, char *dbname, Relation dbrel)
 	ScanKeyData scanKey;
 
 	ScanKeyEntryInitialize(&scanKey, 0, Anum_pg_database_datname,
-						   NameEqualRegProcedure, NameGetDatum(dbname));
+						   F_NAMEEQ, NameGetDatum(dbname));
 
 	scan = heap_beginscan(dbrel, 0, false, 1, &scanKey);
 	if (!HeapScanIsValid(scan))

src/backend/commands/proclang.c

@@ -7,16 +7,17 @@
  */
 #include <ctype.h>
 #include <string.h>
+
 #include "postgres.h"
 
 #include "access/heapam.h"
 #include "catalog/catname.h"
-#include "catalog/pg_shadow.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
-#include "utils/syscache.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_shadow.h"
 #include "commands/proclang.h"
 #include "fmgr.h"
+#include "utils/syscache.h"
 
 
 static void
@@ -120,7 +121,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 	values[i++] = Int8GetDatum((bool) 1);
 	values[i++] = Int8GetDatum(stmt->pltrusted);
 	values[i++] = ObjectIdGetDatum(procTup->t_oid);
-	values[i++] = (Datum) fmgr(TextInRegProcedure, stmt->plcompiler);
+	values[i++] = (Datum) fmgr(F_TEXTIN, stmt->plcompiler);
 
 	rdesc = heap_openr(LanguageRelationName);
 

src/backend/commands/remove.c

@@ -7,27 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.22 1998/02/11 19:10:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.23 1998/04/27 04:05:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <utils/acl.h>
-#include <access/heapam.h>
-#include <utils/builtins.h>
-#include <utils/syscache.h>
-#include <catalog/catname.h>
-#include <commands/defrem.h>
-#include <miscadmin.h>
-#include <catalog/pg_aggregate.h>
-#include <catalog/pg_language.h>
-#include <catalog/pg_operator.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_type.h>
-#include <parser/parse_func.h>
-#include <storage/bufmgr.h>
-#include <fmgr.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "catalog/pg_aggregate.h"
+#include "catalog/pg_language.h"
+#include "catalog/pg_operator.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "commands/defrem.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "parser/parse_func.h"
+#include "storage/bufmgr.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
@@ -82,17 +83,17 @@ RemoveOperator(char *operatorName,		/* operator name */
 
 	ScanKeyEntryInitialize(&operatorKey[0], 0x0,
 						   Anum_pg_operator_oprname,
-						   NameEqualRegProcedure,
+						   F_NAMEEQ,
 						   PointerGetDatum(operatorName));
 
 	ScanKeyEntryInitialize(&operatorKey[1], 0x0,
 						   Anum_pg_operator_oprleft,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(typeId1));
 
 	ScanKeyEntryInitialize(&operatorKey[2], 0x0,
 						   Anum_pg_operator_oprright,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(typeId2));
 
 	relation = heap_openr(OperatorRelationName);
@@ -159,7 +160,7 @@ SingleOpOperatorRemove(Oid typeOid)
 	int			i;
 
 	ScanKeyEntryInitialize(&key[0],
-					   0, 0, ObjectIdEqualRegProcedure, (Datum) typeOid);
+					   0, 0, F_OIDEQ, (Datum) typeOid);
 	rdesc = heap_openr(OperatorRelationName);
 	for (i = 0; i < 3; ++i)
 	{
@@ -207,7 +208,7 @@ AttributeAndRelationRemove(Oid typeOid)
 	 */
 
 	ScanKeyEntryInitialize(&key[0],
-					   0, 3, ObjectIdEqualRegProcedure, (Datum) typeOid);
+					   0, 3, F_OIDEQ, (Datum) typeOid);
 
 	oidptr = (struct oidlist *) palloc(sizeof(*oidptr));
 	oidptr->next = NULL;
@@ -228,7 +229,7 @@ AttributeAndRelationRemove(Oid typeOid)
 
 	ScanKeyEntryInitialize(&key[0], 0,
 						   ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure, (Datum) 0);
+						   F_OIDEQ, (Datum) 0);
 	optr = oidptr;
 	rdesc = heap_openr(RelationRelationName);
 	while (PointerIsValid((char *) optr->next))
@@ -264,7 +265,7 @@ RemoveType(char *typeName)		/* type name to be removed */
 	Oid			typeOid;
 	ItemPointerData itemPointerData;
 	static ScanKeyData typeKey[1] = {
-		{0, Anum_pg_type_typname, NameEqualRegProcedure}
+		{0, Anum_pg_type_typname, F_NAMEEQ}
 	};
 	char	   *shadow_type;
 	char	   *userName;
@@ -342,7 +343,7 @@ RemoveFunction(char *functionName,		/* function name to be removed */
 	Form_pg_proc the_proc = NULL;
 	ItemPointerData itemPointerData;
 	static ScanKeyData key[3] = {
-		{0, Anum_pg_proc_proname, NameEqualRegProcedure}
+		{0, Anum_pg_proc_proname, F_NAMEEQ}
 	};
 	char	   *userName;
 	char	   *typename;
@@ -489,12 +490,12 @@ RemoveAggregate(char *aggName, char *aggType)
 
 	ScanKeyEntryInitialize(&aggregateKey[0], 0x0,
 						   Anum_pg_aggregate_aggname,
-						   NameEqualRegProcedure,
+						   F_NAMEEQ,
 						   PointerGetDatum(aggName));
 
 	ScanKeyEntryInitialize(&aggregateKey[1], 0x0,
 						   Anum_pg_aggregate_aggbasetype,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(basetypeID));
 
 	relation = heap_openr(AggregateRelationName);

src/backend/commands/trigger.c

@@ -8,19 +8,20 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "nodes/parsenodes.h"
-#include "nodes/memnodes.h"
-#include "commands/trigger.h"
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/valid.h"
+#include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "access/valid.h"
-#include "access/xact.h"
+#include "commands/trigger.h"
+#include "fmgr.h"
+#include "nodes/memnodes.h"
+#include "nodes/parsenodes.h"
 #include "storage/lmgr.h"
 #include "storage/bufmgr.h"
 #include "utils/mcxt.h"
@@ -117,7 +118,7 @@ CreateTrigger(CreateTrigStmt *stmt)
 	tgrel = heap_openr(TriggerRelationName);
 	RelationSetLockForWrite(tgrel);
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_trigger_tgrelid,
-						   ObjectIdEqualRegProcedure, rel->rd_id);
+						   F_OIDEQ, rel->rd_id);
 	tgscan = heap_beginscan(tgrel, 0, false, 1, &key);
 	while (tuple = heap_getnext(tgscan, 0, (Buffer *) NULL), PointerIsValid(tuple))
 	{
@@ -277,7 +278,7 @@ DropTrigger(DropTrigStmt *stmt)
 	tgrel = heap_openr(TriggerRelationName);
 	RelationSetLockForWrite(tgrel);
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_trigger_tgrelid,
-						   ObjectIdEqualRegProcedure, rel->rd_id);
+						   F_OIDEQ, rel->rd_id);
 	tgscan = heap_beginscan(tgrel, 0, false, 1, &key);
 	while (tuple = heap_getnext(tgscan, 0, (Buffer *) NULL), PointerIsValid(tuple))
 	{
@@ -341,7 +342,7 @@ RelationRemoveTriggers(Relation rel)
 	tgrel = heap_openr(TriggerRelationName);
 	RelationSetLockForWrite(tgrel);
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_trigger_tgrelid,
-						   ObjectIdEqualRegProcedure, rel->rd_id);
+						   F_OIDEQ, rel->rd_id);
 
 	tgscan = heap_beginscan(tgrel, 0, false, 1, &key);
 
@@ -379,7 +380,7 @@ RelationBuildTriggers(Relation relation)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   ObjectIdGetDatum(relation->rd_id));
 
 	tgrel = heap_openr(TriggerRelationName);

src/backend/commands/vacuum.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.63 1998/02/26 04:31:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.64 1998/04/27 04:05:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,35 +18,34 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <postgres.h>
-
-#include <fmgr.h>
-#include <utils/portal.h>
-#include <access/genam.h>
-#include <access/heapam.h>
-#include <access/xact.h>
-#include <storage/bufmgr.h>
-#include <access/transam.h>
-#include <catalog/pg_index.h>
-#include <catalog/index.h>
-#include <catalog/catname.h>
-#include <catalog/catalog.h>
-#include <catalog/pg_class.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_statistic.h>
-#include <catalog/pg_type.h>
-#include <catalog/pg_operator.h>
-#include <parser/parse_oper.h>
-#include <storage/smgr.h>
-#include <storage/lmgr.h>
-#include <utils/inval.h>
-#include <utils/mcxt.h>
-#include <utils/inval.h>
-#include <utils/syscache.h>
-#include <utils/builtins.h>
-#include <commands/vacuum.h>
-#include <storage/bufpage.h>
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/transam.h"
+#include "access/xact.h"
+#include "catalog/catalog.h"
+#include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/pg_class.h"
+#include "catalog/pg_index.h"
+#include "catalog/pg_operator.h"
+#include "catalog/pg_statistic.h"
+#include "catalog/pg_type.h"
+#include "commands/vacuum.h"
+#include "fmgr.h"
+#include "parser/parse_oper.h"
+#include "storage/bufmgr.h"
+#include "storage/bufpage.h"
 #include "storage/shmem.h"
+#include "storage/smgr.h"
+#include "storage/lmgr.h"
+#include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/mcxt.h"
+#include "utils/portal.h"
+#include "utils/syscache.h"
+
 #ifndef HAVE_GETRUSAGE
 #include <rusagestub.h>
 #else
@@ -279,13 +278,13 @@ vc_getrels(NameData *VacRelP)
 	if (VacRelP->data)
 	{
 		ScanKeyEntryInitialize(&pgckey, 0x0, Anum_pg_class_relname,
-							   NameEqualRegProcedure,
+							   F_NAMEEQ,
 							   PointerGetDatum(VacRelP->data));
 	}
 	else
 	{
 		ScanKeyEntryInitialize(&pgckey, 0x0, Anum_pg_class_relkind,
-						  CharacterEqualRegProcedure, CharGetDatum('r'));
+						  F_CHAREQ, CharGetDatum('r'));
 	}
 
 	portalmem = PortalGetVariableMemory(vc_portal);
@@ -398,7 +397,7 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
 	StartTransactionCommand();
 
 	ScanKeyEntryInitialize(&pgckey, 0x0, ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(relid));
 
 	pgclass = heap_openr(RelationRelationName);
@@ -1776,7 +1775,7 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst
 	 * update number of tuples and number of pages in pg_class
 	 */
 	ScanKeyEntryInitialize(&rskey, 0x0, ObjectIdAttributeNumber,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(relid));
 
 	rd = heap_openr(RelationRelationName);
@@ -1890,10 +1889,10 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst
 					values[i++] = (Datum) InvalidOid;	/* 3 */
 					fmgr_info(stats->outfunc, &out_function);
 					out_string = (*fmgr_faddr(&out_function)) (stats->min, stats->attr->atttypid);
-					values[i++] = (Datum) fmgr(TextInRegProcedure, out_string);
+					values[i++] = (Datum) fmgr(F_TEXTIN, out_string);
 					pfree(out_string);
 					out_string = (char *) (*fmgr_faddr(&out_function)) (stats->max, stats->attr->atttypid);
-					values[i++] = (Datum) fmgr(TextInRegProcedure, out_string);
+					values[i++] = (Datum) fmgr(F_TEXTIN, out_string);
 					pfree(out_string);
 
 					sdesc = sd->rd_att;
@@ -1948,7 +1947,7 @@ vc_delhilowstats(Oid relid, int attcnt, int *attnums)
 	if (relid != InvalidOid)
 	{
 		ScanKeyEntryInitialize(&pgskey, 0x0, Anum_pg_statistic_starelid,
-							   ObjectIdEqualRegProcedure,
+							   F_OIDEQ,
 							   ObjectIdGetDatum(relid));
 		pgsscan = heap_beginscan(pgstatistic, false, false, 1, &pgskey);
 	}
@@ -2159,7 +2158,7 @@ vc_getindices(Oid relid, int *nindices, Relation **Irel)
 	pgidesc = RelationGetTupleDescriptor(pgindex);
 
 	ScanKeyEntryInitialize(&pgikey, 0x0, Anum_pg_index_indrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(relid));
 
 	pgiscan = heap_beginscan(pgindex, false, false, 1, &pgikey);

src/backend/executor/execQual.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.30 1998/04/26 04:06:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.31 1998/04/27 04:05:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,29 +32,26 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "fmgr.h"
-
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-
-#include "optimizer/clauses.h"
 
-#include "nodes/memnodes.h"
+#include "access/heapam.h"
 #include "catalog/pg_language.h"
-#include "catalog/pg_proc.h"
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "executor/nodeSubplan.h"
-#include "access/heapam.h"
-#include "utils/memutils.h"
+#include "fmgr.h"
+#include "nodes/memnodes.h"
+#include "nodes/primnodes.h"
+#include "nodes/relation.h"
+#include "optimizer/clauses.h"
+#include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/palloc.h"
 #include "utils/fcache.h"
 #include "utils/fcache2.h"
-#include "utils/array.h"
 #include "utils/mcxt.h"
+#include "utils/memutils.h"
+
 
 /* ----------------
  *		externs and constants
@@ -751,7 +748,7 @@ ExecMakeFunctionResult(Node *node,
 	 * right OID.  Also zero out the argv, since the real set doesn't take
 	 * any arguments.
 	 */
-	if (((Func *) node)->funcid == SetEvalRegProcedure)
+	if (((Func *) node)->funcid == F_SETEVAL)
 	{
 		funcisset = true;
 		if (fcache->setArg)
@@ -817,7 +814,7 @@ ExecMakeFunctionResult(Node *node,
 			 * assume that the set function in pg_proc must be a Postquel
 			 * function - the funcid is not reset below for C functions.
 			 */
-			((Func *) node)->funcid = SetEvalRegProcedure;
+			((Func *) node)->funcid = F_SETEVAL;
 
 			/*
 			 * If we're done with the results of this function, get rid of

src/backend/executor/execUtils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.30 1998/02/26 04:31:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.31 1998/04/27 04:05:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,23 +41,21 @@
  */
 
 #include "postgres.h"
-#include "fmgr.h"
 
-#include "executor/executor.h"
-#include "executor/execdebug.h"
-#include "access/itup.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "optimizer/clauses.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
-#include "utils/lsyscache.h"
-#include "commands/command.h"
-#include "catalog/index.h"
+#include "access/heapam.h"
+#include "access/itup.h"
 #include "catalog/catname.h"
-#include "catalog/pg_proc.h"
+#include "catalog/index.h"
 #include "catalog/pg_type.h"
+#include "commands/command.h"
+#include "executor/execdebug.h"
+#include "executor/executor.h"
+#include "fmgr.h"
+#include "optimizer/clauses.h"
 #include "parser/parsetree.h"
+#include "utils/lsyscache.h"
+#include "utils/mcxt.h"
 
 static void
 ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP,
@@ -744,7 +742,7 @@ ExecOpenIndices(Oid resultRelationOid,
 	 * ----------------
 	 */
 	ScanKeyEntryInitialize(&key, 0, Anum_pg_index_indrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(resultRelationOid));
 
 	/* ----------------

src/backend/optimizer/path/clausesel.c

@@ -7,30 +7,26 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.6 1998/02/26 04:32:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.7 1998/04/27 04:05:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "catalog/pg_operator.h"
+#include "fmgr.h"
 #include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-#include "optimizer/internal.h"
+#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/clauseinfo.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
 #include "optimizer/plancat.h"
-
 #include "parser/parsetree.h"	/* for getrelid() */
-
-#include "catalog/pg_proc.h"
-#include "catalog/pg_operator.h"
-
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 
+
 static Cost compute_selec(Query *root, List *clauses, List *or_selectivities);
 
 /****************************************************************************
@@ -254,7 +250,7 @@ compute_selec(Query *root, List *clauses, List *or_selectivities)
 		 * of that info.
 		 */
 
-		s1 = restriction_selectivity(EqualSelectivityProcedure,
+		s1 = restriction_selectivity(F_EQSEL,
 									 BooleanEqualOperator,
 									 relid,
 									 ((Var *) clause)->varoattno,

src/backend/optimizer/path/indxpath.c

@@ -8,42 +8,37 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.14 1998/02/26 04:32:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.15 1998/04/27 04:05:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <math.h>
+
 #include "postgres.h"
+
 #include "access/attnum.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
-
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
+#include "catalog/catname.h"
+#include "catalog/pg_amop.h"
+#include "executor/executor.h"
+#include "fmgr.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-
-#include "utils/lsyscache.h"
-#include "utils/elog.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
+#include "nodes/pg_list.h"
+#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/clauseinfo.h"
-#include "optimizer/plancat.h"
-#include "optimizer/keys.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
+#include "optimizer/keys.h"
+#include "optimizer/ordering.h"
+#include "optimizer/paths.h"
+#include "optimizer/plancat.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/xfunc.h"
-#include "optimizer/ordering.h"
-
-
-#include "catalog/catname.h"
-#include "catalog/pg_amop.h"
-#include "catalog/pg_proc.h"
-
-#include "executor/executor.h"
 #include "parser/parsetree.h"	/* for getrelid() */
+#include "utils/lsyscache.h"
 
 
 static void
@@ -970,12 +965,12 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
 	/* XXX - hardcoded amopid value 403 to find "btree" operator classes */
 	ScanKeyEntryInitialize(&entry[0], 0,
 						   Anum_pg_amop_amopid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(403));
 
 	ScanKeyEntryInitialize(&entry[1], 0,
 						   Anum_pg_amop_amopopr,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(pred_op));
 
 	relation = heap_openr(AccessMethodOperatorRelationName);
@@ -1011,12 +1006,12 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
 	 */
 	ScanKeyEntryInitialize(&entry[1], 0,
 						   Anum_pg_amop_amopclaid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(opclass_id));
 
 	ScanKeyEntryInitialize(&entry[2], 0,
 						   Anum_pg_amop_amopopr,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(clause_op));
 
 	scan = heap_beginscan(relation, false, false, 3, entry);
@@ -1048,7 +1043,7 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
 
 	ScanKeyEntryInitialize(&entry[2], 0,
 						   Anum_pg_amop_amopstrategy,
-						   Integer16EqualRegProcedure,
+						   F_INT2EQ,
 						   Int16GetDatum(test_strategy));
 
 	scan = heap_beginscan(relation, false, false, 3, entry);

src/backend/parser/parse_func.c

@@ -7,13 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.15 1998/02/26 04:33:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.16 1998/04/27 04:06:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
 #include "postgres.h"
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/itup.h"
@@ -356,7 +357,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 		 * This function is then called (instead of SetEval) and "name" is
 		 * projected from its result.
 		 */
-		funcid = SetEvalRegProcedure;
+		funcid = F_SETEVAL;
 		rettype = toid;
 		retset = true;
 		true_oid_array = oid_array;
@@ -415,8 +416,8 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 	/*
 	 * Sequence handling.
 	 */
-	if (funcid == SeqNextValueRegProcedure ||
-		funcid == SeqCurrValueRegProcedure)
+	if (funcid == F_NEXTVAL ||
+		funcid == F_CURRVAL)
 	{
 		Const	   *seq;
 		char	   *seqrel;
@@ -434,14 +435,14 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 		seqrel = textout(seqname);
 
 		if ((aclcheck_result = pg_aclcheck(seqrel, GetPgUserName(),
-			   ((funcid == SeqNextValueRegProcedure) ? ACL_WR : ACL_RD)))
+			   ((funcid == F_NEXTVAL) ? ACL_WR : ACL_RD)))
 			!= ACLCHECK_OK)
 			elog(ERROR, "%s.%s: %s",
 			  seqrel, funcname, aclcheck_error_strings[aclcheck_result]);
 
 		pfree(seqrel);
 
-		if (funcid == SeqNextValueRegProcedure && pstate->p_in_where_clause)
+		if (funcid == F_NEXTVAL && pstate->p_in_where_clause)
 			elog(ERROR, "nextval of a sequence in WHERE disallowed");
 	}
 
@@ -513,7 +514,7 @@ func_get_candidates(char *funcname, int nargs)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) NameEqualRegProcedure,
+						   (RegProcedure) F_NAMEEQ,
 						   (Datum) funcname);
 
 	idesc = index_openr(ProcedureNameIndex);
@@ -873,7 +874,7 @@ find_inheritors(Oid relid, Oid **supervec)
 	do
 	{
 		ScanKeyEntryInitialize(&skey, 0x0, Anum_pg_inherits_inhrel,
-							   ObjectIdEqualRegProcedure,
+							   F_OIDEQ,
 							   ObjectIdGetDatum(relid));
 
 		inhscan = heap_beginscan(inhrel, 0, false, 1, &skey);

src/backend/parser/parse_oper.c

@@ -7,20 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.9 1998/02/26 04:33:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.10 1998/04/27 04:06:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
 #include "postgres.h"
-#include <fmgr.h>
+
 #include "access/heapam.h"
 #include "access/relscan.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "fmgr.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
 #include "storage/bufmgr.h"
@@ -89,12 +89,12 @@ binary_oper_get_candidates(char *opname,
 
 	ScanKeyEntryInitialize(&opKey[0], 0,
 						   Anum_pg_operator_oprname,
-						   NameEqualRegProcedure,
+						   F_NAMEEQ,
 						   NameGetDatum(opname));
 
 	ScanKeyEntryInitialize(&opKey[1], 0,
 						   Anum_pg_operator_oprkind,
-						   CharacterEqualRegProcedure,
+						   F_CHAREQ,
 						   CharGetDatum('b'));
 
 
@@ -110,7 +110,7 @@ binary_oper_get_candidates(char *opname,
 
 			ScanKeyEntryInitialize(&opKey[2], 0,
 								   Anum_pg_operator_oprright,
-								   ObjectIdEqualRegProcedure,
+								   F_OIDEQ,
 								   ObjectIdGetDatum(rightTypeId));
 		}
 	}
@@ -120,7 +120,7 @@ binary_oper_get_candidates(char *opname,
 
 		ScanKeyEntryInitialize(&opKey[2], 0,
 							   Anum_pg_operator_oprleft,
-							   ObjectIdEqualRegProcedure,
+							   F_OIDEQ,
 							   ObjectIdGetDatum(leftTypeId));
 	}
 	else
@@ -399,14 +399,14 @@ unary_oper_get_candidates(char *op,
 	int			ncandidates = 0;
 
 	static ScanKeyData opKey[2] = {
-		{0, Anum_pg_operator_oprname, NameEqualRegProcedure},
-	{0, Anum_pg_operator_oprkind, CharacterEqualRegProcedure}};
+		{0, Anum_pg_operator_oprname, F_NAMEEQ},
+	{0, Anum_pg_operator_oprkind, F_CHAREQ}};
 
 	*candidates = NULL;
 
-	fmgr_info(NameEqualRegProcedure, (FmgrInfo *) &opKey[0].sk_func);
+	fmgr_info(F_NAMEEQ, (FmgrInfo *) &opKey[0].sk_func);
 	opKey[0].sk_argument = NameGetDatum(op);
-	fmgr_info(CharacterEqualRegProcedure, (FmgrInfo *) &opKey[1].sk_func);
+	fmgr_info(F_CHAREQ, (FmgrInfo *) &opKey[1].sk_func);
 	opKey[1].sk_argument = CharGetDatum(rightleft);
 
 	/* currently, only "unknown" can be coerced */

src/backend/rewrite/rewriteSupport.c

@@ -7,29 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.19 1998/04/26 04:07:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.20 1998/04/27 04:06:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+
+#include "access/heapam.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_rewrite.h"
-#include "utils/syscache.h"		/* for SearchSysCache */
-#include "nodes/pg_list.h"
+#include "fmgr.h"
 #include "nodes/parsenodes.h"
-#include "utils/builtins.h"		/* for textout */
-#include "utils/rel.h"			/* for Relation, RelationData ... */
-#include "utils/elog.h"			/* for elog */
+#include "nodes/pg_list.h"
 #include "storage/buf.h"		/* for InvalidBuffer */
-#include "rewrite/rewriteSupport.h"
-#include "access/heapam.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_proc.h"
-#include "catalog/indexing.h"
+#include "utils/builtins.h"		/* for textout */
 #include "utils/catcache.h"		/* for CacheContext */
 #include "utils/mcxt.h"			/* MemoryContext stuff */
-#include "utils/palloc.h"
-#include "fmgr.h"
+#include "utils/rel.h"			/* for Relation, RelationData ... */
+#include "utils/syscache.h"		/* for SearchSysCache */
+
+#include "rewrite/rewriteSupport.h"
 
 /*
  * RuleIdGetActionInfo -

src/backend/storage/large_object/inv_api.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.28 1998/02/10 04:02:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.29 1998/04/27 04:06:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,8 +19,7 @@
 #include <sys/stat.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-#include "libpq/libpq-fs.h"
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/relscan.h"
@@ -29,25 +28,26 @@
 #include "access/xact.h"
 #include "access/nbtree.h"
 #include "access/tupdesc.h"
-#include "catalog/index.h"		/* for index_create() */
 #include "catalog/catalog.h"	/* for newoid() */
+#include "catalog/heap.h"
+#include "catalog/index.h"		/* for index_create() */
 #include "catalog/pg_am.h"		/* for BTREE_AM_OID */
 #include "catalog/pg_type.h"	/* for INT4OID */
 #include "catalog/pg_opclass.h" /* for INT4_OPS_OID */
-#include "catalog/pg_proc.h"	/* for INT4GE_PROC_OID */
+#include "fmgr.h"
+#include "libpq/libpq-fs.h"
+#include "miscadmin.h"
+#include "nodes/pg_list.h"
 #include "storage/itemptr.h"
 #include "storage/bufpage.h"
 #include "storage/bufmgr.h"
+#include "storage/large_object.h"
+#include "storage/lmgr.h"
 #include "storage/smgr.h"
+#include "utils/builtins.h"		/* for namestrcpy() */
 #include "utils/rel.h"
 #include "utils/relcache.h"
-#include "utils/palloc.h"
-#include "storage/large_object.h"
-#include "storage/lmgr.h"
 #include "utils/syscache.h"
-#include "utils/builtins.h"		/* for namestrcpy() */
-#include "catalog/heap.h"
-#include "nodes/pg_list.h"
 
 /*
  *	Warning, Will Robinson...  In order to pack data into an inversion
@@ -401,7 +401,7 @@ inv_seek(LargeObjectDesc *obj_desc, int offset, int whence)
 	else
 	{
 
-		ScanKeyEntryInitialize(&skey, 0x0, 1, INT4GE_PROC_OID,
+		ScanKeyEntryInitialize(&skey, 0x0, 1, F_INT4GE,
 							   Int32GetDatum(offset));
 
 		obj_desc->iscan = index_beginscan(obj_desc->index_r,
@@ -593,7 +593,7 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *bufP)
 		{
 			ScanKeyData skey;
 
-			ScanKeyEntryInitialize(&skey, 0x0, 1, INT4GE_PROC_OID,
+			ScanKeyEntryInitialize(&skey, 0x0, 1, F_INT4GE,
 								   Int32GetDatum(0));
 			obj_desc->iscan =
 				index_beginscan(obj_desc->index_r,

src/backend/utils/adt/sets.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.12 1998/01/15 19:45:09 pgsql Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.13 1998/04/27 04:07:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,18 +17,19 @@
 #include <string.h>
 
 #include "postgres.h"
+
 #include "access/heapam.h"
 #include "access/relscan.h"
 #include "access/xact.h"
 #include "catalog/pg_proc.h"	/* for Form_pg_proc */
-#include "utils/syscache.h"		/* for PROOID */
 #include "catalog/catname.h"	/* for ProcedureRelationName */
 #include "catalog/indexing.h"	/* for Num_pg_proc_indices */
+#include "fmgr.h"
 #include "storage/lmgr.h"
+#include "tcop/dest.h"
 #include "utils/sets.h"			/* for GENERICSETNAME	   */
+#include "utils/syscache.h"		/* for PROOID */
 #include "utils/tqual.h"
-#include "tcop/dest.h"
-#include "fmgr.h"
 
 extern CommandDest whereToSendOutput;	/* defined in tcop/postgres.c */
 
@@ -60,7 +61,7 @@ SetDefine(char *querystr, char *typename)
 	ItemPointerData ipdata;
 
 	static ScanKeyData oidKey[1] = {
-	{0, ObjectIdAttributeNumber, ObjectIdEqualRegProcedure}};
+	{0, ObjectIdAttributeNumber, F_OIDEQ}};
 
 
 	setoid = ProcedureCreate(procname,	/* changed below, after oid known */
@@ -116,7 +117,7 @@ SetDefine(char *querystr, char *typename)
 		/* change the pg_proc tuple */
 		procrel = heap_openr(ProcedureRelationName);
 		RelationSetLockForWrite(procrel);
-		fmgr_info(ObjectIdEqualRegProcedure,
+		fmgr_info(F_OIDEQ,
 				  &oidKey[0].sk_func);
 		oidKey[0].sk_nargs = oidKey[0].sk_func.fn_nargs;
 		oidKey[0].sk_argument = ObjectIdGetDatum(setoid);

src/backend/utils/cache/relcache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.37 1998/02/26 04:37:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.38 1998/04/27 04:07:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,9 +37,6 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-
-#include <storage/smgr.h>
 
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -47,45 +44,42 @@
 #include "access/istrat.h"
 #include "access/itup.h"
 #include "access/skey.h"
-#include "utils/builtins.h"
 #include "access/tupdesc.h"
 #include "access/tupmacs.h"
 #include "access/xact.h"
-
-#include "storage/buf.h"
-#include "storage/fd.h"			/* for SEEK_ */
-#include "storage/lmgr.h"
-#include "storage/bufmgr.h"
-
-#include "lib/hasht.h"
-
-#include "utils/memutils.h"
-#include "utils/mcxt.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-#include "utils/hsearch.h"
-#include "utils/relcache.h"
-#include "utils/catcache.h"
-
-#include "catalog/catname.h"
 #include "catalog/catalog.h"
-#include "utils/syscache.h"
-
-#include "catalog/pg_attribute.h"
+#include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_attrdef.h"
+#include "catalog/pg_attribute.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_class.h"
+#include "catalog/pg_log.h"
+#include "catalog/pg_relcheck.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_type.h"
-
 #include "catalog/pg_variable.h"
-#include "catalog/pg_log.h"
-#include "catalog/pg_attrdef.h"
-#include "catalog/pg_relcheck.h"
-#include "catalog/indexing.h"
-#include "catalog/index.h"
 #include "fmgr.h"
+#include "lib/hasht.h"
+#include "miscadmin.h"
+#include "storage/buf.h"
+#include "storage/bufmgr.h"
+#include "storage/fd.h"			/* for SEEK_ */
+#include "storage/lmgr.h"
+#include "storage/smgr.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
+#include "utils/hsearch.h"
+#include "utils/mcxt.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/relcache.h"
+#include "utils/relcache.h"
+#include "utils/syscache.h"
+
 
 static void
 RelationFlushRelation(Relation *relationPtr,
@@ -360,14 +354,14 @@ scan_pg_rel_seq(RelationBuildDescInfo buildinfo)
 		case INFO_RELID:
 			ScanKeyEntryInitialize(&key, 0,
 								   ObjectIdAttributeNumber,
-								   ObjectIdEqualRegProcedure,
+								   F_OIDEQ,
 								   ObjectIdGetDatum(buildinfo.i.info_id));
 			break;
 
 		case INFO_RELNAME:
 			ScanKeyEntryInitialize(&key, 0,
 								   Anum_pg_class_relname,
-								   NameEqualRegProcedure,
+								   F_NAMEEQ,
 								   NameGetDatum(buildinfo.i.info_name));
 			break;
 
@@ -547,7 +541,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
 	 */
 	ScanKeyEntryInitialize(&key, 0,
 						   Anum_pg_attribute_attrelid,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(relation->rd_id));
 
 	/* ----------------
@@ -718,7 +712,7 @@ RelationBuildRuleLock(Relation relation)
 	 */
 	ScanKeyEntryInitialize(&key, 0,
 						   Anum_pg_rewrite_ev_class,
-						   ObjectIdEqualRegProcedure,
+						   F_OIDEQ,
 						   ObjectIdGetDatum(relation->rd_id));
 
 	/* ----------------
@@ -1714,7 +1708,7 @@ AttrDefaultFetch(Relation relation)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   ObjectIdGetDatum(relation->rd_id));
 
 	adrel = heap_openr(AttrDefaultRelationName);
@@ -1803,7 +1797,7 @@ RelCheckFetch(Relation relation)
 	ScanKeyEntryInitialize(&skey,
 						   (bits16) 0x0,
 						   (AttrNumber) 1,
-						   (RegProcedure) ObjectIdEqualRegProcedure,
+						   (RegProcedure) F_OIDEQ,
 						   ObjectIdGetDatum(relation->rd_id));
 
 	rcrel = heap_openr(RelCheckRelationName);

src/backend/utils/misc/database.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.7 1998/02/26 04:38:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.8 1998/04/27 04:07:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,20 +18,18 @@
 #include <fcntl.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-
-#include "utils/elog.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 
 #include "access/heapam.h"
-#include "storage/bufmgr.h"
+#include "access/xact.h"
 #include "catalog/catname.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_database.h"
-
-#include "access/xact.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "storage/bufmgr.h"
 #include "storage/bufpage.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+
 
 /* GetDatabaseInfo()
  * Pull database information from pg_database.
@@ -57,7 +55,7 @@ GetDatabaseInfo(char *name, Oid *owner, char *path)
 			 DatabaseRelationName);
 
 	ScanKeyEntryInitialize(&scanKey, 0, Anum_pg_database_datname,
-						   NameEqualRegProcedure, NameGetDatum(name));
+						   F_NAMEEQ, NameGetDatum(name));
 
 	scan = heap_beginscan(dbrel, 0, false, 1, &scanKey);
 	if (!HeapScanIsValid(scan))

src/include/catalog/pg_proc.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.52 1998/04/26 04:09:10 momjian Exp $
+ * $Id: pg_proc.h,v 1.53 1998/04/27 04:08:07 momjian Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -128,8 +128,6 @@ DATA(insert OID =  45 (  regprocout		   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  f
 DESCR("(internal)");
 DATA(insert OID =  46 (  textin			   PGUID 11 f t f 1 f 25 "0" 100 0 0 100  foo bar ));
 DESCR("(internal)");
-#define TextInRegProcedure 46
-
 DATA(insert OID =  47 (  textout		   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
 DESCR("(internal)");
 DATA(insert OID =  48 (  tidin			   PGUID 11 f t f 1 f 27 "0" 100 0 0 100  foo bar ));
@@ -156,28 +154,18 @@ DATA(insert OID =  60 (  booleq			   PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100
 DESCR("equals");
 DATA(insert OID =  61 (  chareq			   PGUID 11 f t f 2 f 16 "18 18" 100 0 0 100  foo bar ));
 DESCR("equals");
-#define		  CharacterEqualRegProcedure	  61
-
 DATA(insert OID =  62 (  nameeq			   PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100  foo bar ));
 DESCR("equals");
-#define NameEqualRegProcedure			62
-
 DATA(insert OID =  63 (  int2eq			   PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
 DESCR("equals");
-#define Integer16EqualRegProcedure		63
-
 DATA(insert OID =  64 (  int2lt			   PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
 DESCR("less-than");
 DATA(insert OID =  65 (  int4eq			   PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
 DESCR("equals");
-#define Integer32EqualRegProcedure		65
-
 DATA(insert OID =  66 (  int4lt			   PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
 DESCR("less-than");
 DATA(insert OID =  67 (  texteq			   PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0	foo bar ));
 DESCR("equals");
-#define TextEqualRegProcedure			67
-
 DATA(insert OID =  68 (  xideq			   PGUID 11 f t f 2 f 16 "28 28" 100 0 0 100  foo bar ));
 DESCR("equals");
 DATA(insert OID =  69 (  cideq			   PGUID 11 f t f 2 f 16 "29 29" 100 0 0 100  foo bar ));
@@ -229,8 +217,6 @@ DATA(insert OID = 1270 (  btreenpage	   PGUID 11 f t f 7 f 701 "26 26 21 0 23 23
 DESCR("btree");
 DATA(insert OID = 1272 (  eqsel			   PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
 DESCR("general selectivity");
-#define EqualSelectivityProcedure 1272
-
 DATA(insert OID = 102 (  neqsel			   PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
 DESCR("not-equals selectivity");
 DATA(insert OID = 103 (  intltsel		   PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100  foo bar ));
@@ -326,7 +312,6 @@ DATA(insert OID = 149 (  int4le			   PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100
 DESCR("less-than-or-equals");
 DATA(insert OID = 150 (  int4ge			   PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100  foo bar ));
 DESCR("greater-than-or-equals");
-#define INT4GE_PROC_OID 150
 DATA(insert OID = 151 (  int2ge			   PGUID 11 f t f 2 f 16 "21 21" 100 0 0 100  foo bar ));
 DESCR("greater-than-or-equals");
 DATA(insert OID = 152 (  int2mul		   PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100  foo bar ));
@@ -395,8 +380,6 @@ DATA(insert OID = 183 (  int42mi		   PGUID 11 f t f 2 f 23 "23 21" 100 0 0 100
 DESCR("subtract");
 DATA(insert OID = 184 (  oideq			   PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  foo bar ));
 DESCR("equals");
-#define ObjectIdEqualRegProcedure		184
-
 DATA(insert OID = 185 (  oidne			   PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100  foo bar ));
 DESCR("not equal");
 DATA(insert OID = 186 (  box_same		   PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100	foo bar ));
@@ -1015,9 +998,6 @@ DATA(insert OID = 823 (  oidint2le		   PGUID 11 f t f 2 f 16 "810 810" 100 0 0 1
 DESCR("less-than-or-equals");
 DATA(insert OID = 824 (  oidint2eq		   PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100	foo bar));
 DESCR("equals");
-
-#define OidInt2EqRegProcedure 824
-
 DATA(insert OID = 825 (  oidint2ge		   PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100	foo bar));
 DESCR("greater-than-or-equals");
 DATA(insert OID = 826 (  oidint2gt		   PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100	foo bar));
@@ -1106,9 +1086,6 @@ DATA(insert OID = 923 (  oidint4le		   PGUID 11 f t f 2 f 16 "910 910" 100 0 0 1
 DESCR("less-than-or-equals");
 DATA(insert OID = 924 (  oidint4eq		   PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100	foo bar));
 DESCR("equals");
-
-#define OidInt4EqRegProcedure 924
-
 DATA(insert OID = 925 (  oidint4ge		   PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100	foo bar));
 DESCR("greater-than-or-equals");
 DATA(insert OID = 926 (  oidint4gt		   PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100	foo bar));
@@ -1140,9 +1117,6 @@ DATA(insert OID = 943 (  oidnamele		   PGUID 11 f t f 2 f 16 "911 911" 100 0 0 1
 DESCR("less-than-or-equals");
 DATA(insert OID = 944 (  oidnameeq		   PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100	foo bar));
 DESCR("equals");
-
-#define OidNameEqRegProcedure 944
-
 DATA(insert OID = 945 (  oidnamege		   PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100	foo bar));
 DESCR("greater-than-or-equals");
 DATA(insert OID = 946 (  oidnamegt		   PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100	foo bar));
@@ -1245,10 +1219,8 @@ DESCR("equals");
 
 DATA(insert OID = 1029 (  nullvalue		   PGUID 11 f t f 1 f 16 "0" 100 0 0 100  foo bar ));
 DESCR("(internal)");
-#define NullValueRegProcedure 1029
 DATA(insert OID = 1030 (  nonnullvalue	   PGUID 11 f t f 1 f 16 "0" 100 0 0 100  foo bar ));
 DESCR("(internal)");
-#define NonNullValueRegProcedure 1030
 DATA(insert OID = 1031 (  aclitemin		   PGUID 11 f t f 1 f 1033 "0" 100 0 0 100	foo bar ));
 DESCR("(internal)");
 DATA(insert OID = 1032 (  aclitemout	   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
@@ -1261,8 +1233,6 @@ DATA(insert OID = 1037 (  aclcontains	   PGUID 11 f t f 2 f 16 "1034 1033" 100 0
 DESCR("matches regex., case-sensitive");
 DATA(insert OID = 1038 (  seteval		   PGUID 11 f t f 1 f 23 "26" 100 0 0 100  foo bar ));
 DESCR("");
-#define SetEvalRegProcedure 1038
-
 DATA(insert OID = 1044 (  bpcharin		   PGUID 11 f t f 3 f 1042 "0" 100 0 0 100	foo bar ));
 DESCR("(internal)");
 DATA(insert OID = 1045 (  bpcharout		   PGUID 11 f t f 1 f 23 "0" 100 0 0 100  foo bar ));
@@ -1938,8 +1908,6 @@ DATA(insert OID =  1317 (  nextval	   PGUID 11 f t f 1 f 23 "25" 100 0 0 100  fo
 DESCR("sequence next value");
 DATA(insert OID =  1319 (  currval	   PGUID 11 f t f 1 f 23 "25" 100 0 0 100  foo bar ));
 DESCR("sequence current value");
-#define SeqNextValueRegProcedure 1317
-#define SeqCurrValueRegProcedure 1319
 
 /*
  * prototypes for functions pg_proc.c