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, 22 insertions, 22 deletions

diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 0bf94de2200..f41b612369c 100644
--- a/src/backend/commands/command.c
+++ b/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;