diff options
Diffstat (limited to 'src/backend/access')
-rw-r--r-- | src/backend/access/common/heaptuple.c | 3 | ||||
-rw-r--r-- | src/backend/access/common/heapvalid.c | 3 | ||||
-rw-r--r-- | src/backend/access/common/indexvalid.c | 3 | ||||
-rw-r--r-- | src/backend/access/common/printtup.c | 3 | ||||
-rw-r--r-- | src/backend/access/gist/gist.c | 25 | ||||
-rw-r--r-- | src/backend/access/gist/gistscan.c | 1 | ||||
-rw-r--r-- | src/backend/access/hash/hashfunc.c | 4 | ||||
-rw-r--r-- | src/backend/access/heap/stats.c | 4 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtcompare.c | 3 | ||||
-rw-r--r-- | src/backend/access/rtree/rtproc.c | 3 | ||||
-rw-r--r-- | src/backend/access/transam/transam.c | 6 | ||||
-rw-r--r-- | src/backend/access/transam/xact.c | 12 | ||||
-rw-r--r-- | src/backend/access/transam/xid.c | 3 |
13 files changed, 30 insertions, 43 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index f33a269736e..b516e5beaba 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.15 1996/11/05 07:42:40 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.16 1996/11/10 02:56:41 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -19,6 +19,7 @@ #include <postgres.h> +#include <access/heapam.h> #include <access/htup.h> #include <access/transam.h> #include <access/tupmacs.h> diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c index f4aceefb340..fdf333092fb 100644 --- a/src/backend/access/common/heapvalid.c +++ b/src/backend/access/common/heapvalid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.11 1996/11/05 07:42:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.12 1996/11/10 02:56:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include <fmgr.h> #include <access/heaptuple.h> +#include <access/valid.h> #include <access/xact.h> #include <storage/bufpage.h> #include <utils/rel.h> diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c index 5314804d791..ae40807b845 100644 --- a/src/backend/access/common/indexvalid.c +++ b/src/backend/access/common/indexvalid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.11 1996/11/05 07:42:43 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.12 1996/11/10 02:56:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,7 @@ #include <postgres.h> #include <access/htup.h> +#include <access/iqual.h> #include <access/itup.h> #include <access/skey.h> #include <executor/execdebug.h> diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c index edfa7715579..f536d8c751e 100644 --- a/src/backend/access/common/printtup.c +++ b/src/backend/access/common/printtup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.11 1996/11/05 07:42:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.12 1996/11/10 02:57:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include <fmgr.h> #include <access/heaptuple.h> +#include <access/printtup.h> #include <catalog/pg_type.h> #include <libpq/libpq.h> #include <utils/syscache.h> diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index fa29a961773..7fbf0ef07d3 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -1190,9 +1190,6 @@ gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, #ifdef GISTDEBUG -extern char *text_range_out(); -extern char *int_range_out(); - /* ** sloppy debugging support routine, requires recompilation with appropriate ** "out" method for the index keys. Could be fixed to find that info @@ -1236,7 +1233,7 @@ _gistdump(Relation r) datum = ((char *) itup); datum += sizeof(IndexTupleData); /* get out function for type of key, and out it! */ - itkey = (char *) int_range_out(datum); + itkey = (char *) int_range_out((INTRANGE *)datum); /* itkey = " unable to print"; */ printf("\t[%d] size %d heap <%d,%d> key:%s\n", offnum, IndexTupleSize(itup), itblkno, itoffno, itkey); @@ -1247,26 +1244,6 @@ _gistdump(Relation r) } } -#define TRLOWER(tr) (((tr)->bytes)) -#define TRUPPER(tr) (&((tr)->bytes[MAXALIGN(VARSIZE(TRLOWER(tr)))])) -typedef struct txtrange { - /* flag: NINF means that lower is negative infinity; PINF means that - ** upper is positive infinity. 0 means that both are numbers. - */ - int32 vl_len; - int32 flag; - char bytes[2]; -} TXTRANGE; - -typedef struct intrange { - int lower; - int upper; - /* flag: NINF means that lower is negative infinity; PINF means that - ** upper is positive infinity. 0 means that both are numbers. - */ - int flag; -} INTRANGE; - char *text_range_out(TXTRANGE *r) { char *result; diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 0f3ce3b59d9..a3f19d4ef62 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -13,6 +13,7 @@ #include <postgres.h> #include <access/gist.h> +#include <access/gistscan.h> #include <access/genam.h> #include <access/rtree.h> #include <storage/bufmgr.h> diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c index b042ca31961..5862800b21d 100644 --- a/src/backend/access/hash/hashfunc.c +++ b/src/backend/access/hash/hashfunc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.2 1996/10/20 06:34:14 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.3 1996/11/10 02:57:40 momjian Exp $ * * NOTES * These functions are stored in pg_amproc. For each operator class @@ -18,6 +18,8 @@ #include "postgres.h" +#include "access/hash.h" + uint32 hashint2(int16 key) { return ((uint32) ~key); diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c index 3035e9fba29..00dac5fabec 100644 --- a/src/backend/access/heap/stats.c +++ b/src/backend/access/heap/stats.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.8 1996/11/05 11:17:47 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.9 1996/11/10 02:58:11 momjian Exp $ * * NOTES * initam should be moved someplace else. @@ -324,7 +324,7 @@ PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats) * ---------------- */ void -initam() +initam(void) { /* ---------------- * initialize heap statistics. diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 5b85054a1e8..5429850d733 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.5 1996/11/05 10:35:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.6 1996/11/10 02:58:37 momjian Exp $ * * NOTES * These functions are stored in pg_amproc. For each operator class @@ -24,6 +24,7 @@ #include <postgres.h> +#include <utils/builtins.h> #include <utils/nabstime.h> int32 diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c index fdcb95ca1e9..401ceca1c93 100644 --- a/src/backend/access/rtree/rtproc.c +++ b/src/backend/access/rtree/rtproc.c @@ -7,13 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.4 1996/11/05 10:54:17 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.5 1996/11/10 02:58:53 momjian Exp $ * *------------------------------------------------------------------------- */ #include <postgres.h> +#include <utils/builtins.h> #include <utils/geo-decls.h> #ifndef HAVE_MEMMOVE # include <regex/utils.h> diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index b11af7486e7..b85ee1ce131 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.5 1996/11/05 11:12:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.6 1996/11/10 02:59:11 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -96,7 +96,7 @@ extern bool BuildingBtree; * ---------------- */ int -RecoveryCheckingEnabled() +RecoveryCheckingEnabled(void) { return RecoveryCheckingEnableState; } @@ -453,7 +453,7 @@ TransRecover(Relation logRelation) * Initializes transaction logging. */ void -InitializeTransactionLog() +InitializeTransactionLog(void) { Relation logRelation; Relation timeRelation; diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 008499fc3b2..ff8908de095 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.4 1996/11/05 11:12:32 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.5 1996/11/10 02:59:16 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -218,7 +218,7 @@ bool AMI_OVERRIDE = false; static int TransactionFlushState = 1; int -TransactionFlushEnabled() +TransactionFlushEnabled(void) { return TransactionFlushState; } @@ -237,7 +237,7 @@ SetTransactionFlushEnabled(bool state) * -------------------------------- */ bool -IsTransactionState() +IsTransactionState(void) { TransactionState s = CurrentTransactionState; @@ -1113,7 +1113,7 @@ AbortCurrentTransaction() * -------------------------------- */ void -BeginTransactionBlock() +BeginTransactionBlock(void) { TransactionState s = CurrentTransactionState; @@ -1151,7 +1151,7 @@ BeginTransactionBlock() * -------------------------------- */ void -EndTransactionBlock() +EndTransactionBlock(void) { TransactionState s = CurrentTransactionState; @@ -1205,7 +1205,7 @@ EndTransactionBlock() * -------------------------------- */ void -AbortTransactionBlock() +AbortTransactionBlock(void) { TransactionState s = CurrentTransactionState; diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c index 5d1293d66bf..4c508b3899d 100644 --- a/src/backend/access/transam/xid.c +++ b/src/backend/access/transam/xid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.4 1996/11/05 11:12:33 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.5 1996/11/10 02:59:19 momjian Exp $ * * OLD COMMENTS * XXX WARNING @@ -23,6 +23,7 @@ #include <stdio.h> #include <postgres.h> +#include <access/xact.h> extern TransactionId NullTransactionId; extern TransactionId DisabledTransactionId; |