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, 9 insertions, 11 deletions

diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index cec5b306671..24c6b1ee39d 100644
--- a/src/backend/utils/misc/database.c
+++ b/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))