diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-04 23:49:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-04 23:49:59 +0000 |
| commit | 1be014313a81b85ad930d317d60ddc8462f2a1ee (patch) | |
| tree | f586d8150f89ffaccb46603019f12e153245b9f5 /src/backend/catalog/pg_proc.c | |
| parent | e053d2071d7e8db745fb54b3e633c41dd8c7422c (diff) | |
| download | postgresql-1be014313a81b85ad930d317d60ddc8462f2a1ee.tar.gz postgresql-1be014313a81b85ad930d317d60ddc8462f2a1ee.zip | |
Fix merge failures for anonymous-type patch. From Joe Conway.
Diffstat (limited to 'src/backend/catalog/pg_proc.c')
| -rw-r--r-- | src/backend/catalog/pg_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 64a925ad1a2..a4dfc7fe295 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.84 2002/08/04 20:00:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.85 2002/08/04 23:49:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -318,7 +318,7 @@ ProcedureCreate(const char *procedureName, * type he claims. */ static void -checkretval(Oid rettype, char fn_typtype /* XXX FIX ME */, List *queryTreeList) +checkretval(Oid rettype, char fn_typtype, List *queryTreeList) { Query *parse; int cmd; |