More alignment

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 25240a756bcd535936989731b1c41f341c1e3666..4c443f38e7045d3616a1d2dc9989b54d50e07708 100644 (file)
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -53,12 +53,13 @@ typedef struct HeapTupleHeaderData
 
 typedef HeapTupleHeaderData *HeapTupleHeader;
 
-#define MinTupleSize   (DOUBLEALIGN(sizeof (PageHeaderData) + \
-                                                sizeof(HeapTupleHeaderData) + sizeof(int4)))
+#define MinTupleSize   (MAXALIGN(sizeof (PageHeaderData) + \
+                                                MAXALIGN(sizeof(HeapTupleHeaderData)) + \
+                                                MAXALIGN(sizeof(char)))
 
 #define MaxTupleSize   (BLCKSZ - MinTupleSize)
 
-#define MaxAttrSize            (MaxTupleSize - sizeof(HeapTupleHeaderData))
+#define MaxAttrSize            (MaxTupleSize - MAXALIGN(sizeof(HeapTupleHeaderData)))
 
 #define SelfItemPointerAttributeNumber                 (-1)
 #define ObjectIdAttributeNumber                                        (-2)