diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-04-27 04:08:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-04-27 04:08:07 +0000 |
| commit | 09baa3cc81fc7c53872e10a4cc196bff61207b19 (patch) | |
| tree | d6e4008c07352e9a5dabcf69de65882db05c84c9 /src/backend/utils/adt/sets.c | |
| parent | e8fd57d7633ab9ddcd64861e13a59aa8dfbc3b05 (diff) | |
| download | postgresql-09baa3cc81fc7c53872e10a4cc196bff61207b19.tar.gz postgresql-09baa3cc81fc7c53872e10a4cc196bff61207b19.zip | |
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.
Diffstat (limited to 'src/backend/utils/adt/sets.c')
| -rw-r--r-- | src/backend/utils/adt/sets.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index cfecc121ae3..ae12118d1c8 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.12 1998/01/15 19:45:09 pgsql Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.13 1998/04/27 04:07:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,18 +17,19 @@ #include <string.h> #include "postgres.h" + #include "access/heapam.h" #include "access/relscan.h" #include "access/xact.h" #include "catalog/pg_proc.h" /* for Form_pg_proc */ -#include "utils/syscache.h" /* for PROOID */ #include "catalog/catname.h" /* for ProcedureRelationName */ #include "catalog/indexing.h" /* for Num_pg_proc_indices */ +#include "fmgr.h" #include "storage/lmgr.h" +#include "tcop/dest.h" #include "utils/sets.h" /* for GENERICSETNAME */ +#include "utils/syscache.h" /* for PROOID */ #include "utils/tqual.h" -#include "tcop/dest.h" -#include "fmgr.h" extern CommandDest whereToSendOutput; /* defined in tcop/postgres.c */ @@ -60,7 +61,7 @@ SetDefine(char *querystr, char *typename) ItemPointerData ipdata; static ScanKeyData oidKey[1] = { - {0, ObjectIdAttributeNumber, ObjectIdEqualRegProcedure}}; + {0, ObjectIdAttributeNumber, F_OIDEQ}}; setoid = ProcedureCreate(procname, /* changed below, after oid known */ @@ -116,7 +117,7 @@ SetDefine(char *querystr, char *typename) /* change the pg_proc tuple */ procrel = heap_openr(ProcedureRelationName); RelationSetLockForWrite(procrel); - fmgr_info(ObjectIdEqualRegProcedure, + fmgr_info(F_OIDEQ, &oidKey[0].sk_func); oidKey[0].sk_nargs = oidKey[0].sk_func.fn_nargs; oidKey[0].sk_argument = ObjectIdGetDatum(setoid); |