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

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 3df6bc36ee3..44b19650e08 100644
--- a/src/backend/commands/dbcommands.c
+++ b/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))