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, 12 insertions, 14 deletions

diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 6f30db27cff..96f8f21128a 100644
--- a/src/backend/executor/execUtils.c
+++ b/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));
 
 	/* ----------------