diff options
| author | Bruce Momjian | 1999-07-19 07:07:29 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-07-19 07:07:29 +0000 |
| commit | faf7d7817456e3ae23eb882a99283581bae86112 (patch) | |
| tree | f35a7e143115168680f37e62ed8893cf78b713a0 /src/include | |
| parent | e259780b1393184cc9dd83b2ee5d4c1eb10a2eaa (diff) | |
Install new alignment code to use MAXALIGN rather than DOUBLEALIGN where
approproate.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/hash.h | 4 | ||||
| -rw-r--r-- | src/include/access/htup.h | 4 | ||||
| -rw-r--r-- | src/include/access/itup.h | 4 | ||||
| -rw-r--r-- | src/include/utils/array.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 1dc84bf9e76..ea94f5cc9e2 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.27 1999/07/16 17:07:26 momjian Exp $ + * $Id: hash.h,v 1.28 1999/07/19 07:07:27 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -202,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 diff --git a/src/include/access/htup.h b/src/include/access/htup.h index cae145ead49..e091208e52e 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.24 1999/07/15 23:03:34 momjian Exp $ + * $Id: htup.h,v 1.25 1999/07/19 07:07:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,7 @@ typedef struct HeapTupleData typedef HeapTupleData *HeapTuple; -#define HEAPTUPLESIZE DOUBLEALIGN(sizeof(HeapTupleData)) +#define HEAPTUPLESIZE MAXALIGN(sizeof(HeapTupleData)) /* ---------------- diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 223c7f2bd2e..3294d1948a3 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.20 1999/07/16 17:07:27 momjian Exp $ + * $Id: itup.h,v 1.21 1999/07/19 07:07:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ typedef struct PredInfo ) \ : \ ( \ - (Size)DOUBLEALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \ + (Size)MAXALIGN(sizeof(IndexTupleData) + sizeof(IndexAttributeBitMapData)) \ ) \ ) diff --git a/src/include/utils/array.h b/src/include/utils/array.h index f31c9d385d0..709d2a4722d 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.20 1999/07/17 20:18:35 momjian Exp $ + * $Id: array.h,v 1.21 1999/07/19 07:07:29 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -84,13 +84,13 @@ 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 |
