offsetof cleanup.

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index a0c98a995fd4a2b37036e94bf211f2fa3c48717e..97626420206ae60d1ffc2520f1d82e430d1d733a 100644 (file)
--- 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.42 1998/09/04 18:05:38 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.43 1998/09/04 18:21:10 momjian Exp $
  *
  * NOTES
  *   The old interface functions have been converted to macros
@@ -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 87ded0f5190d3cb2265bf2510b357191baf732b0..f1559dd09d59de7e1f93896ad9b5ea5806dcc08e 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.39 1998/09/04 18:05:39 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.40 1998/09/04 18:21:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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;