offsetof cleanup.

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 2f28905cece55637b94b4a1425a5d83842563f1a..1e746ead06f498bafaa06d351c21cdc98f4d2298 100644 (file)
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -809,7 +809,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
        int                     i;
        int                     numberOfAttributes = tupleDescriptor->natts;
 
-       len = offsetof(HeapTuple->t_bits);
+       len = offsetof(HeapTupleData, t_bits);
 
        for (i = 0; i < numberOfAttributes && !hasnull; i++)
        {
@@ -957,7 +957,7 @@ heap_addheader(uint32 natts,        /* max domain index */
 
        AssertArg(natts > 0);
 
-       len = offsetof(HeapTuple->t_bits);
+       len = offsetof(HeapTupleData, t_bits);
 
        hoff = len = DOUBLEALIGN(len);          /* be conservative */
        len += structlen;

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 88671f5f559e9b6757db94f43202c35b3ea84e75..3a346b4c9a1f08d19aac4cfb821d73bfece0738b 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -917,7 +917,7 @@ inv_wrold(LargeObjectDesc *obj_desc,
 /*
        ntup = inv_newtuple(obj_desc, newbuf, newpage, (char *) NULL, tupbytes);
        dptr = ((char *) ntup) + ntup->t_hoff -
-                               (sizeof(HeapTupleData) - offsetof(HeapTupleData.t_bits)) +
+                               (sizeof(HeapTupleData) - offsetof(HeapTupleData, t_bits)) +
                                sizeof(int4)
                                + sizeof(fsblock->vl_len);
 
@@ -998,7 +998,7 @@ inv_newtuple(LargeObjectDesc *obj_desc,
        char       *attptr;
 
        /* compute tuple size -- no nulls */
-       hoff = offsetof(HeapTuple->t_bits);
+       hoff = offsetof(HeapTupleData, t_bits);
 
        /* add in olastbyte, varlena.vl_len, varlena.vl_dat */
        tupsize = hoff + (2 * sizeof(int32)) + nwrite;