Change #include's to use <> and "" as appropriate.

[postgresql] / src / backend / catalog / pg_aggregate.c

diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 4dba8740ee27b715bb152fce62c8006df3efd6d9..7a118888132b1ef0c488dd70a30422bf80f626e1 100644 (file)
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -1,30 +1,27 @@
 /*-------------------------------------------------------------------------
  *
- * pg_aggregate.c--
+ * pg_aggregate.c
  *       routines to support manipulation of the pg_aggregate relation
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.18 1998/11/27 19:51:50 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.22 1999/07/15 23:03:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <utils/builtins.h>
-#include <fmgr.h>
-#include <catalog/catname.h>
-#include <utils/syscache.h>
-#include <catalog/pg_operator.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_type.h>
-#include <catalog/pg_aggregate.h>
-#include <miscadmin.h>
+#include "access/heapam.h"
+#include "utils/builtins.h"
+#include "catalog/catname.h"
+#include "utils/syscache.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_aggregate.h"
+#include "miscadmin.h"
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
@@ -206,43 +203,29 @@ AggregateCreate(char *aggName,
        }
        namestrcpy(&aname, aggName);
        values[Anum_pg_aggregate_aggname - 1] = NameGetDatum(&aname);
-       values[Anum_pg_aggregate_aggowner - 1] =
-               Int32GetDatum(GetUserId());
-       values[Anum_pg_aggregate_aggtransfn1 - 1] =
-               ObjectIdGetDatum(xfn1);
-       values[Anum_pg_aggregate_aggtransfn2 - 1] =
-               ObjectIdGetDatum(xfn2);
-       values[Anum_pg_aggregate_aggfinalfn - 1] =
-               ObjectIdGetDatum(ffn);
+       values[Anum_pg_aggregate_aggowner - 1] = Int32GetDatum(GetUserId());
+       values[Anum_pg_aggregate_aggtransfn1 - 1] = ObjectIdGetDatum(xfn1);
+       values[Anum_pg_aggregate_aggtransfn2 - 1] = ObjectIdGetDatum(xfn2);
+       values[Anum_pg_aggregate_aggfinalfn - 1] = ObjectIdGetDatum(ffn);
 
-       values[Anum_pg_aggregate_aggbasetype - 1] =
-               ObjectIdGetDatum(xbase);
+       values[Anum_pg_aggregate_aggbasetype - 1] = ObjectIdGetDatum(xbase);
        if (!OidIsValid(xfn1))
        {
-               values[Anum_pg_aggregate_aggtranstype1 - 1] =
-                       ObjectIdGetDatum(InvalidOid);
-               values[Anum_pg_aggregate_aggtranstype2 - 1] =
-                       ObjectIdGetDatum(xret2);
-               values[Anum_pg_aggregate_aggfinaltype - 1] =
-                       ObjectIdGetDatum(xret2);
+               values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(InvalidOid);
+               values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(xret2);
+               values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(xret2);
        }
        else if (!OidIsValid(xfn2))
        {
-               values[Anum_pg_aggregate_aggtranstype1 - 1] =
-                       ObjectIdGetDatum(xret1);
-               values[Anum_pg_aggregate_aggtranstype2 - 1] =
-                       ObjectIdGetDatum(InvalidOid);
-               values[Anum_pg_aggregate_aggfinaltype - 1] =
-                       ObjectIdGetDatum(xret1);
+               values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(xret1);
+               values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(InvalidOid);
+               values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(xret1);
        }
        else
        {
-               values[Anum_pg_aggregate_aggtranstype1 - 1] =
-                       ObjectIdGetDatum(xret1);
-               values[Anum_pg_aggregate_aggtranstype2 - 1] =
-                       ObjectIdGetDatum(xret2);
-               values[Anum_pg_aggregate_aggfinaltype - 1] =
-                       ObjectIdGetDatum(fret);
+               values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(xret1);
+               values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(xret2);
+               values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(fret);
        }
 
        if (agginitval1)