diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1999-08-02 05:25:27 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1999-08-02 05:25:27 +0000 |
| commit | 9a8aeb23a19ee6833480d4c12719d9fd26ad8571 (patch) | |
| tree | c97d5f26e89cc9d33c5be420a5e7688835644c77 /src/backend/access/common/heaptuple.c | |
| parent | 62d146bdcd784280b573acd8af52488e66e212cf (diff) | |
Another 'mega-commit' of back-patches ...
- integrating the #include file cleanup that Bruce recently did
- got the CPU change to adt/Makefile
- changing DOUBLEALIGN -> MAXALIGN
Diffstat (limited to 'src/backend/access/common/heaptuple.c')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 626ffd14570..1f244cc16fc 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.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 @@ -17,21 +17,10 @@ *------------------------------------------------------------------------- */ -#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); |