From 390feca0e19256167be6c1ed5653b0ffd93b4910 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Sun, 11 Nov 2012 23:51:46 +0000 Subject: [PATCH] Dropped the last compatibility macros for PG 8.2 --- lib/pgut/pgut-be.h | 33 +-------------------------------- lib/pgut/pgut-spi.h | 6 ------ 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/lib/pgut/pgut-be.h b/lib/pgut/pgut-be.h index 4d9c80f..c0efe46 100644 --- a/lib/pgut/pgut-be.h +++ b/lib/pgut/pgut-be.h @@ -53,34 +53,6 @@ extern int no_such_variable #endif -#if PG_VERSION_NUM < 80300 - -#define PGDLLIMPORT DLLIMPORT -#define SK_BT_DESC 0 /* Always ASC */ -#define SK_BT_NULLS_FIRST 0 /* Always NULLS LAST */ -#define MaxHeapTupleSize MaxTupleSize - -#define PG_GETARG_TEXT_PP(n) PG_GETARG_TEXT_P(n) -#define VARSIZE_ANY_EXHDR(v) (VARSIZE(v) - VARHDRSZ) -#define VARDATA_ANY(v) VARDATA(v) -#define SET_VARSIZE(v, sz) (VARATT_SIZEP(v) = (sz)) -#define pg_detoast_datum_packed(v) pg_detoast_datum(v) -#define DatumGetTextPP(v) DatumGetTextP(v) -#define ItemIdIsNormal(v) ItemIdIsUsed(v) -#define IndexBuildHeapScan(heap, index, info, sync, callback, state) \ - IndexBuildHeapScan((heap), (index), (info), (callback), (state)) -#define planner_rt_fetch(rti, root) \ - rt_fetch(rti, (root)->parse->rtable) -#define heap_sync(rel) ((void)0) -#define ItemIdIsDead(itemId) ItemIdDeleted(itemId) -#define GetCurrentCommandId(used) GetCurrentCommandId() -#define stringToQualifiedNameList(str) \ - stringToQualifiedNameList((str), "pg_bulkload") -#define PageAddItem(page, item, size, offnum, overwrite, is_heap) \ - PageAddItem((page), (item), (size), (offnum), LP_USED) - -#endif - #if PG_VERSION_NUM < 80400 #define MAIN_FORKNUM 0 @@ -171,10 +143,7 @@ extern Datum ExecFetchSlotTupleDatum(TupleTableSlot *slot); #endif -#if PG_VERSION_NUM < 80300 -#define RelationSetNewRelfilenode(rel, xid) \ - setNewRelfilenode((rel)) -#elif PG_VERSION_NUM < 90000 +#if PG_VERSION_NUM < 90000 #define RelationSetNewRelfilenode(rel, xid) \ setNewRelfilenode((rel), (xid)) #endif diff --git a/lib/pgut/pgut-spi.h b/lib/pgut/pgut-spi.h index a1bcb11..cfe9e9c 100644 --- a/lib/pgut/pgut-spi.h +++ b/lib/pgut/pgut-spi.h @@ -12,12 +12,6 @@ #include "executor/spi.h" -#if PG_VERSION_NUM < 80300 - -typedef void *SPIPlanPtr; - -#endif - #if PG_VERSION_NUM < 80400 extern int SPI_execute_with_args(const char *src, int nargs, Oid *argtypes,