diff options
| author | Robert Haas | 2014-02-19 14:34:15 +0000 |
|---|---|---|
| committer | Robert Haas | 2014-02-19 14:34:15 +0000 |
| commit | 844a28a9dd1a48045ad1db9246da5e2783c9bd40 (patch) | |
| tree | 1c392fd2b6891b62355f2a1e0d99a257547c24e9 /src/include | |
| parent | 7d03a83f4d0736ba869fa6f93973f7623a27038a (diff) | |
pg_lsn macro naming and type behavior revisions.
Change pg_lsn_mi so that it can return negative values when subtracting
LSNs, and clean up some perhaps ill-considered macro names.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/fmgr.h | 4 | ||||
| -rw-r--r-- | src/include/postgres.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/include/fmgr.h b/src/include/fmgr.h index 700435b548d..dd4c672bafc 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -230,7 +230,7 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena * datum); #define PG_GETARG_CHAR(n) DatumGetChar(PG_GETARG_DATUM(n)) #define PG_GETARG_BOOL(n) DatumGetBool(PG_GETARG_DATUM(n)) #define PG_GETARG_OID(n) DatumGetObjectId(PG_GETARG_DATUM(n)) -#define PG_GETARG_PG_LSN(n) DatumGetPgLsn(PG_GETARG_DATUM(n)) +#define PG_GETARG_LSN(n) DatumGetLSN(PG_GETARG_DATUM(n)) #define PG_GETARG_POINTER(n) DatumGetPointer(PG_GETARG_DATUM(n)) #define PG_GETARG_CSTRING(n) DatumGetCString(PG_GETARG_DATUM(n)) #define PG_GETARG_NAME(n) DatumGetName(PG_GETARG_DATUM(n)) @@ -303,7 +303,7 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena * datum); #define PG_RETURN_CHAR(x) return CharGetDatum(x) #define PG_RETURN_BOOL(x) return BoolGetDatum(x) #define PG_RETURN_OID(x) return ObjectIdGetDatum(x) -#define PG_RETURN_PG_LSN(x) return PgLsnGetDatum(x) +#define PG_RETURN_LSN(x) return LSNGetDatum(x) #define PG_RETURN_POINTER(x) return PointerGetDatum(x) #define PG_RETURN_CSTRING(x) return CStringGetDatum(x) #define PG_RETURN_NAME(x) return NameGetDatum(x) diff --git a/src/include/postgres.h b/src/include/postgres.h index e72d5fca2b1..c8b311fa22e 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -484,18 +484,18 @@ typedef Datum *DatumPtr; #define ObjectIdGetDatum(X) ((Datum) SET_4_BYTES(X)) /* - * DatumGetPgLsn + * DatumGetLSN * Returns PostgreSQL log sequence number of a datum. */ -#define DatumGetPgLsn(X) ((XLogRecPtr) GET_8_BYTES(X)) +#define DatumGetLSN(X) ((XLogRecPtr) GET_8_BYTES(X)) /* - * PG_LSNGetDatum + * LSNGetDatum * Returns datum representation for a PostgreSQL log sequence number. */ -#define PgLsnGetDatum(X) ((Datum) SET_8_BYTES(X)) +#define LSNGetDatum(X) ((Datum) SET_8_BYTES(X)) /* * DatumGetTransactionId |