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.

1 files changed, 20 insertions, 25 deletions

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 849b9f9406a..0a960033302 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/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);