From 09baa3cc81fc7c53872e10a4cc196bff61207b19 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 27 Apr 1998 04:08:07 +0000 Subject: 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 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. --- src/backend/commands/proclang.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/proclang.c') diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index aac12979509..2a218b68637 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -7,16 +7,17 @@ */ #include #include + #include "postgres.h" #include "access/heapam.h" #include "catalog/catname.h" -#include "catalog/pg_shadow.h" -#include "catalog/pg_proc.h" #include "catalog/pg_language.h" -#include "utils/syscache.h" +#include "catalog/pg_proc.h" +#include "catalog/pg_shadow.h" #include "commands/proclang.h" #include "fmgr.h" +#include "utils/syscache.h" static void @@ -120,7 +121,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt) values[i++] = Int8GetDatum((bool) 1); values[i++] = Int8GetDatum(stmt->pltrusted); values[i++] = ObjectIdGetDatum(procTup->t_oid); - values[i++] = (Datum) fmgr(TextInRegProcedure, stmt->plcompiler); + values[i++] = (Datum) fmgr(F_TEXTIN, stmt->plcompiler); rdesc = heap_openr(LanguageRelationName); -- cgit v1.2.3