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/executor/execQual.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/executor/execQual.c')
| -rw-r--r-- | src/backend/executor/execQual.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 5aa7c7217c8..a4988e407c0 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.30 1998/04/26 04:06:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.31 1998/04/27 04:05:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,29 +32,26 @@ #include <string.h> #include "postgres.h" -#include "fmgr.h" - -#include "nodes/primnodes.h" -#include "nodes/relation.h" - -#include "optimizer/clauses.h" -#include "nodes/memnodes.h" +#include "access/heapam.h" #include "catalog/pg_language.h" -#include "catalog/pg_proc.h" -#include "executor/executor.h" #include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/execFlatten.h" #include "executor/functions.h" #include "executor/nodeSubplan.h" -#include "access/heapam.h" -#include "utils/memutils.h" +#include "fmgr.h" +#include "nodes/memnodes.h" +#include "nodes/primnodes.h" +#include "nodes/relation.h" +#include "optimizer/clauses.h" +#include "utils/array.h" #include "utils/builtins.h" -#include "utils/palloc.h" #include "utils/fcache.h" #include "utils/fcache2.h" -#include "utils/array.h" #include "utils/mcxt.h" +#include "utils/memutils.h" + /* ---------------- * externs and constants @@ -751,7 +748,7 @@ ExecMakeFunctionResult(Node *node, * right OID. Also zero out the argv, since the real set doesn't take * any arguments. */ - if (((Func *) node)->funcid == SetEvalRegProcedure) + if (((Func *) node)->funcid == F_SETEVAL) { funcisset = true; if (fcache->setArg) @@ -817,7 +814,7 @@ ExecMakeFunctionResult(Node *node, * assume that the set function in pg_proc must be a Postquel * function - the funcid is not reset below for C functions. */ - ((Func *) node)->funcid = SetEvalRegProcedure; + ((Func *) node)->funcid = F_SETEVAL; /* * If we're done with the results of this function, get rid of |