Another 'mega-commit' of back-patches ...
authorMarc G. Fournier <[email protected]>
Mon, 2 Aug 1999 05:25:27 +0000 (05:25 +0000)
committerMarc G. Fournier <[email protected]>
Mon, 2 Aug 1999 05:25:27 +0000 (05:25 +0000)
- integrating the #include file cleanup that Bruce recently did
- got the CPU change to adt/Makefile
- changing DOUBLEALIGN -> MAXALIGN

142 files changed:
src/backend/access/common/heaptuple.c
src/backend/access/common/indextuple.c
src/backend/access/common/indexvalid.c
src/backend/access/common/printtup.c
src/backend/access/common/scankey.c
src/backend/access/common/tupdesc.c
src/backend/access/gist/gist.c
src/backend/access/gist/gistget.c
src/backend/access/gist/gistscan.c
src/backend/access/gist/giststrat.c
src/backend/access/hash/hash.c
src/backend/access/hash/hashfunc.c
src/backend/access/hash/hashinsert.c
src/backend/access/hash/hashovfl.c
src/backend/access/hash/hashscan.c
src/backend/access/hash/hashsearch.c
src/backend/access/hash/hashstrat.c
src/backend/access/hash/hashutil.c
src/backend/access/heap/stats.c
src/backend/access/index/genam.c
src/backend/access/index/istrat.c
src/backend/access/nbtree/nbtcompare.c
src/backend/access/nbtree/nbtinsert.c
src/backend/access/nbtree/nbtpage.c
src/backend/access/nbtree/nbtree.c
src/backend/access/nbtree/nbtscan.c
src/backend/access/nbtree/nbtsort.c
src/backend/access/nbtree/nbtstrat.c
src/backend/access/nbtree/nbtutils.c
src/backend/access/rtree/rtget.c
src/backend/access/rtree/rtproc.c
src/backend/access/rtree/rtree.c
src/backend/access/rtree/rtscan.c
src/backend/access/rtree/rtstrat.c
src/backend/access/transam/transsup.c
src/backend/access/transam/xid.c
src/backend/utils/Gen_fmgrtab.sh.in
src/backend/utils/adt/Makefile
src/backend/utils/adt/acl.c
src/backend/utils/adt/arrayfuncs.c
src/backend/utils/adt/arrayutils.c
src/backend/utils/adt/bool.c
src/backend/utils/adt/cash.c
src/backend/utils/adt/char.c
src/backend/utils/adt/chunk.c
src/backend/utils/adt/date.c
src/backend/utils/adt/datetime.c
src/backend/utils/adt/datum.c
src/backend/utils/adt/dt.c
src/backend/utils/adt/filename.c
src/backend/utils/adt/float.c
src/backend/utils/adt/geo_ops.c
src/backend/utils/adt/geo_selfuncs.c
src/backend/utils/adt/inet_net_ntop.c
src/backend/utils/adt/inet_net_pton.c
src/backend/utils/adt/int.c
src/backend/utils/adt/int8.c
src/backend/utils/adt/like.c
src/backend/utils/adt/mac.c
src/backend/utils/adt/misc.c
src/backend/utils/adt/nabstime.c
src/backend/utils/adt/name.c
src/backend/utils/adt/network.c
src/backend/utils/adt/not_in.c
src/backend/utils/adt/numeric.c
src/backend/utils/adt/numutils.c
src/backend/utils/adt/oid.c
src/backend/utils/adt/oracle_compat.c
src/backend/utils/adt/regexp.c
src/backend/utils/adt/regproc.c
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/selfuncs.c
src/backend/utils/adt/sets.c
src/backend/utils/adt/tid.c
src/backend/utils/adt/timestamp.c
src/backend/utils/adt/varchar.c
src/backend/utils/adt/varlena.c
src/backend/utils/adt/version.c
src/backend/utils/cache/catcache.c
src/backend/utils/cache/inval.c
src/backend/utils/cache/lsyscache.c
src/backend/utils/cache/rel.c
src/backend/utils/cache/relcache.c
src/backend/utils/cache/syscache.c
src/backend/utils/cache/temprel.c
src/backend/utils/error/assert.c
src/backend/utils/error/elog.c
src/backend/utils/error/exc.c
src/backend/utils/error/excabort.c
src/backend/utils/error/excid.c
src/backend/utils/error/format.c
src/backend/utils/fmgr/dfmgr.c
src/backend/utils/fmgr/fmgr.c
src/backend/utils/hash/dynahash.c
src/backend/utils/hash/hashfn.c
src/backend/utils/init/enbl.c
src/backend/utils/init/findbe.c
src/backend/utils/init/globals.c
src/backend/utils/init/miscinit.c
src/backend/utils/init/postinit.c
src/backend/utils/mb/common.c
src/backend/utils/mb/mbutils.c
src/backend/utils/mb/utftest.c
src/backend/utils/mb/variable.c
src/backend/utils/mb/wstrcmp.c
src/backend/utils/mb/wstrncmp.c
src/backend/utils/misc/database.c
src/backend/utils/misc/superuser.c
src/backend/utils/misc/trace.c
src/backend/utils/mmgr/aset.c
src/backend/utils/mmgr/mcxt.c
src/backend/utils/mmgr/oset.c
src/backend/utils/mmgr/palloc.c
src/backend/utils/mmgr/portalmem.c
src/backend/utils/sort/lselect.c
src/backend/utils/sort/psort.c
src/backend/utils/time/tqual.c
src/include/access/gist.h
src/include/access/gistscan.h
src/include/access/giststrat.h
src/include/access/hash.h
src/include/access/istrat.h
src/include/access/itup.h
src/include/access/rtree.h
src/include/access/rtstrat.h
src/include/utils/array.h
src/include/utils/builtins.h
src/include/utils/datetime.h
src/include/utils/dt.h
src/include/utils/dynamic_loader.h
src/include/utils/elog.h
src/include/utils/fcache.h
src/include/utils/fcache2.h
src/include/utils/inval.h
src/include/utils/lselect.h
src/include/utils/lsyscache.h
src/include/utils/memutils.h
src/include/utils/numeric.h
src/include/utils/portal.h
src/include/utils/temprel.h
src/include/utils/tqual.h
src/include/utils/trace.h

index 626ffd14570302442054d5038a55b5e87e625606..1f244cc16fc9001d68d15e9bacb77d00c6115f70 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.53 1999/06/12 14:07:20 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.53.2.1 1999/08/02 05:24:25 scrappy Exp $
  *
  * NOTES
  *   The old interface functions have been converted to macros
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <access/htup.h>
-#include <access/transam.h>
-#include <access/tupmacs.h>
-#include <catalog/pg_type.h>
-#include <storage/bufpage.h>
-#include <utils/memutils.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "access/heapam.h"
+#include "catalog/pg_type.h"
 
 /* Used by heap_getattr() macro, for speed */
 long       heap_sysoffset[] = {
@@ -688,7 +677,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
        len += bitmaplen;
    }
 
-   hoff = len = DOUBLEALIGN(len);      /* be conservative here */
+   hoff = len = MAXALIGN(len);     /* be conservative here */
 
    len += ComputeDataSize(tupleDescriptor, value, nulls);
 
@@ -822,7 +811,7 @@ heap_addheader(uint32 natts,    /* max domain index */
 
    len = offsetof(HeapTupleHeaderData, t_bits);
 
-   hoff = len = DOUBLEALIGN(len);      /* be conservative */
+   hoff = len = MAXALIGN(len);     /* be conservative */
    len += structlen;
    tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len);
    td = tuple->t_data = (HeapTupleHeader) ((char *) tuple + HEAPTUPLESIZE);
index 5c779bcf6c7d1c09686d73444467df704a082699..e42bfb0a0e40301da9133d79daf36ec35c7162c4 100644 (file)
@@ -8,24 +8,17 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.33 1999/02/13 23:14:11 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.33.2.1 1999/08/02 05:24:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <access/ibit.h>
-#include <access/itup.h>
-#include <access/tupmacs.h>
-#include <catalog/pg_type.h>
+#include "access/heapam.h"
+#include "access/itup.h"
+#include "catalog/pg_type.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *               index_ tuple interface routines
@@ -67,7 +60,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 
    hoff = IndexInfoFindDataOffset(infomask);
    size = hoff + ComputeDataSize(tupleDescriptor, value, null);
-   size = DOUBLEALIGN(size);   /* be conservative */
+   size = MAXALIGN(size);  /* be conservative */
 
    tp = (char *) palloc(size);
    tuple = (IndexTuple) tp;
index c2387dae24011c7a21e43d513d0c9aa57cbd2fc0..36910c8f86541133454ade751bfad820fecf6d77 100644 (file)
@@ -7,19 +7,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.21 1999/02/13 23:14:12 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.21.2.1 1999/08/02 05:24:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-#include <fmgr.h>
+#include "postgres.h"
 
-#include <access/htup.h>
-#include <access/iqual.h>
-#include <access/itup.h>
-#include <access/skey.h>
-#include <executor/execdebug.h>
+#include "access/iqual.h"
+#include "executor/execdebug.h"
 
 /* ----------------------------------------------------------------
  *               index scan key qualification code
index d2d990421baaaf68173188965c875becf8091943..997ee34b2b226ce1be7b86a453a1c9c15a2e3522 100644 (file)
@@ -8,20 +8,17 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47 1999/05/25 22:40:47 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47.2.1 1999/08/02 05:24:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
-#include "fmgr.h"
 #include "access/heapam.h"
 #include "access/printtup.h"
 #include "catalog/pg_type.h"
-#include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "utils/syscache.h"
 
index 7dd9b6a9206c658ad647375e83e8128ae10cde42..002a47f2ce9faf57627a03381e8bd5498d4aba34 100644 (file)
@@ -7,15 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.14 1999/05/25 16:06:41 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.14.2.1 1999/08/02 05:24:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <fmgr.h>
-#include <access/skey.h>
+#include "access/skey.h"
 
 /*
  * ScanKeyEntryIsLegal
index 5692129d9edf300ebe5d0c384fd1939267fb9b70..a104088df66b9019a9320a167d034d9894a57a73 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50 1999/05/25 22:40:48 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50.2.1 1999/08/02 05:24:26 scrappy Exp $
  *
  * NOTES
  *   some of the executor utility code such as "ExecTypeFromTL" should be
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
+#include "postgres.h"
 
-#include <postgres.h>
+#include "catalog/pg_type.h"
+#include "nodes/parsenodes.h"
+#include "parser/parse_type.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
-#include <catalog/pg_type.h>
-#include <nodes/parsenodes.h>
-#include <parser/parse_type.h>
-#include <utils/builtins.h>
-#include <utils/fcache.h>
-#include <utils/syscache.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *     CreateTemplateTupleDesc
index 06321990a8da7d48b81e36c9ba387f50c9421e9f..167f7e58721472d728bd1e8d70f37c0c195d372a 100644 (file)
@@ -6,31 +6,22 @@
  *
  *
  * IDENTIFICATION
- *
+ *   $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.38.2.1 1999/08/02 05:24:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <fmgr.h>
-#include <access/genam.h>
-#include <access/gist.h>
-#include <access/gistscan.h>
-#include <access/heapam.h>
-#include <catalog/index.h>
-#include <executor/executor.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <storage/lmgr.h>
-#include <utils/syscache.h>
-#include <utils/tqual.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/gist.h"
+#include "access/gistscan.h"
+#include "access/heapam.h"
+#include "catalog/index.h"
+#include "catalog/pg_index.h"
+#include "executor/executor.h"
+#include "utils/syscache.h"
+
 
 /* non-export function prototypes */
 static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
@@ -60,7 +51,9 @@ void      gistdelete(Relation r, ItemPointer tid);
 static IndexTuple gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t);
 static void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
               Relation r, Page pg, OffsetNumber o, int b, bool l);
+#ifdef GISTDEBUG
 static char *int_range_out(INTRANGE *r);
+#endif
 
 /*
 ** routine to build an index.  Basically calls insert over and over
index 665bc830357e1d247f11fe4c7ce1a915a95bcee1..fc18377a94a27dba6da8c7e983ac3b10d8defbc5 100644 (file)
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <access/relscan.h>
-#include <storage/bufpage.h>
-#include <access/sdir.h>
-#include <access/itup.h>
-#include <access/gist.h>
-#include <executor/execdebug.h>
-#include <storage/bufmgr.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/gist.h"
+#include "executor/execdebug.h"
+
 
 
 static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,
index d26387d8280c944c1a80ce9ec2c3475a97b4ecd6..e7a864985a474d4854c8547d68fa7d24d7e1de13 100644 (file)
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <access/gist.h>
-#include <access/gistscan.h>
-#include <access/genam.h>
-#include <access/rtree.h>
-#include <storage/bufmgr.h>
-#include <access/giststrat.h>
-#include <storage/lmgr.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/gist.h"
+#include "access/gistscan.h"
+
 
 /* routines defined and used here */
 static void gistregscan(IndexScanDesc s);
index 69eb9c31c3f749dcca0306d0f8bde41c5c8cbb4c..e1a5e497a7d0d43faa5a3ab883b2473fce0d8e4c 100644 (file)
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/gist.h>
-#include <access/istrat.h>
+#include "access/gist.h"
+#include "access/istrat.h"
 
 /*
  * Note:  negate, commute, and negatecommute all assume that operators are
index 65d04658c50435e62502f0d453c1add20ea78941..7ffc409f18a9a119348648a20d7d874d6169b331 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.26 1999/05/25 16:06:54 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.26.2.1 1999/08/02 05:24:33 scrappy Exp $
  *
  * NOTES
  *   This file contains only the public interface routines.
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
-#include <access/genam.h>
-#include <catalog/index.h>
-#include <storage/bufmgr.h>
-#include <miscadmin.h>
+#include "access/genam.h"
+#include "access/hash.h"
+#include "access/heapam.h"
+#include "catalog/index.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 bool       BuildingHash = false;
 
index 1f607dcb3fde3fbaf23d58a2dd1427e042f6f7a0..b9f36b0e11d2b1e2724e5472b0b694a96f95908b 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18 1999/05/25 22:40:49 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18.2.1 1999/08/02 05:24:33 scrappy Exp $
  *
  * NOTES
  *   These functions are stored in pg_amproc.  For each operator class
@@ -19,7 +19,6 @@
 #include "postgres.h"
 
 #include "access/hash.h"
-#include "utils/int8.h"
 
 uint32
 hashint2(int16 key)
index f1d5d56013d3bf1984a6a5d97603acf81473c61f..5234db4d9f0789ee1d66d9d2d1b5576bc4e88a25 100644 (file)
@@ -7,16 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.15 1999/02/13 23:14:19 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.15.2.1 1999/08/02 05:24:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
+#include "access/hash.h"
 
 static InsertIndexResult _hash_insertonpg(Relation rel, Buffer buf, int keysz, ScanKey scankey, HashItem hitem, Buffer metabuf);
 static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey itup_scankey, Size itemsize, HashItem hitem);
@@ -130,7 +128,7 @@ _hash_insertonpg(Relation rel,
 
    itemsz = IndexTupleDSize(hitem->hash_itup)
        + (sizeof(HashItemData) - sizeof(IndexTupleData));
-   itemsz = DOUBLEALIGN(itemsz);
+   itemsz = MAXALIGN(itemsz);
 
    while (PageGetFreeSpace(page) < itemsz)
    {
index ab599abf05833d67911ebb174144285a52c4dc70..0603fe18464310a4f6fc58f348c941a101f04cc7 100644 (file)
@@ -7,24 +7,17 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.20 1999/02/13 23:14:19 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.20.2.1 1999/08/02 05:24:34 scrappy Exp $
  *
  * NOTES
  *   Overflow pages look like ordinary relation pages.
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
+#include "access/hash.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
 static uint32 _hash_firstfreebit(uint32 map);
@@ -538,7 +531,7 @@ _hash_squeezebucket(Relation rel,
        hitem = (HashItem) PageGetItem(rpage, PageGetItemId(rpage, roffnum));
        itemsz = IndexTupleDSize(hitem->hash_itup)
            + (sizeof(HashItemData) - sizeof(IndexTupleData));
-       itemsz = DOUBLEALIGN(itemsz);
+       itemsz = MAXALIGN(itemsz);
 
        /*
         * walk up the bucket chain, looking for a page big enough for
index 418788d472d509487d5f75814e26798ff2ba55ac..af82db9c50f0302d5c51361925cc3aa3f9c8d66b 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.17 1999/02/13 23:14:20 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.17.2.1 1999/08/02 05:24:35 scrappy Exp $
  *
  * NOTES
  *   Because we can be doing an index scan on a relation while we
@@ -27,9 +27,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
+#include "access/hash.h"
 
 static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
 static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
index 5e00180c6098cabba109063cb4bd8d7da1cece41..7dad1ce89056f4d200347b196f5e9d244db8ab8d 100644 (file)
@@ -7,21 +7,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.17 1999/02/13 23:14:20 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.17.2.1 1999/08/02 05:24:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <storage/bufmgr.h>
+#include "access/hash.h"
 
-#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
-#else
-#include <string.h>
-#endif
 
 /*
  * _hash_search() -- Finds the page/bucket that the contains the
index 91c18729ff54749499c0e9e9e032a76cf161a1f6..fdf2eb635c2ab5a1b635526574e99a9d563d53b1 100644 (file)
@@ -7,15 +7,13 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.13 1999/02/13 23:14:21 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.13.2.1 1999/08/02 05:24:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <access/istrat.h>
 
 /*
  * only one valid strategy for hash tables: equality.
index 304ae236cbf8ecf765b84fb751049a73529dabef..10123a7c6bbc00ef489ace9ea8122e57866b86d4 100644 (file)
@@ -7,23 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.15 1999/02/13 23:14:21 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.15.2.1 1999/08/02 05:24:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <fmgr.h>
-#include <utils/memutils.h>
-#include <access/iqual.h>
+#include "access/hash.h"
+#include "access/iqual.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 ScanKey
 _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
@@ -134,9 +127,9 @@ _hash_checkpage(Page page, int flags)
    Assert(((PageHeader) (page))->pd_lower >= (sizeof(PageHeaderData) - sizeof(ItemIdData)));
 #if 1
    Assert(((PageHeader) (page))->pd_upper <=
-          (BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
+          (BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
    Assert(((PageHeader) (page))->pd_special ==
-          (BLCKSZ - DOUBLEALIGN(sizeof(HashPageOpaqueData))));
+          (BLCKSZ - MAXALIGN(sizeof(HashPageOpaqueData))));
    Assert(((PageHeader) (page))->pd_opaque.od_pagesize == BLCKSZ);
 #endif
    if (flags)
index b17a71cdd9b98977871ee71183784ba9e38c8988..0d4f10421ecc032044b7a6a0fe1e59ceda80d31b 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.16 1999/07/03 00:32:36 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.16.2.1 1999/08/02 05:24:37 scrappy Exp $
  *
  * NOTES
  *   initam should be moved someplace else.
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <time.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <utils/mcxt.h>
+#include "access/heapam.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static void InitHeapAccessStatistics(void);
 
index 70b9ae2a4b04b2533677beacb2ad27ef8cf1feec..ebc7f074e62075b31f0938f658a087a8512b0dc8 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.17 1999/05/25 16:07:12 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.17.2.1 1999/08/02 05:24:38 scrappy Exp $
  *
  * NOTES
  *   many of the old access method routines have been turned into
  * ----------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
+#include "access/genam.h"
 
-#include <utils/catcache.h>
-#include <access/genam.h>
-#include <storage/bufmgr.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *     general access method routines
index 268df6946e5868a5e9da8cb6235d9ed18d0a4a7b..fa27bbef79ec26c388cac3fe926bd4bfccff4aa5 100644 (file)
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33 1999/06/19 04:54:10 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33.2.1 1999/08/02 05:24:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
 #include "catalog/catname.h"
@@ -23,9 +22,8 @@
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_operator.h"
+#include "miscadmin.h"
 #include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/memutils.h"        /* could have been access/itup.h */
 
 #ifdef USE_ASSERT_CHECKING
 static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
index 505d4ab55d6a361cdc2634e5995444c698e04ad0..cc199b18a8c5bf61ce5d41eb92bba46e65f26eed 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24 1999/05/25 22:40:50 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24.2.1 1999/08/02 05:24:40 scrappy Exp $
  *
  * NOTES
  *     These functions are stored in pg_amproc.  For each operator class
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/builtins.h>
-#include <utils/nabstime.h>
+#include "utils/builtins.h"
 
 int32
 btint2cmp(int16 a, int16 b)
index cd3de2e26b0d5bb9fc9a4bd70521d3072fce6b76..b894bcc2931427a59dc9d497471a89ef0943c6ea 100644 (file)
@@ -7,25 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.42 1999/05/25 22:04:11 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.42.2.1 1999/08/02 05:24:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/memutils.h>
-#include <storage/bufpage.h>
-#include <access/nbtree.h>
-#include <access/heapam.h>
-#include <access/xact.h>
-#include <fmgr.h>
+#include "access/heapam.h"
+#include "access/nbtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
 static Buffer _bt_split(Relation rel, Buffer buf, OffsetNumber firstright);
@@ -272,7 +263,7 @@ _bt_insertonpg(Relation rel,
    itemsz = IndexTupleDSize(btitem->bti_itup)
        + (sizeof(BTItemData) - sizeof(IndexTupleData));
 
-   itemsz = DOUBLEALIGN(itemsz);       /* be safe, PageAddItem will do
+   itemsz = MAXALIGN(itemsz);      /* be safe, PageAddItem will do
                                         * this but we need to be
                                         * consistent */
 
@@ -378,7 +369,7 @@ _bt_insertonpg(Relation rel,
        if (currsize > maxsize)
            maxsize = currsize;
        maxsize += sizeof(PageHeaderData) +
-           DOUBLEALIGN(sizeof(BTPageOpaqueData));
+           MAXALIGN(sizeof(BTPageOpaqueData));
        if (maxsize >= PageGetPageSize(page) / 2)
            do_split = true;
    }
@@ -469,7 +460,7 @@ _bt_insertonpg(Relation rel,
 
            maxoff = PageGetMaxOffsetNumber(page);
            llimit = PageGetPageSize(page) - sizeof(PageHeaderData) -
-               DOUBLEALIGN(sizeof(BTPageOpaqueData))
+               MAXALIGN(sizeof(BTPageOpaqueData))
                +sizeof(ItemIdData);
            llimit /= 2;
            firstright = _bt_findsplitloc(rel, page, start, maxoff, llimit);
@@ -698,8 +689,8 @@ l_spl:  ;
                 * then we must forse insertion.
                 */
                if (!parent_chained &&
-                   DOUBLEALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
-               DOUBLEALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
+                   MAXALIGN(IndexTupleDSize(lowLeftItem->bti_itup)) ==
+                   MAXALIGN(IndexTupleDSize(stack->bts_btitem->bti_itup)))
                {
                    _bt_updateitem(rel, keysz, pbuf,
                                   stack->bts_btitem, lowLeftItem);
@@ -1600,7 +1591,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
    /* add passed hikey */
    itemsz = IndexTupleDSize(hikey->bti_itup)
        + (sizeof(BTItemData) - sizeof(IndexTupleData));
-   itemsz = DOUBLEALIGN(itemsz);
+   itemsz = MAXALIGN(itemsz);
    if (PageAddItem(page, (Item) hikey, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber)
        elog(FATAL, "btree: failed to add hikey in _bt_shift");
    pfree(hikey);
@@ -1608,7 +1599,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
    /* add btitem */
    itemsz = IndexTupleDSize(btitem->bti_itup)
        + (sizeof(BTItemData) - sizeof(IndexTupleData));
-   itemsz = DOUBLEALIGN(itemsz);
+   itemsz = MAXALIGN(itemsz);
    if (PageAddItem(page, (Item) btitem, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber)
        elog(FATAL, "btree: failed to add firstkey in _bt_shift");
    pfree(btitem);
index d5ac5c3ea26a09d8a33649a271dd4e6af4cdd793..650a5f499170dfd4660bb7139c8e93937df7740b 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.24 1999/06/07 14:28:22 vadim Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.24.2.1 1999/08/02 05:24:41 scrappy Exp $
  *
  * NOTES
  *    Postgres btree pages look like ordinary relation pages.  The opaque
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <time.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <storage/bufpage.h>
-#include <access/nbtree.h>
-#include <miscadmin.h>
-#include <storage/lmgr.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "access/nbtree.h"
+#include "miscadmin.h"
 
 #define BTREE_METAPAGE 0
 #define BTREE_MAGIC        0x053162
index 59fa09094e7c8f7ac2ed6374788772a3bf381dc3..0479ac55696d4f20de9ea13a6641c140f5556df2 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.41 1999/06/07 15:14:54 vadim Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.41.2.1 1999/08/02 05:24:41 scrappy Exp $
  *
  * NOTES
  *   This file contains only the public interface routines.
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <access/genam.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
-#include <access/nbtree.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
-#include <catalog/index.h>
-#include <miscadmin.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/nbtree.h"
+#include "catalog/index.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
 
 #ifdef BTREE_BUILD_STATS
-#include <tcop/tcopprot.h>
-#include <utils/trace.h>
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
index e250c99b0209c0a7a269f65047a929580fc967df..4cb3747d49e6cac33b424220d92117eda2953709 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.23 1999/05/25 22:04:14 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.23.2.1 1999/08/02 05:24:41 scrappy Exp $
  *
  *
  * NOTES
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <storage/bufpage.h>
-#include <access/nbtree.h>
+#include "access/nbtree.h"
 
 typedef struct BTScanListData
 {
index 3c091759497186c4d327ae299a2ea3fa2fe00b48..54899c016a90792659a560cab7d268dd1b66de23 100644 (file)
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *   $Id: nbtsort.c,v 1.40 1999/05/25 18:20:31 vadim Exp $
+ *   $Id: nbtsort.c,v 1.40.2.1 1999/08/02 05:24:41 scrappy Exp $
  *
  * NOTES
  *
 #include "postgres.h"
 
 #include "access/nbtree.h"
-#include "storage/bufpage.h"
-#include "utils/memutils.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #ifdef BTREE_BUILD_STATS
-#include "tcop/tcopprot.h"
-#include <utils/trace.h>
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif
 
@@ -95,7 +86,7 @@ extern int    NDirectFileWrite;
  * are potentially reading a bunch of zeroes off of disk in many
  * cases.
  *
- * BTItems are packed in and DOUBLEALIGN'd.
+ * BTItems are packed in and MAXALIGN'd.
  *
  * the fd should not be going out to disk, strictly speaking, but it's
  * the only thing like that so i'm not going to worry about wasting a
@@ -506,7 +497,7 @@ _bt_tapenext(BTTapeBlock *tape, char **pos)
        return (BTItem) NULL;
    bti = (BTItem) *pos;
    itemsz = BTITEMSZ(bti);
-   *pos += DOUBLEALIGN(itemsz);
+   *pos += MAXALIGN(itemsz);
    return bti;
 }
 
@@ -526,7 +517,7 @@ _bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz)
 {
    memcpy(tape->bttb_data + tape->bttb_top, item, itemsz);
    ++tape->bttb_ntup;
-   tape->bttb_top += DOUBLEALIGN(itemsz);
+   tape->bttb_top += MAXALIGN(itemsz);
 }
 
 /*-------------------------------------------------------------------------
@@ -662,7 +653,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
 
    itape = btspool->bts_itape[btspool->bts_tape];
    itemsz = BTITEMSZ(btitem);
-   itemsz = DOUBLEALIGN(itemsz);
+   itemsz = MAXALIGN(itemsz);
 
    /*
     * if this buffer is too full for this BTItemData, or if we have run
@@ -702,7 +693,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
         * BTItemDatas in the order dictated by the sorted array of
         * BTItems, not the original order.
         *
-        * (since everything was DOUBLEALIGN'd and is all on a single tape
+        * (since everything was MAXALIGN'd and is all on a single tape
         * block, everything had *better* still fit on one tape block..)
         */
        otape = btspool->bts_otape[btspool->bts_tape];
@@ -710,7 +701,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
        {
            bti = parray[i].btsk_item;
            btisz = BTITEMSZ(bti);
-           btisz = DOUBLEALIGN(btisz);
+           btisz = MAXALIGN(btisz);
            _bt_tapeadd(otape, bti, btisz);
 #if defined(FASTBUILD_DEBUG) && defined(FASTBUILD_SPOOL)
            {
@@ -912,7 +903,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 
    pgspc = PageGetFreeSpace(npage);
    btisz = BTITEMSZ(bti);
-   btisz = DOUBLEALIGN(btisz);
+   btisz = MAXALIGN(btisz);
    if (pgspc < btisz)
    {
        Buffer      obuf = nbuf;
@@ -1230,7 +1221,7 @@ _bt_merge(Relation index, BTSpool *btspool)
                if (bti != (BTItem) NULL)
                {
                    btisz = BTITEMSZ(bti);
-                   btisz = DOUBLEALIGN(btisz);
+                   btisz = MAXALIGN(btisz);
                    if (doleaf)
                    {
                        _bt_buildadd(index, state, bti, BTP_LEAF);
index 902601a3baaaff9a56491009989899a0454f00d9..4ff49f731c19df46c5105ef36aa9735f60829cc1 100644 (file)
@@ -7,16 +7,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.8 1999/02/13 23:14:37 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.8.2.1 1999/08/02 05:24:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/istrat.h>
-#include <storage/bufpage.h>
-#include <access/nbtree.h>
+#include "access/istrat.h"
+#include "access/nbtree.h"
 
 /*
  * Note:
index 42666c431e5e3386a63286d70e60893c696e96ae..3494e6cc2f4403b602287c4b2320a352805855df 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.27 1999/05/25 18:20:31 vadim Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.27.2.1 1999/08/02 05:24:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "access/iqual.h"
 #include "access/istrat.h"
 #include "access/nbtree.h"
 #include "executor/execdebug.h"
-#include "fmgr.h"
-#include "storage/bufpage.h"
 
 extern int NIndexTupleProcessed;
 
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 ScanKey
 _bt_mkscankey(Relation rel, IndexTuple itup)
index 70b1f172a949228fb4a025f2a7581ad4d5d850aa..c339f289bc1c71c743df52d49995df090204aa2d 100644 (file)
@@ -7,24 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.13 1999/02/13 23:14:41 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.13.2.1 1999/08/02 05:24:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <storage/bufmgr.h>
-#include <access/sdir.h>
-#include <access/relscan.h>
-#include <access/iqual.h>
-#include <access/rtree.h>
-#include <storage/bufpage.h>
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/iqual.h"
+#include "access/rtree.h"
+
 
 
 static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
index f7772de64c7df4f76518e713934abdb95f186f23..b1e2ae161c55583ecd5f4159db33ed40ba8fa4a5 100644 (file)
@@ -7,20 +7,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.18 1999/02/13 23:14:42 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.18.2.1 1999/08/02 05:24:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
+
+#include "utils/builtins.h"
 
-#include <utils/builtins.h>
-#include <utils/geo_decls.h>
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 BOX
           *
index f62a4bf648a1b0aed26b52b29fa9d5bb344a964d..811991b2f1c84bcbd5fa9acf872e96d281929d9d 100644 (file)
@@ -7,30 +7,20 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.32 1999/05/25 16:07:38 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.32.2.1 1999/08/02 05:24:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <access/genam.h>
-#include <catalog/index.h>
-#include <access/rtscan.h>
-#include <storage/lmgr.h>
-#include <access/rtree.h>
-#include <storage/bufmgr.h>
-#include <utils/geo_decls.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
-
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/rtree.h"
+#include "catalog/index.h"
+#include "executor/executor.h"
+#include "utils/geo_decls.h"
+
 
 typedef struct SPLITVEC
 {
index b74a341304a7a97e8cecf45f150df9d05fb377fc..823a80230cdf1fd255443ecf19600b721062fe13 100644 (file)
@@ -7,24 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.23 1999/05/25 16:07:40 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.23.2.1 1999/08/02 05:24:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-
-#include <storage/bufmgr.h>
-#include <access/genam.h>
-#include <storage/lmgr.h>
-#include <storage/bufpage.h>
-#include <access/rtree.h>
-#include <access/rtstrat.h>
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/rtree.h"
+
 
 
 /* routines defined and used here */
index 6f838a4a4a9f1a4d16f391ced5096e609a403806..b1900186b823dcf90b3fdb8cfd5dfc8f0a61a599 100644 (file)
@@ -7,16 +7,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.11 1999/02/13 23:14:43 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.11.2.1 1999/08/02 05:24:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/rel.h>
-#include <access/rtree.h>
-#include <access/istrat.h>
+#include "access/istrat.h"
+#include "access/rtree.h"
 
 static StrategyNumber RelationGetRTStrategy(Relation r,
                      AttrNumber attnum, RegProcedure proc);
index a12b1ade2830d14499ca3cfed02a7983b37f61ad..6fde4d74a0d9d55e6699bf040db150e36a123f77 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21 1999/03/30 01:37:21 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21.2.1 1999/08/02 05:24:46 scrappy Exp $
  *
  * NOTES
  *   This file contains support functions for the high
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/transam.h>
-#include <utils/bit.h>
-#include <access/xact.h>
-#include <storage/lmgr.h>
+#include "access/xact.h"
+#include "utils/bit.h"
 
 static XidStatus TransBlockGetXidStatus(Block tblock,
                       TransactionId transactionId);
index 2b15fec1bf64c30a752d9dc7f379d9e7fd4ac877..50db11bc9123baf3735908e84eb17a8e67dbe710 100644 (file)
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xid.c,v 1.22 1999/05/25 16:07:52 momjian Exp $
+ * $Id: xid.c,v 1.22.2.1 1999/08/02 05:24:46 scrappy Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 
-#include <postgres.h>
-#include <access/xact.h>
+#include "postgres.h"
+#include "access/xact.h"
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;
index 4537f91d48f0b44070e7343f999702781425979d..4c11e9c3e2866aed1ba12c3d3125142e70aac3cd 100644 (file)
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15.2.1 1999/08/02 05:24:47 scrappy Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -83,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.15.2.1 1999/08/02 05:24:47 scrappy Exp $
  *
  * NOTES
  * ******************************
@@ -206,7 +206,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15.2.1 1999/08/02 05:24:47 scrappy Exp $
  *
  * NOTES
  *
@@ -225,7 +225,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  */
 
 #include <string.h>
-#include <postgres.h>
+#include "postgres.h"
 #include "utils/fmgrtab.h"
 
 FuNkYfMgRtAbStUfF
index f06ffef5da8fddc7b03262a0a0a8e6167470113b..e948c05c05adecf75aa94b503f3e427a0d8b3edc 100644 (file)
@@ -4,7 +4,7 @@
 #    Makefile for utils/adt
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.21 1998/12/30 19:56:29 wieck Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.21.2.1 1999/08/02 05:24:49 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,6 +13,16 @@ include ../../../Makefile.global
 
 CFLAGS += -I../..
 
+# seems to be required for some date/time stuff 1999/07/22 bjm
+ifeq ($(CPU),alpha)
+ifeq ($(CC), gcc)
+CFLAGS+= -mieee
+endif
+ifeq ($(CC), egcs)
+CFLAGS+= -mieee
+endif
+endif
+
 ifdef MULTIBYTE
 CFLAGS+= $(MBFLAGS)
 endif
@@ -40,4 +50,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
index b456a5f6c700cd220ba1ef1043833de224657e6c..9c4b1c6c6cd4f5476bf71d3b58a936de70653940 100644 (file)
@@ -7,21 +7,20 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.37 1999/07/09 03:28:51 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.37.2.1 1999/08/02 05:24:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 #include "postgres.h"
 
-#include <utils/memutils.h>
-#include "utils/acl.h"
-#include "utils/syscache.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
+#include "utils/acl.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
 
 static char *getid(char *s, char *n);
 static int32 aclitemeq(AclItem *a1, AclItem *a2);
index b0e59e3ff08ca39fcb30f83f4fd11e3a86464613..fd01b17e19ac7cf7b29f91a048aa6680ca4a0afb 100644 (file)
@@ -7,30 +7,25 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43 1999/05/25 16:11:50 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43.2.1 1999/08/02 05:24:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
 
 #include "postgres.h"
 
+
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
-
-#include "utils/syscache.h"
-#include "utils/memutils.h"
-#include "storage/fd.h"
 #include "fmgr.h"
-#include "utils/array.h"
-#include "utils/elog.h"
-
-#include "libpq/libpq-fs.h"
 #include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+#include "storage/fd.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
 
 #define ASSGN   "="
 
@@ -477,7 +472,7 @@ _ReadArrayStr(char *arrayStr,
            if (values[i])
            {
                if (typalign == 'd')
-                   *nbytes += DOUBLEALIGN(*(int32 *) values[i]);
+                   *nbytes += MAXALIGN(*(int32 *) values[i]);
                else
                    *nbytes += INTALIGN(*(int32 *) values[i]);
            }
index a0fe502895aa7721f63b7863a902a45bc32a242b..fdd98099c35b87aef2ccf38e34c8b11fc2278878 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.7 1999/02/13 23:19:02 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.7.2.1 1999/08/02 05:24:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,7 @@
 #define WEAK_C_OPTIMIZER
 
 #include "postgres.h"
-
 #include "utils/array.h"
-
 int
 GetOffset(int n, int *dim, int *lb, int *indx)
 {
index 57bb7c32721d093d304a2921dd433eabd225fadf..cc22a11028206ea335ae6f0d36cd17a0c9b3e5e3 100644 (file)
@@ -7,16 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.16 1999/02/13 23:19:04 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.16.2.1 1999/08/02 05:24:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 #include "postgres.h"
 
-#include "utils/builtins.h"        /* where the declarations go */
-#include "utils/palloc.h"
+#include "utils/builtins.h"
 
 /*****************************************************************************
  *  USER I/O ROUTINES                                                       *
index 9f74645d38a42028d4b3f07807d1fe75bf882500..f827bee4cdd663cdabe7b305b24e7632d7d7ce52 100644 (file)
@@ -9,11 +9,9 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.28 1999/05/25 16:11:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.28.2.1 1999/08/02 05:24:50 scrappy Exp $
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <limits.h>
 #include <ctype.h>
 #include <locale.h>
@@ -34,7 +32,6 @@ static const char *num_word(Cash value);
 
 #ifdef USE_LOCALE
 static struct lconv *lconvert = NULL;
-
 #endif
 
 /* cash_in()
index 4c6e37110653306419f95e084020b645f56dc110..1646548ac2bbb5a69519a3b51fbaa33a32dbaadb 100644 (file)
@@ -8,15 +8,12 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.22 1999/05/25 16:11:53 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.22.2.1 1999/08/02 05:24:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>
 #include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h"        /* where the declarations go */
+#include "utils/builtins.h"
 
 /*****************************************************************************
  *  USER I/O ROUTINES                                                       *
index a9a49fe940ed21cad6fa431105e8c414e6d8db95..48d55b439426953519035add4fec6d661a7b9ac7 100644 (file)
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.20 1999/05/25 16:11:55 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.20.2.1 1999/08/02 05:24:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <fcntl.h>
 
 #include "postgres.h"
-#include "fmgr.h"
 
 #include "catalog/pg_type.h"
+#include "fmgr.h"
 #include "libpq/be-fsstubs.h"
 #include "libpq/libpq-fs.h"
 #include "optimizer/internal.h"
 #include "utils/array.h"
 #include "utils/memutils.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
-
 #define INFTY 500000000
 #define MANY  10000
 #define MAXPAT 20
index 7ad18a067e407a7b90b133a965b67f35f7002d28..71cb1f126c162b52b00c8b4eef3f7d2b4dd1c1ef 100644 (file)
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.32 1999/05/25 16:11:56 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.32.2.1 1999/08/02 05:24:51 scrappy Exp $
  *
  * NOTES
  *  This code is actually (almost) unused.
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <stdio.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+
 #include "access/xact.h"
-#include "utils/builtins.h"        /* where function declarations go */
-#include "utils/palloc.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
 #include "utils/dt.h"
 
 #define INVALID_RELTIME_STR        "Undefined RelTime"
index 84163583ef859fbf17aa9e99bac27b07439dba20..66ac4e60714b4d9141bba160d12a00d2f96ed1e7 100644 (file)
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.33 1999/05/25 16:11:58 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.33.2.1 1999/08/02 05:24:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>
 #include <limits.h>
 
 #include "postgres.h"
@@ -21,9 +19,6 @@
 #endif
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/nabstime.h"
-#include "utils/datetime.h"
-#include "access/xact.h"
 
 static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
index 79a9d205ebdc261cb869b53eaaa4df4aacb4ec80..e1566d21388def5b73afa6827268225c0e6cd6d0 100644 (file)
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.12 1999/02/13 23:19:09 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.12.2.1 1999/08/02 05:24:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  * particular instance of the type and about its value.
  *
  */
-#include <string.h>
 #include "postgres.h"
 #include "utils/datum.h"
-#include "catalog/pg_type.h"
-#include "utils/palloc.h"
 
 /*-------------------------------------------------------------------------
  * datumGetSize
index 74028c439a3089a9c603477f68099eada8bf4e36..72004e9b1dbeb62306044df96f029f3900a57001 100644 (file)
@@ -7,19 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.72 1999/07/08 03:22:46 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.72.2.1 1999/08/02 05:24:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <ctype.h>
 #include <math.h>
-#include <string.h>
 #include <sys/types.h>
 #include <errno.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
@@ -29,8 +26,9 @@
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
-#include "utils/builtins.h"
 
+#include "miscadmin.h"
+#include "utils/builtins.h"
 
 static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
 static int DecodeNumber(int flen, char *field,
index bb0621323231a8ba631ad3b0814cc8801331123e..db4da50f3120d7f34a602ae1ec53fd63b409b185 100644 (file)
@@ -7,20 +7,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.17 1999/02/13 23:19:13 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.17.2.1 1999/08/02 05:24:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-#include <stdio.h>
 #include <pwd.h>
 
 #include <sys/param.h>
 
 #include "postgres.h"
-#include <miscadmin.h>
-#include "utils/builtins.h"        /* where function declarations go */
+#include "miscadmin.h"
+#include "utils/builtins.h"
 
 char *
 filename_in(char *file)
index 5f2a4f15232bcdb16196a6ade29b012079df5273..f9bf22625a3f92d3ae896287b2e1eb3edafda11e 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.42 1999/05/25 16:12:02 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.42.2.1 1999/08/02 05:24:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  *      for calls to pow(), exp() since on some machines (my Linux box
  *      included) these routines do not set errno. - tgl 97/05/10
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #include <float.h>             /* faked on sunos4 */
@@ -60,8 +57,7 @@
 #include <limits.h>
 #endif
 #include "fmgr.h"
-#include "utils/builtins.h"        /* for ftod() prototype */
-#include "utils/palloc.h"
+#include "utils/builtins.h"
 
 #ifndef NAN
 #define NAN        (0.0/0.0)
@@ -134,7 +130,7 @@ extern double rint(double x);
  * until the distributions are updated.
  *                             --djm 12/16/96
  */
-#if ( defined(linux) && defined(__alpha) ) && !defined(UNSAFE_FLOATS)
+#if ( defined(linux) && defined(__alpha__) ) && !defined(UNSAFE_FLOATS)
 #define UNSAFE_FLOATS
 #endif
 
index 72166c5a54fc3d7c19d92c74c45b369dcbfadeac..78da702af9f6e20868f3725def272947efa096fd 100644 (file)
@@ -7,22 +7,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.41 1999/02/21 03:49:30 scrappy Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.41.2.1 1999/08/02 05:24:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <math.h>
 #include <limits.h>
 #include <float.h>
-#include <stdio.h>             /* for sprintf proto, etc. */
-#include <stdlib.h>                /* for strtod, etc. */
-#include <string.h>
 #include <ctype.h>
 
 #include "postgres.h"
 
 #include "utils/geo_decls.h"
-#include "utils/palloc.h"
 
 #ifndef PI
 #define PI 3.1415926536
index 5c55dcdaacfcd016667bb395e11e602778215fae..35b3831207c8ebdd9aaddabb2a5e6e45a8fd48c4 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.8 1999/03/28 01:56:12 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.8.2.1 1999/08/02 05:24:53 scrappy Exp $
  *
  *     XXX These are totally bogus.
  *
@@ -16,9 +16,6 @@
  */
 #include "postgres.h"
 
-#include "access/attnum.h"
-#include "utils/geo_decls.h"   /* where function declarations go */
-#include "utils/palloc.h"
 #include "utils/builtins.h"
 
 float64
index 11a0cb9363a75a8f61a7f42c27fb0b29cc6be74d..195c52119451b80450b1ca8c35b9885b88b0613f 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.6 1999/05/25 16:12:04 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.6.2.1 1999/08/02 05:24:53 scrappy Exp $";
 
 #endif
 
@@ -26,12 +26,9 @@ static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.6 1999/05/25 16:12:04 momj
 #include <arpa/inet.h>
 
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
 #define SPRINTF(x) strlen(sprintf/**/x)
index bcc9ff681a249a8c478ae55db8e4f4b3120f9113..ca2ff8a0902e94499c5fef6c94ae05dbe43d5f30 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.8 1999/05/25 16:12:05 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.8.2.1 1999/08/02 05:24:53 scrappy Exp $";
 
 #endif
 
@@ -28,12 +28,9 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.8 1999/05/25 16:12:05 momj
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
 #define SPRINTF(x) strlen(sprintf/**/x)
index 636b6ae5ce85dac7aa2e167e220e92e2732eaa7d..09ce93b5dc9d5e4152c13669766824d8f31768ce 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.21 1999/07/09 15:09:54 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.21.2.1 1999/08/02 05:24:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  * XXX makes massive and possibly unwarranted type promotion assumptions.
  * fix me when we figure out what we want to do about ANSIfication...
  */
-#include <stdio.h>
-#include <string.h>
+
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"        /* where the declarations go */
+#include "utils/builtins.h"
 
 #ifndef SHRT_MAX
 #define SHRT_MAX (0x7FFF)
index ba609865db88ff37b6c1fb8630ebd7fc9b365cfa..2e5e4ebf776d99339f64db21ba12c7faf8e8b473 100644 (file)
@@ -5,9 +5,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf proto, etc. */
-#include <stdlib.h>                /* for strtod, etc. */
-#include <string.h>
 #include <ctype.h>
 #include <time.h>
 #include <math.h>
@@ -15,7 +12,6 @@
 #include <limits.h>
 
 #include "postgres.h"
-#include "utils/palloc.h"
 #include "utils/int8.h"
 
 #define MAXINT8LEN     25
index 2d35bfabaca8acbe66be17660106b5406daa420f..84b8b6fff41e5ddf441b44f95d81a8ac42a2ebe0 100644 (file)
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include "postgres.h"          /* postgres system include file */
-#include "utils/palloc.h"
-#include "utils/builtins.h"        /* where the function declarations go */
+#include "postgres.h"
 #include "mb/pg_wchar.h"
+#include "utils/builtins.h"
 
 static int like(pg_wchar * text, pg_wchar * p);
 
@@ -111,7 +109,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }
 
 
-/* $Revision: 1.25 $
+/* $Revision: 1.25.2.1 $
 ** "like.c" A first attempt at a LIKE operator for Postgres95.
 **
 ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
index 48dd19db94b2afd5bcdb9e2c5a3afda7d96d19d2..1d874e1a208aea817c140f4c3d7d0baaa875b3b0 100644 (file)
@@ -1,16 +1,12 @@
 /*
  * PostgreSQL type definitions for MAC addresses.
  *
- * $Id: mac.c,v 1.8 1999/05/25 16:12:08 momjian Exp $
+ * $Id: mac.c,v 1.8.2.1 1999/08/02 05:24:54 scrappy Exp $
  */
 
-#include <stdio.h>
-#include <string.h>
 
-#include <postgres.h>
-#include <utils/palloc.h>
-#include <utils/builtins.h>
-#include <utils/inet.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 manufacturer manufacturers[] = {
    {0x00, 0x00, 0x0C, "Cisco"},
index d7651355cf39d876588aa6a3d500456346eb1a94..fb9ac6599bb6d061de96e7233677a1584b4538a9 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.16 1999/02/13 23:19:23 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.16.2.1 1999/08/02 05:24:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #include <sys/file.h>
 #include <time.h>
 #include "postgres.h"
-#include "utils/datum.h"
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 
 /*-------------------------------------------------------------------------
index dbbc54c3f828dc5da75b195db34a5a0bcde42ed9..015c7bb9dcbec28b8198f364fd3aa6222e9426ea 100644 (file)
@@ -4,16 +4,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *   $Id: nabstime.c,v 1.55 1999/05/25 16:12:09 momjian Exp $
+ *   $Id: nabstime.c,v 1.55.2.1 1999/08/02 05:24:54 scrappy Exp $
  *
  */
-#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
-#include <miscadmin.h>
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
 #endif
-#include "utils/builtins.h"
+
 #include "access/xact.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
 
 static AbsoluteTime tm2abstime(struct tm * tm, int tz);
 
@@ -348,8 +347,6 @@ nabstimeout(AbsoluteTime time)
            break;
        default:
            abstime2tm(time, &tz, tm, tzn);
-#if DATEDEBUG
-#endif
            EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf);
            break;
    }
index 1780df2c427ff9cc87bccb26ebdef564353804a7..292f6a9d785868016785d31555be2affcdcb1ee0 100644 (file)
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.18 1999/05/25 16:12:10 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.18.2.1 1999/08/02 05:24:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
-#include "utils/builtins.h"        /* where the declarations go */
-#include "utils/palloc.h"      /* where the declarations go */
+#include "utils/builtins.h"
 
 /*****************************************************************************
  *  USER I/O ROUTINES (none)                                                *
index 7c1aa24dbcf091158299e4bed567b2322346a5d6..62e201858649a63b3c4b917431f1baaef8aea0ec 100644 (file)
@@ -3,24 +3,20 @@
  * is for IP V4 CIDR notation, but prepared for V6: just
  * add the necessary bits where the comments indicate.
  *
- * $Id: network.c,v 1.10 1999/06/02 03:37:15 momjian Exp $
+ * $Id: network.c,v 1.10.2.1 1999/08/02 05:24:55 scrappy Exp $
  * Jon Postel RIP 16 Oct 1998
  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <postgres.h>
-#include <utils/palloc.h>
-#include <utils/builtins.h>
-#include <utils/inet.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 static int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
 
index 7082b0d007ea8d83131eadc55bb9c7d73469d7f9..41497847d7845314c74bda648a07a8fb42d46024 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.16 1999/05/25 16:12:12 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.16.2.1 1999/08/02 05:24:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  * columns are ******REALLY****** implemented!!!!!!!!!!!
  *
  */
-#include <stdio.h>
-#include <string.h>
+
 #include "postgres.h"
 #include "access/heapam.h"
-#include "access/relscan.h"
-#include "utils/builtins.h"        /* where function decls go */
+#include "utils/builtins.h"
 
 static int my_varattno(Relation rd, char *a);
 
index da720f0f19651042d47dec8c89b2d586de0cd511..eaee00fbd1b118dd3813dd97a3ee5637c396ee1d 100644 (file)
@@ -5,14 +5,11 @@
  *
  * 1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.16 1999/05/25 22:42:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.16.2.1 1999/08/02 05:24:55 scrappy Exp $
  *
  * ----------
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <float.h>
 #include <math.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"
-#include "utils/palloc.h"
 #include "utils/numeric.h"
 
-
 /* ----------
  * Uncomment the following to enable compilation of dump_numeric()
  * and dump_var() and to get a dump of any result produced by make_result().
index 5faaa5ddab4fbe82df6bf202d3555e05733c33b3..d72d044f046c34e87c17b9885723fba1cfcb90d6 100644 (file)
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.34 1999/07/10 17:03:33 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.34.2.1 1999/08/02 05:24:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
 #include <errno.h>
 #include <math.h>
+
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#include "postgres.h"
-#include "utils/builtins.h"        /* where the declarations go */
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "utils/builtins.h"
 
 #ifndef INT_MAX
 #define INT_MAX (0x7FFFFFFFL)
index 8cee64521a21b43ad608b71cdcdc233356c6c239..2e335ddefaf9e799d95b10d4b3dc8e10c5710d72 100644 (file)
@@ -7,16 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.23 1999/05/10 00:45:59 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.23.2.1 1999/08/02 05:24:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
-#include "utils/builtins.h"        /* where function declarations go */
+#include "utils/builtins.h"
 
 /*****************************************************************************
  *  USER I/O ROUTINES                                                       *
index ce5aefee6bce9308cd76c711e79d2e139b1c0eeb..0197887772adcc0614820e1a3fa39a9a790555db 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Edmund Mergl <[email protected]>
  *
- * $Id: oracle_compat.c,v 1.18 1999/05/26 12:56:00 momjian Exp $
+ * $Id: oracle_compat.c,v 1.18.2.1 1999/08/02 05:24:56 scrappy Exp $
  *
  */
 
@@ -9,7 +9,6 @@
 #include <ctype.h>
 #include "postgres.h"
 
-
 text      *lower(text *string);
 text      *upper(text *string);
 text      *initcap(text *string);
index f2f2ca8c00a963ae8d859def5f0623e19fd1f137..25fc30c4add078cf3da172cf10185bc0f359b9f8 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.22 1999/02/13 23:19:30 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.22.2.1 1999/08/02 05:24:56 scrappy Exp $
  *
  *     Alistair Crooks added the code for the regex caching
  *     agc - cached the regular expressions used - there's a good chance
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include "postgres.h"          /* postgres system include file */
+#include "postgres.h"
 
-#include <regex/regex.h>
 
-#include "utils/builtins.h"        /* where the function declarations go */
+#include "regex/regex.h"
+#include "utils/builtins.h"
 
 #if defined(DISABLE_XOPEN_NLS)
 #undef _XOPEN_SOURCE
index 1db8ddcc057106567068981e8a74e5d4aa88c5bb..5d46f6e0b0f66a4b2a865a3e1f481d44fc69840f 100644 (file)
@@ -7,27 +7,21 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.37 1999/05/25 16:12:17 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.37.2.1 1999/08/02 05:24:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "storage/bufmgr.h"
-#include "fmgr.h"
-#include "utils/palloc.h"
-#include "utils/syscache.h"
 
+#include "access/genam.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "utils/builtins.h"        /* where function declarations go */
+#include "miscadmin.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 /*****************************************************************************
  *  USER I/O ROUTINES                                                       *
index 6df5fb04ad7cb042884c8ab780feb60e1d0f8191..37b1e30b758fcf46a087c0b1572134904585973b 100644 (file)
@@ -3,7 +3,7 @@
  *           out of it's tuple
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.18 1999/06/02 11:52:28 wieck Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.18.2.1 1999/08/02 05:24:57 scrappy Exp $
  *
  *   This software is copyrighted by Jan Wieck - Hamburg.
  *
  *
  **********************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 
+#include "postgres.h"
 #include "executor/spi.h"
-#include "commands/trigger.h"
-#include "utils/elog.h"
-#include "utils/builtins.h"
-#include "nodes/nodes.h"
 #include "optimizer/clauses.h"
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_index.h"
-#include "catalog/pg_opclass.h"
-#include "fmgr.h"
 
 #define BUFSIZE 8192
 
index fe11c77b193c77ab187ace7bea712b6aa4d7b24b..a8cb9385f2fde8b84127e3771231276e6d042d67 100644 (file)
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.30 1999/06/19 00:44:44 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.30.2.1 1999/08/02 05:24:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "fmgr.h"
-#include "utils/builtins.h"        /* for textout() prototype and where the
-                                * declarations go */
-#include "utils/palloc.h"
-
 #include "catalog/catname.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"   /* for get_oprrest() */
 #include "catalog/pg_statistic.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 /* N is not a valid var/constant or relation id */
 #define NONVALUE(N)        ((N) == -1)
index 94b6a1157bb3838ea13a6a77d49addaf9f7b819b..414a63c7d574451ad332056a404410abd0c3899c 100644 (file)
@@ -9,27 +9,19 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.21 1999/02/13 23:19:33 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.21.2.1 1999/08/02 05:24:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
-#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 "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 "catalog/catname.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_proc.h"
+#include "utils/sets.h"
+#include "utils/syscache.h"
 
 extern CommandDest whereToSendOutput;  /* defined in tcop/postgres.c */
 
index 8de800ca24dac0856d78249e8653b3f9efbf9ebf..891036dc47c805b6e7c1e001e03e3d59b08112cd 100644 (file)
@@ -7,21 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.6 1999/02/13 23:19:34 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.6.2.1 1999/08/02 05:24:57 scrappy Exp $
  *
  * NOTES
  *   input routine largely stolen from boxin().
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>
-#include "postgres.h"
-#include "storage/bufpage.h"
-
-#include "utils/palloc.h"
-#include "utils/builtins.h"        /* where function declarations go */
 
+#include "postgres.h"
+#include "utils/builtins.h"
 
 #define LDELIM         '('
 #define RDELIM         ')'
index 3c67ab854e2cac7d40e4ec20ea1fd806fecf3ccb..cdbac4c7f13a6ddf00c647e6f75747aa4cba6cf8 100644 (file)
@@ -1,11 +1,10 @@
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <ctype.h>
+
 #include "postgres.h"
+#include "access/xact.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "access/xact.h"
 
 time_t
 timestamp_in(const char *timestamp_str)
index d7bb2738cb8f91dc0adb062e2d61cb9a5bb97d33..cbe7cd14631c2e4b1f6d9a77337bfde86ad078f0 100644 (file)
@@ -7,24 +7,24 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.48 1999/07/04 04:56:00 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.48.2.1 1999/08/02 05:24:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>
+
 #include "postgres.h"
 #include "access/htup.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
 #include "catalog/pg_type.h"
+#include "utils/builtins.h"
+
+#ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
+#endif
 
 #ifdef CYR_RECODE
 char      *convertstr(char *, int, int);
-
 #endif
 
-#include "mb/pg_wchar.h"
 
 /*
  * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()
index b649ef225a30d7a22b962c9d60db618f6bbd57ee..e6a90d73db199c7997fb01327a2b28088d4f8156 100644 (file)
@@ -7,18 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.48 1999/05/25 16:12:21 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.48.2.1 1999/08/02 05:24:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h"        /* where function declarations go */
 
 #include "mb/pg_wchar.h"
+#include "utils/builtins.h"
 
 static int text_cmp(text *arg1, text *arg2);
 
index cdacd6dbcea986d824ca4ce7e39b64b86325d8f7..bc8fbcc71f6e0ce503380f779c51057da8555d6b 100644 (file)
@@ -5,12 +5,11 @@
  *
  * IDENTIFICATION
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.6 1999/04/06 15:35:36 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.6.2.1 1999/08/02 05:24:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 #include "version.h"
index 8224c935786e5cbc91b6c8a6fa0bf5217ba00ec8..8ec1cad49898bd29758974d68bfa42e5a213f982 100644 (file)
@@ -7,28 +7,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.43 1999/06/04 02:19:45 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.43.2.1 1999/08/02 05:24:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/tqual.h"
-#include "utils/builtins.h"
-#include "utils/portal.h"
-#include "utils/catcache.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
-#include "utils/rel.h"
-#include "storage/bufpage.h"
+#include "access/heapam.h"
 #include "access/valid.h"
+#include "catalog/pg_type.h"
 #include "miscadmin.h"
-#include "fmgr.h"              /* for F_BOOLEQ, etc.  DANGER */
-#include "catalog/pg_type.h"   /* for OID of int28 type */
-#include "lib/dllist.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
 
 static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
 static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
index 7cf66e2280893bf17876c2e27ff5c5fd39a9b86c..134c0dbb8a8550d50c429253093fb89a327feb4b 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.23 1999/05/25 16:12:23 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.23.2.1 1999/08/02 05:25:00 scrappy Exp $
  *
  * Note - this code is real crufty...
  *
  */
 #include "postgres.h"
 
-#include <miscadmin.h>
-
-#include "access/heapam.h"     /* XXX to support hacks below */
-#include "access/htup.h"
 #include "catalog/catalog.h"
+#include "catalog/catname.h"
 #include "catalog/heap.h"
-#include "storage/bufpage.h"
-#include "storage/buf.h"       /* XXX for InvalidBuffer */
-#include "storage/ipc.h"
+#include "miscadmin.h"
 #include "storage/sinval.h"
 #include "utils/catcache.h"
 #include "utils/inval.h"
-#include "utils/rel.h"
 #include "utils/relcache.h"
-#include "catalog/catname.h"   /* XXX to support hacks below */
-#include "utils/syscache.h"        /* XXX to support the hacks below */
 
 static InvalidationEntry InvalidationEntryAllocate(uint16 size);
 static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());
index be59004441883860e87f16944af613ffafd55f86..286ebaefcd5333ad0f6939ee2d48cf35c1394ae5 100644 (file)
@@ -7,28 +7,19 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.27 1999/05/29 01:45:21 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.27.2.1 1999/08/02 05:25:00 scrappy Exp $
  *
  * NOTES
  *   Eventually, the index information should go through here, too.
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "access/tupmacs.h"
-#include "utils/rel.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
-#include "access/attnum.h"
-#include "access/heapam.h"
-
-#include "catalog/pg_amop.h"
+
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 /*             ---------- AMOP CACHES ----------                        */
 
index f37a97b34f6abf9829fcec04007d43bf4336a5e7..c7e1b45240c92f642a5c935bad08ba191597be6f 100644 (file)
@@ -7,18 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.5 1999/05/25 16:12:23 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.5.2.1 1999/08/02 05:25:00 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 /* #define RELREFDEBUG 1 */
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "access/istrat.h"
-#include "access/tupdesc.h"
-#include "utils/rel.h"
-#include "storage/fd.h"
 
 
 /*
index f8c73b7b22ca95fac77878459eb3b85f844702de..1c20d9963a92ed6979baadd2e8eaa568a3a4277a 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.62 1999/05/25 16:12:23 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.62.2.1 1999/08/02 05:25:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  *
  */
 #include <sys/types.h>
-#include <stdio.h>             /* for sprintf() */
 #include <errno.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#include <string.h>
 
 #include "postgres.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "access/istrat.h"
-#include "access/itup.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/tupmacs.h"
-#include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/pg_attrdef.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_log.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_relcheck.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_variable.h"
-#include "fmgr.h"
 #include "lib/hasht.h"
 #include "miscadmin.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "storage/fd.h"            /* for SEEK_ */
-#include "storage/lmgr.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
-#include "utils/hsearch.h"
-#include "utils/mcxt.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
 #include "utils/relcache.h"
-#include "utils/syscache.h"
 
 
 static void RelationFlushRelation(Relation *relationPtr,
index d302a33d85e2dbe2001b6a27e18a6a3a29fb7344..9cc3a554ff03c2fc9fa629c077260eb952100750 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.28 1999/07/07 16:09:33 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.28.2.1 1999/08/02 05:25:01 scrappy Exp $
  *
  * NOTES
  *   These routines allow the parser/planner/executor to perform
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "catalog/catname.h"
-#include "utils/catcache.h"
-#include <string.h>
-
-
-/* ----------------
- *     hardwired attribute information comes from system catalog files.
- * ----------------
- */
-#include "catalog/pg_am.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_amop.h"
-#include "catalog/pg_attribute.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_language.h"
+#include "catalog/pg_listener.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_rewrite.h"
-#include "catalog/pg_aggregate.h"
 #include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
-#include "catalog/pg_listener.h"
+#include "catalog/pg_type.h"
+#include "utils/catcache.h"
 
 extern bool AMI_OVERRIDE;      /* XXX style */
 
index 6635ac2bd497d5377fb219cb134556a4cd6ce34a..55f432e41b526e40ba6b1bdf6f713edd3a95771b 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.6 1999/07/03 15:43:57 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.6.2.1 1999/08/02 05:25:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  */
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-#include "nodes/pg_list.h"
-#include "utils/mcxt.h"
-#include "utils/temprel.h"
-#include "access/xact.h"
-#include "access/htup.h"
 #include "access/heapam.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
-#include "catalog/pg_class.h"
+#include "utils/temprel.h"
 
 GlobalMemory CacheCxt;
 
index 794b59bd7b2aa01a9444b24e139a2d900e308268..62fe8a96a9795c011d146de09ded133cad288a31 100644 (file)
@@ -7,18 +7,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.13 1999/02/13 23:19:47 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.13.2.1 1999/08/02 05:25:04 scrappy Exp $
  *
  * NOTE
  *   This should eventually work with elog(), dlog(), etc.
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <unistd.h>
 
-#include "postgres.h"          /* where the declaration goes */
-#include "utils/module.h"
+#include "postgres.h"
 
 #include "utils/exc.h"
 #include "utils/trace.h"
index 283cb01b1f966711297fcf0fc9a80d328a1f8b52..b2a44f3fc513022e7be0b558b1775f45044ee125 100644 (file)
@@ -7,31 +7,28 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.45 1999/05/25 16:12:24 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.45.2.1 1999/08/02 05:25:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <fcntl.h>
 #ifndef O_RDONLY
 #include <sys/file.h>
 #endif  /* O_RDONLY */
 #include <sys/types.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 
+#include "postgres.h"
 #ifdef USE_SYSLOG
 #include <syslog.h>
 #endif
 
-#include "postgres.h"
-#include "miscadmin.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
+#include "miscadmin.h"
 #include "storage/proc.h"
 #include "tcop/tcopprot.h"
 #include "utils/trace.h"
index 7384847d18e9894d970a5a00d6b4bfc244ad0dde..357dae1baf3bd4ff1ad51725e30821de49cc6812 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.25 1999/05/25 16:12:26 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.25.2.1 1999/08/02 05:25:04 scrappy Exp $
  *
  * NOTE
  *   XXX this code needs improvement--check for state violations and
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* XXX use own I/O routines */
 #include <errno.h>
-#include <string.h>
 
 #include "postgres.h"
 
-#include "utils/exc.h"
 #include "storage/ipc.h"
+#include "utils/exc.h"
 
 static void ExcUnCaught(Exception *excP, ExcDetail detail, ExcData data,
            ExcMessage message);
index c780ad79531902ffcc32669275e39290bbd55532..b5aef063579479354277eb4d293523114a1f49f7 100644 (file)
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.6 1999/02/13 23:19:48 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.6.2.1 1999/08/02 05:25:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "utils/exc.h"         /* where function declarations go */
+#include "utils/exc.h"
 
 void
 ExcAbort(const Exception *excP,
index 70842f3b5652d100a1a1685ca0b514ae2c123555..454c1c7976b0e39fa0ac4e2ee48d55b5dc1d3c60 100644 (file)
@@ -7,15 +7,13 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.6 1999/05/25 16:12:26 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.6.2.1 1999/08/02 05:25:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "utils/excid.h"
-
 /*****************************************************************************
  *  Generic Recoverable Exceptions                                          *
  *****************************************************************************/
index 0f64a0c9098ad6b3f3f79d172034ebce621666c3..ae585e262d9b5128494f84368e27d4670f0cf891 100644 (file)
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13 1999/06/19 05:00:28 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13.2.1 1999/08/02 05:25:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdarg.h>
 #include "postgres.h"
 
 #define FormMaxSize        1024
index 7d9b79575fd66923bf8f2ae6c163f9745a88fb61..35cf13d064da848aa55814efe8951f68666df32f 100644 (file)
@@ -7,34 +7,23 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.26 1999/05/25 16:12:27 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.26.2.1 1999/08/02 05:25:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
-#include "config.h"                /* for MAXPATHLEN */
-#include "fmgr.h"              /* generated by Gen_fmgrtab.sh */
 #include "utils/dynamic_loader.h"
-#include "utils/elog.h"
-#include "utils/builtins.h"
-#include "access/heapam.h"
-#include "nodes/pg_list.h"
-
-#include "dynloader.h"
-
-#ifdef __ultrix
-#include <dl.h>
-#endif
 
+#include "access/heapam.h"
 #include "catalog/catname.h"
-#include "utils/syscache.h"
 #include "catalog/pg_proc.h"
+#include "dynloader.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static DynamicFileList *file_list = (DynamicFileList *) NULL;
 static DynamicFileList *file_tail = (DynamicFileList *) NULL;
index d5b24cf341073923b31c7d4d8dfbdc3f7dcbde31..36d428ec8076b64e30a18c965ce85b0596a22d81 100644 (file)
@@ -7,31 +7,19 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.28 1999/05/25 16:12:28 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.28.2.1 1999/08/02 05:25:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
 
 #include "postgres.h"
 
-/* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */
-#include "fmgr.h"
-#include "utils/fmgrtab.h"
-
-#include "nodes/pg_list.h"
-#include "catalog/pg_proc.h"
 #include "catalog/pg_language.h"
-#include "utils/syscache.h"
-#include "nodes/params.h"
-
-#include "utils/builtins.h"
-#include "utils/elog.h"
-
-#include "nodes/parsenodes.h"
+#include "catalog/pg_proc.h"
 #include "commands/trigger.h"
+#include "utils/builtins.h"
+#include "utils/fmgrtab.h"
+#include "utils/syscache.h"
 
 
 /*
index 28ee6a15dee9bf66fc5acc497b2f1ba57a4715a1..08521d25fd10e4e2373ddba72fe47d4ae1a0f3ab 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.23 1999/05/31 17:01:52 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.23.2.1 1999/08/02 05:25:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  * Modified by [email protected] April 1990
  *     changed ctl structure for shared memory
  */
-#include      <stdio.h>
-#include      <sys/types.h>
-#include      <string.h>
-#include      "postgres.h"
-#include      "utils/dynahash.h"
-#include      "utils/hsearch.h"
-#ifndef FRONTEND
-#include      "utils/mcxt.h"
-#endif  /* !FRONTEND */
-#include      "utils/palloc.h"
-#include      "utils/memutils.h"
+#include <sys/types.h>
+
+#include "postgres.h"
+#include "utils/dynahash.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
 
 /*
  * Fast MOD arithmetic, assuming that y is a power of 2 !
index 34f0966b8a7ecc44700fe7d226a85f692a6a4b86..87ec335b4e23bb21ed37baa23c556dc823086e14 100644 (file)
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.9 1999/02/13 23:19:56 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.9.2.1 1999/08/02 05:25:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "utils/hsearch.h"
index 78c5ab10403e3bde99a55f352b06e3fdbe5c2a28..be8cbdd39cab199884a8512c0bb321a8c55130f5 100644 (file)
@@ -7,12 +7,12 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.7 1999/05/25 16:12:33 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.7.2.1 1999/08/02 05:25:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "utils/module.h"      /* where the declarations go */
+#include "utils/module.h"
 
 /*
  * BypassEnable
index 783f8ac1b95857a13be86548639bea6fda7b52ba..bcc530d5bab153eea95656f22673bb2d087f7a8e 100644 (file)
@@ -6,20 +6,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.14 1999/05/25 16:12:33 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.14.2.1 1999/08/02 05:25:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <grp.h>
 #include <pwd.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"         /* for DebugLvl */
+#include "miscadmin.h"
 
 #ifndef S_IRUSR                    /* XXX [TRH] should be in a header */
 #define S_IRUSR         S_IREAD
index 1d4225e582110422fb0951af7e8d88be28d3d5fb..005732b2271e19571deb2ba32aa8a769957509ab 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.30 1999/05/25 16:12:34 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.30.2.1 1999/08/02 05:25:10 scrappy Exp $
  *
  * NOTES
  *   Globals used all over the place should be declared here and not
  *-------------------------------------------------------------------------
  */
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <math.h>
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"         /* where the declarations go */
 
-#include <storage/backendid.h>
-#include "access/heapam.h"
-#include "storage/sinval.h"
-#include "storage/sinvaladt.h"
-#include "storage/lmgr.h"
-#include "utils/elog.h"
-#include "libpq/pqcomm.h"
 #include "catalog/catname.h"
+#include "libpq/pqcomm.h"
+#include "miscadmin.h"
+#include "storage/backendid.h"
+#include "storage/lmgr.h"
 
 ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST;
 
index 86328bbd56ec75c66d8568a280ae90d2e6177c42..6e20443f7fdbebd58b173951e518a323d0a47a3c 100644 (file)
@@ -7,37 +7,24 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.29 1999/05/25 16:12:35 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.29.2.1 1999/08/02 05:25:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <sys/param.h>         /* for MAXPATHLEN */
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <stdio.h>
 #include <unistd.h>
-#include <grp.h>               /* for getgrgid */
-#include <pwd.h>               /* for getpwuid */
+#include <grp.h>
+#include <pwd.h>
 
 #include "postgres.h"
-
-#include "utils/portal.h"      /* for EnablePortalManager, etc. */
-#include "utils/exc.h"         /* for EnableExceptionHandling, etc. */
-#include "utils/mcxt.h"            /* for EnableMemoryContext, etc. */
-#include "utils/elog.h"
-#include "utils/builtins.h"
-
-#include "miscadmin.h"         /* where the declarations go */
-
 #include "catalog/catname.h"
 #include "catalog/pg_shadow.h"
-#include "catalog/pg_proc.h"
+#include "miscadmin.h"
 #include "utils/syscache.h"
 
-#include "storage/fd.h"            /* for O_ */
-#include "storage/ipc.h"       /* for proc_exit */
 
 /*
  * EnableAbortEnvVarName
index 0c2711483fb9cf7a078680350a06d56003d17257..26fac8a3f37805d086e21c0e58a08146398a2c66 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.40 1999/05/25 16:12:36 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.40.2.1 1999/08/02 05:25:10 scrappy Exp $
  *
  * NOTES
  *     InitPostgres() is the function called from PostgresMain
  *-------------------------------------------------------------------------
  */
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <math.h>
 #include <unistd.h>
 
 #include "postgres.h"
-#include "version.h"
-
-#include <storage/ipc.h>
-#include <storage/backendid.h>
-#include <storage/buf_internals.h>
-#include <storage/smgr.h>
-#include <storage/proc.h>
-#include <utils/relcache.h>
 
 #include "access/heapam.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h"        /* XXX dependency problem */
-#include "utils/syscache.h"
-#include "storage/bufpage.h"   /* for page layout, for
-                                * InitMyDatabaseInfo() */
+#include "catalog/catname.h"
+#include "libpq/libpq.h"
+#include "miscadmin.h"
+#include "storage/backendid.h"
+#include "storage/proc.h"
 #include "storage/sinval.h"
-#include "storage/sinvaladt.h"
-#include "storage/lmgr.h"
-
-#include "miscadmin.h"         /* for global decls */
-#include "utils/portal.h"      /* for EnablePortalManager, etc. */
-
-#include "utils/exc.h"         /* for EnableExceptionHandling, etc. */
-#include "fmgr.h"              /* for EnableDynamicFunctionManager, etc. */
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"            /* for EnableMemoryContext, etc. */
+#include "storage/smgr.h"
 #include "utils/inval.h"
+#include "utils/portal.h"
+#include "utils/relcache.h"
+#include "utils/syscache.h"
+#include "version.h"
 
-#include "catalog/catname.h"
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
 
-#include "libpq/libpq.h"
-
 static void VerifySystemDatabase(void);
 static void VerifyMyDatabase(void);
 static void InitCommunication(void);
index cab36c7b4c6f5b84d70ea8689504c7602cb818bf..b9ac84cf2900c692f5626ca5586ebe666cc18652 100644 (file)
@@ -2,19 +2,16 @@
  * This file contains some public functions
  * usable for both the backend and the frontend.
  * Tatsuo Ishii
- * $Id: common.c,v 1.5 1999/05/25 16:12:41 momjian Exp $ */
+ * $Id: common.c,v 1.5.2.1 1999/08/02 05:25:11 scrappy Exp $ */
 
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef WIN32
 #include "win32.h"
 #else
-#if !defined(NO_UNISTD_H)
 #include <unistd.h>
 #endif
-#endif
-
-#include <string.h>
 
 #include "mb/pg_wchar.h"
 
index d5831b14e6a150001adc4f347912e91a872423a9..4da366a81986735f320d8a042d70a8a251e9d679 100644 (file)
@@ -3,11 +3,11 @@
  * client encoding and server internal encoding.
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
- * $Id: mbutils.c,v 1.6 1999/05/25 16:12:43 momjian Exp $ */
+ * $Id: mbutils.c,v 1.6.2.1 1999/08/02 05:25:12 scrappy Exp $ */
 
-#include <stdio.h>
-#include <string.h>
 
+#include "postgres.h"
+#include "miscadmin.h"
 #include "mb/pg_wchar.h"
 
 static int client_encoding = -1;
index c83e54c8ec8ad1ba5af41674817d6178cdae49dd..bbfbfa6f015cee64c50981e55ac3e0bf7e212e67 100644 (file)
@@ -1,12 +1,12 @@
 /*
  * testing of utf2wchar()
- * $Id: utftest.c,v 1.2 1998/09/01 04:33:23 momjian Exp $
+ * $Id: utftest.c,v 1.2.4.1 1999/08/02 05:25:12 scrappy Exp $
  */
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
 
-#include <regex/pg_wchar.h>
+#include "regex/pg_wchar.h"
 
 main()
 {
index 2452518e12d2152d5db59762f71289e83c231c23..ee1ce65d49cbc7d93acc3c1fa6f2b91d9fc969c7 100644 (file)
@@ -2,9 +2,10 @@
  * This file contains some public functions
  * related to show/set/reset variable commands.
  * Tatsuo Ishii
- * $Id: variable.c,v 1.4 1999/05/25 16:12:44 momjian Exp $
+ * $Id: variable.c,v 1.4.2.1 1999/08/02 05:25:12 scrappy Exp $
  */
 
+#include "postgres.h"
 #include "mb/pg_wchar.h"
 
 bool
index 3efdcc6f396ea601d02e96d2eab6c45b3e7d0873..4b6a16b7d14bbb6dd9b15916539b65e42ab27199 100644 (file)
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <mb/pg_wchar.h>
+#include "mb/pg_wchar.h"
 
 int
 pg_char_and_wchar_strcmp(s1, s2)
index c7ccf1b4cb773b1ec98a8fc51970dadb61c98ef9..050a46191b42643a0d39bd72a4a0becdfbdbf8a1 100644 (file)
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include <mb/pg_wchar.h>
+#include "mb/pg_wchar.h"
 
 int
 pg_wchar_strncmp(s1, s2, n)
index e9ea6193492677d859e69b9632c1499cf0bd99ac..ef98e050abf1074a91294bf2905de2f50f2226bb 100644 (file)
@@ -7,27 +7,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.24 1999/05/25 16:12:47 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.24.2.1 1999/08/02 05:25:14 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/xact.h"
-#include "catalog/catname.h"
 #include "catalog/pg_database.h"
-#include "fmgr.h"
 #include "miscadmin.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #ifdef MULTIBYTE
index f59ac97392703659f956afc5c60c5cf27f69ad92..745dd8e7c2f3c84bbb98d6dca2ace3b5528e3a67 100644 (file)
@@ -8,16 +8,16 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.8 1999/02/13 23:20:06 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.8.2.1 1999/08/02 05:25:14 scrappy Exp $
  *
  * DESCRIPTION
  *   See superuser().
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-#include <utils/syscache.h>
-#include <catalog/pg_shadow.h>
+#include "postgres.h"
+#include "catalog/pg_shadow.h"
+#include "utils/syscache.h"
 
 bool
 superuser(void)
index 9676ca570a0c13a77b27be7d0138ed8617fa58a7..baf8ce6121868bc050835f4322c372e701ea7067 100644 (file)
@@ -9,9 +9,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "postgres.h"
+
 #ifdef USE_SYSLOG
 #include <syslog.h>
 #endif
 
-#include "postgres.h"
 #include "miscadmin.h"
 #include "utils/trace.h"
-#include "libpq/pqsignal.h"
 
 #ifdef USE_SYSLOG
 /*
index 1060f7b6def4429b6a95027765165d22e0d04197..e3be65a0164a4461f371fce88a2a7981320eb1f7 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.16 1999/05/25 16:12:51 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.16.2.1 1999/08/02 05:25:15 scrappy Exp $
  *
  * NOTE:
  * This is a new (Feb. 05, 1999) implementation of the allocation set
  *             Jan Wieck
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include "postgres.h"
-#include "utils/excid.h"       /* for ExhaustedMemory */
-#include "utils/memutils.h"        /* where funnction declarations go */
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
+#include "utils/memutils.h"
 
 
 #undef AllocSetReset
index 98cd5b6f1610860d9a5416dd5ae2bc763136d271..f750e99e61e887f54f4504d5310f5f25ca136e75 100644 (file)
@@ -7,25 +7,18 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.14 1999/05/25 16:12:53 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.14.2.1 1999/08/02 05:25:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>             /* XXX for printf debugging */
 
 #include "postgres.h"
 
-#include "utils/memutils.h"
-#include "utils/module.h"
-#include "utils/excid.h"
-
 #include "nodes/memnodes.h"
-#include "nodes/nodes.h"
+#include "utils/excid.h"
+#include "utils/module.h"
 
-#include "utils/mcxt.h"
-#include "utils/elog.h"
 
-#include "utils/palloc.h"
 
 #undef MemoryContextAlloc
 #undef MemoryContextFree
index 9a0d2781c13ab39f114c694f7c78cafd6d1c37ce..451dea91f24a6eca11538262c7718f62341bf6e6 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.13 1999/05/26 12:56:05 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.13.2.1 1999/08/02 05:25:16 scrappy Exp $
  *
  * NOTE
  *   XXX This is a preliminary implementation which lacks fail-fast
@@ -17,7 +17,7 @@
  */
 #include "postgres.h"
 
-#include "utils/memutils.h"        /* where declarations of this file goes */
+#include "utils/memutils.h"
 
 static Pointer OrderedElemGetBase(OrderedElem elem);
 static void OrderedElemPush(OrderedElem elem);
index bf36908973ab000f54f7f7faccbb2448a7d35d6a..82a31785623aad30a1ab4eedfad90481a8ad6767 100644 (file)
@@ -7,19 +7,14 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.12 1999/05/25 16:12:54 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.12.2.1 1999/08/02 05:25:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
-#include "utils/mcxt.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-
 #include "nodes/memnodes.h"
 
 
index 2c800e033c6ca94e213ca690bcc2b19a7129e46e..89fd6dba69b585126f51a5c23dded2f57f5087d3 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23 1999/06/19 05:00:29 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23.2.1 1999/08/02 05:25:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
  * PortalHeapMemory                y               y               y *
  *
  */
-#include <stdio.h>             /* for sprintf() */
-#include <string.h>                /* for strlen, strncpy */
 
 #include "postgres.h"
 
 #include "lib/hasht.h"
 #include "utils/module.h"
-#include "utils/excid.h"       /* for Unimplemented */
-#include "utils/mcxt.h"
-#include "utils/hsearch.h"
-
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"   /* for EState */
-
 #include "utils/portal.h"
 
 static void CollectNamedPortals(Portal *portalP, int destroy);
index ae10049b96115598120a90f781a28ec09b0f3b30..02ea05621a2777c78b1910113abe620659060bb8 100644 (file)
@@ -8,22 +8,15 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.16 1999/07/10 18:21:59 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.16.2.1 1999/08/02 05:25:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
 
 #include "postgres.h"
 
-#include "storage/buf.h"
-#include "access/skey.h"
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "utils/rel.h"
 
-#include "utils/psort.h"
+#include "access/heapam.h"
 #include "utils/lselect.h"
 
 /*
index d26785a9405e663c98259abb1069e7f5f6860dba..84802f0ce3b7667b83e6c004d95ca60b8617b766 100644 (file)
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *   $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $
+ *   $Id: psort.c,v 1.53.2.1 1999/08/02 05:25:18 scrappy Exp $
  *
  * NOTES
  *     Sorts the first relation into the second relation.
  *             MAXMERGE, MAXTAPES
  *
  */
-#include <stdio.h>
 #include <math.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "storage/buf.h"
-#include "storage/fd.h"
-#include "utils/lselect.h"
-#include "utils/portal.h"      /* for {Start,End}PortalAllocMode */
+#include "miscadmin.h"
 #include "utils/psort.h"
-#include "utils/rel.h"
 
 static bool createfirstrun(Sort *node);
 static bool createrun(Sort *node, BufFile *file);
index 104e57b9194b14f8275c3ce68415837fcab001be..ff582c8eefbc6aa9355b377a154b40295fcd472e 100644 (file)
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.29 1999/05/25 16:13:02 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.29.2.1 1999/08/02 05:25:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/htup.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/tqual.h"
 
 extern bool PostgresIsInitialized;
index 383877e9adaa52ccd873665277de0588259832af..dd0aa92e40dd2cfe811f6abef32031041ba2524f 100644 (file)
 #ifndef GIST_H
 #define GIST_H
 
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <access/relscan.h>
-#include <access/sdir.h>
-#include <storage/page.h>
-#include <storage/block.h>
-#include <utils/rel.h>
-#include <storage/off.h>
-
-#include <fmgr.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 
 /*
 ** You can have as many strategies as you please in GiSTs, as
index 4be3b676cabb28138cb70324ec4e1319330b872d..ef55ab395187af8b4e27caa888bde71797a5faee 100644 (file)
  */
 #ifndef GISTSCAN_H
 
-#include <access/relscan.h>
-#include <storage/off.h>
-#include <storage/block.h>
-#include <utils/rel.h>
+#include "access/relscan.h"
 
 extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
              uint16 nkeys, ScanKey key);
index 20ad45863f340cee13c1fba8d6c41415d8559b08..c2fc30edf4266839c541009f6bfe9e28c4208623 100644 (file)
@@ -12,8 +12,7 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
-#include <access/strat.h>
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern StrategyNumber RelationGetGISTStrategy(Relation r,
                        AttrNumber attnum, RegProcedure proc);
index 685acee3f59f313dfcb3dfe2b5dfbf1d1b26d57f..110daa9afac8aeb41677097794a927c86c6b8a84 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
+ * $Id: hash.h,v 1.24.2.1 1999/08/02 05:25:21 scrappy Exp $
  *
  * NOTES
  *     modeled after Margo Seltzer's hash implementation for unix.
 #ifndef HASH_H
 #define HASH_H
 
-#include <access/sdir.h>
-#include <access/funcindex.h>
-#include <storage/bufpage.h>
-#include <access/relscan.h>
-#include <access/itup.h>
-#include <utils/int8.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
+#include "utils/int8.h"
 
 /*
  * An overflow page is a spare page allocated for storing data whose
@@ -203,7 +202,7 @@ typedef HashItemData *HashItem;
 #define BMPGSZ_BYTE(metap)     ((metap)->hashm_bmsize)
 #define BMPGSZ_BIT(metap)      ((metap)->hashm_bmsize << BYTE_TO_BIT)
 #define HashPageGetBitmap(pg) \
-   ((uint32 *) (((char *) (pg)) + DOUBLEALIGN(sizeof(PageHeaderData))))
+   ((uint32 *) (((char *) (pg)) + MAXALIGN(sizeof(PageHeaderData))))
 
 /*
  * The number of bits in an ovflpage bitmap which
index 6f4512915875ad84a50f600e6d707b7fcf056e91..ead6b40fd98992b48a6b243b0d8b56f1028a2da9 100644 (file)
@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $
+ * $Id: istrat.h,v 1.13.2.1 1999/08/02 05:25:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ISTRAT_H
 #define ISTRAT_H
 
-#include <utils/rel.h>
-#include <access/strat.h>
+#include "utils/rel.h"
 
 /*
  * StrategyNumberIsValid
index 85fc975e71e15d22768030539ef292f8c0ad5d1c..b1443ec7afb59d30b66bdb54de716cf51ed32083 100644 (file)
@@ -6,18 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.17 1999/02/13 23:20:55 momjian Exp $
+ * $Id: itup.h,v 1.17.2.1 1999/08/02 05:25:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ITUP_H
 #define ITUP_H
 
-#include <access/ibit.h>
-#include <access/tupmacs.h>
-#include <access/tupdesc.h>
-#include <storage/itemptr.h>
-#include <utils/memutils.h>
+#include "access/ibit.h"
+#include "access/tupdesc.h"
+#include "access/tupmacs.h"
+#include "storage/itemptr.h"
 
 #define MaxIndexAttributeNumber 7
 
@@ -104,7 +103,7 @@ typedef struct PredInfo
    ) \
    : \
    ( \
-       (Size)DOUBLEALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \
+       (Size)MAXALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \
    ) \
 )
 
index 0cc2381b7dce1bc60bf35ab5f5a0f3fa12b00e02..7df75cd0ac41c1f85b9a18cf40627ea67be662cf 100644 (file)
@@ -6,21 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.14 1999/02/13 23:20:57 momjian Exp $
+ * $Id: rtree.h,v 1.14.2.1 1999/08/02 05:25:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTREE_H
 #define RTREE_H
 
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <access/relscan.h>
-#include <access/sdir.h>
-#include <access/skey.h>
-#include <access/strat.h>
-#include <storage/block.h>
-#include <storage/off.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies                  8
index 31b77bba2bc27a786cbdda406e7bf6fb6dadd30c..95118f9fc35fb57d288d1822a1e88e27e3d7dcba 100644 (file)
@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.9 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtstrat.h,v 1.9.2.1 1999/08/02 05:25:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTSTRAT_H
 #define RTSTRAT_H
 
-#include <utils/rel.h>
-#include <access/attnum.h>
+#include "utils/rel.h"
 
 extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
              RegProcedure proc);
index e6c8c6c31122e53a41f0a35b60435f498be76dad..15ff4fd7817a69b7e3a2689f1db2dae4a0f63d80 100644 (file)
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.18 1999/05/25 16:14:49 momjian Exp $
+ * $Id: array.h,v 1.18.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  * NOTES
  *   XXX the data array should be LONGALIGN'd -- notice that the array
@@ -22,7 +22,7 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include <stdio.h>
+#include "utils/memutils.h"
 
 typedef struct
 {
@@ -84,24 +84,20 @@ typedef struct
  */
 #define ARR_DATA_PTR(a) \
        (((char *) a) + \
-        DOUBLEALIGN(sizeof(ArrayType) + 2 * (sizeof(int) * (a)->ndim)))
+        MAXALIGN(sizeof(ArrayType) + 2 * (sizeof(int) * (a)->ndim)))
 
 /*
  * The total array header size for an array of dimension n (in bytes).
  */
 #define ARR_OVERHEAD(n) \
-       (DOUBLEALIGN(sizeof(ArrayType) + 2 * (n) * sizeof(int)))
+       (MAXALIGN(sizeof(ArrayType) + 2 * (n) * sizeof(int)))
 
 /*------------------------------------------------------------------------
  * Miscellaneous helper definitions and routines for arrayfuncs.c
  *------------------------------------------------------------------------
  */
 
-/* #if defined(irix5) */
-/* #define RETURN_NULL {*isNull = true; return(0); }*/
- /* #else *//* irix5 */
 #define RETURN_NULL {*isNull = true; return(0); }
- /* #endif *//* irix5 */
 #define NAME_LEN   30
 #define MAX_BUFF_SIZE BLCKSZ
 
index 1d8044ca5449cb754aeb1b7652f1b5bd602976e0..731c9650544bfb62a264448391e4b9a3552b2b86 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.81 1999/05/26 12:57:03 momjian Exp $
+ * $Id: builtins.h,v 1.81.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  * NOTES
  *   This should normally only be included by fmgr.h.
 #ifndef BUILTINS_H
 #define BUILTINS_H
 
-#include <storage/itemptr.h>
-#include <utils/array.h>
-#include <utils/geo_decls.h>
-#include <utils/datetime.h>
-#include <utils/nabstime.h>
-#include <utils/int8.h>
-#include <utils/cash.h>
-#include <utils/inet.h>
-#include <utils/rel.h>
-#include <utils/numeric.h>
+#include "storage/itemptr.h"
+#include "utils/array.h"
+#include "utils/datetime.h"
+#include "utils/geo_decls.h"
+#include "utils/inet.h"
+#include "utils/int8.h"
+#include "utils/nabstime.h"
+#include "utils/numeric.h"
 
 /*
  *     Defined in adt/
index a291c2eee64ba92e318b0f68947f2e7bb72a8187..c62e59205b518f8ea02b6919ef3ba9af522ca4bc 100644 (file)
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.7 1999/02/13 23:22:16 momjian Exp $
+ * $Id: datetime.h,v 1.7.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DATETIME_H
 #define DATETIME_H
 
-#include "utils/dt.h"
-
 typedef int32 DateADT;
 
 typedef float8 TimeADT;
index d217c8aa87fe58e8631d808b2d0f881920f26d88..f45b7b027a3b578c30f36a45dd171cc312e9bda9 100644 (file)
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.40 1999/05/25 16:14:53 momjian Exp $
+ * $Id: dt.h,v 1.40.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include <time.h>
 #include <math.h>
+#include <limits.h>
 
 /*
  * DateTime represents absolute time.
index e2dbf4c59f843da2b31354a59d970141264dc09b..0122608b66d2c319f8e84afff9f82416b64d9036 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.10 1999/02/13 23:22:18 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.10.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,8 @@
 #include <sys/types.h>
 #include <sys/param.h>         /* For MAXPATHLEN */
 
-#include <postgres.h>
+/* we need this include because port files use them */
+#include "postgres.h"
 
 #ifdef MIN
 #undef MIN
index 39c023f21a12979800e5882964e6bb6812d4a06d..b8af7d979cfafeae9c2007de62706628f295416f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: elog.h,v 1.10 1999/02/13 23:22:18 momjian Exp $
+ * $Id: elog.h,v 1.10.2.1 1999/08/02 05:25:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,6 @@
 #define ABORTX 0x4000          /* abort process after logging */
 #endif
 
-/***S*I***/
 /* Increase this to be able to use postmaster -d 3 with complex
  * view definitions (which are transformed to very, very large INSERT statements
  * and if -d 3 is used the query string of these statements is printed using
index cb3de1083c044e8cdf3d2f96b1c95d6c7d3927b6..8e0271195267058e9d6bf57df48a71c25a5d8085 100644 (file)
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.8 1999/02/13 23:22:19 momjian Exp $
+ * $Id: fcache.h,v 1.8.2.1 1999/08/02 05:25:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE_H
 #define FCACHE_H
 
-#include <fmgr.h>
+#include "fmgr.h"
 
 
 typedef struct
index 9439b28a7971a7bd0a4bf9ba57200ebeeb4dc25c..34891ab9caf3af92bafcf22fe897fe022b057272 100644 (file)
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.8 1999/02/13 23:22:20 momjian Exp $
+ * $Id: fcache2.h,v 1.8.2.1 1999/08/02 05:25:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE2_H
 #define FCACHE2_H
 
-#include <nodes/execnodes.h>
+#include "nodes/execnodes.h"
 
 extern void setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
 
index 321c5deaf2c1fcaadeac52583ba3692d9156200e..293931c3e472d2f5c03d2ba4cd2253e0a6c92579 100644 (file)
@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.11 1999/02/13 23:22:23 momjian Exp $
+ * $Id: inval.h,v 1.11.2.1 1999/08/02 05:25:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INVAL_H
 #define INVAL_H
 
-#include <access/htup.h>
-#include <utils/rel.h>
+#include "access/htup.h"
 
 extern void InitLocalInvalidateData(void);
 
index 981c3683456fbd67b5249cdf84226ed187ce370c..b64e8532775b299169764d4f250b82384975796b 100644 (file)
@@ -6,18 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.12 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lselect.h,v 1.12.2.1 1999/08/02 05:25:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSELECT_H
 #define LSELECT_H
 
-#include <stdio.h>
-
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/htup.h"
 #include "utils/syscache.h"
 
 struct leftist
index e88f004004d52689ac71176f8a30b554cbce219c..7a36f3935b0df2c9124766306aca351179446980 100644 (file)
@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.16 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lsyscache.h,v 1.16.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
-#include <access/attnum.h>
-#include <access/htup.h>
+#include "access/htup.h"
 
 extern bool op_class(Oid oprno, int32 opclass, Oid amopid);
 extern char *get_attname(Oid relid, AttrNumber attnum);
index 20294073f1e9311e8d10ca878082ddda0b0ff7c4..d5393ba2c0cf2be456a661a7b678b2d52865cb3c 100644 (file)
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.28 1999/06/17 15:15:59 momjian Exp $
+ * $Id: memutils.h,v 1.28.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  * NOTES
  *   some of the information in this file will be moved to
 #ifndef MEMUTILS_H
 #define MEMUTILS_H
 
+/*
+ * This is not needed by this include file, but by almost every file
+ * that includes this file.
+ */
 
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.
index 2cbf5f0c7236e3fb43b38b0c6e1ce6caf6f0a1cf..a5b6d0fcdb042d98d4baaa6afc0648de7e4c9f57 100644 (file)
@@ -5,7 +5,7 @@
  *
  * 1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6 1999/05/25 22:43:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  * ----------
  */
@@ -13,9 +13,6 @@
 #ifndef _PG_NUMERIC_H_
 #define _PG_NUMERIC_H_
 
-#include "postgres.h"
-
-
 /* ----------
  * The hardcoded limits and defaults of the numeric data type
  * ----------
index 61e6976766ec6437ca87eb2aec7169af859d3e5f..6bf8e9d778ba385e673215d42ad953ac42f6021a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.15 1999/06/12 14:07:32 momjian Exp $
+ * $Id: portal.h,v 1.15.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PORTAL_H
 #define PORTAL_H
 
-#include <executor/execdesc.h>
-#include <lib/fstack.h>
-#include <nodes/memnodes.h>
-#include <utils/memutils.h>
+#include "executor/execdesc.h"
+#include "nodes/memnodes.h"
 
 typedef struct PortalBlockData
 {
index 1b8322351027b119549235a7f5887f4de4a423e4..57568b342e95854fa81a9527f2c5d771d31bcdee 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: temprel.h,v 1.3 1999/05/25 16:14:57 momjian Exp $
+ * $Id: temprel.h,v 1.3.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define TEMPREL_H
 
 #include "access/htup.h"
-#include "access/attnum.h"
 
 void       create_temp_relation(char *relname, HeapTuple pg_class_tuple);
 void       remove_all_temp_relations(void);
index 1bec1aff7b40be920de5882df6aac72d6eef20c1..4873d06ab94ca87b2bacc3f7e9bf873060b75ac2 100644 (file)
@@ -7,14 +7,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.22 1999/05/25 22:43:39 momjian Exp $
+ * $Id: tqual.h,v 1.22.2.1 1999/08/02 05:25:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TQUAL_H
 #define TQUAL_H
 
-#include <access/htup.h>
+#include "access/htup.h"
+#include "access/xact.h"
 
 typedef struct SnapshotData
 {
index 3174026ca5cfe32ce8c6caed21b09c561c8cb088..4bcdee3ae575a220c5f84529741067ce0475a36e 100644 (file)
 #ifndef TRACE_H
 #define TRACE_H
 
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <stdarg.h>
-
-#include "postgres.h"
 
 #ifdef ELOG_TIMESTAMPS
 char      *tprintf_timestamp(void);