diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-02-28 22:44:38 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-02-28 22:44:38 +0000 |
| commit | 9f652d430fbd1e757caaec9fe64d3e94c8693158 (patch) | |
| tree | 9215d2131d85e73caeb96fe23ba442c17b8d4575 /contrib/intarray/_int.h | |
| parent | d1ce4f7396aac34233e075d0342ac704593799ce (diff) | |
Fix up several contrib modules that were using varlena datatypes in not-so-obvious
ways. I'm not totally sure that I caught everything, but at least now they pass
their regression tests with VARSIZE/SET_VARSIZE defined to reverse byte order.
Diffstat (limited to 'contrib/intarray/_int.h')
| -rw-r--r-- | contrib/intarray/_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/intarray/_int.h b/contrib/intarray/_int.h index cee970d1b1f..97e6fe642fc 100644 --- a/contrib/intarray/_int.h +++ b/contrib/intarray/_int.h @@ -85,7 +85,7 @@ typedef char *BITVECP; */ typedef struct { - int4 len; + int32 vl_len_; /* varlena header (do not touch directly!) */ int4 flag; char data[1]; } GISTTYPE; @@ -94,7 +94,7 @@ typedef struct #define ISALLTRUE(x) ( ((GISTTYPE*)x)->flag & ALLISTRUE ) -#define GTHDRSIZE ( sizeof(int4)*2 ) +#define GTHDRSIZE (VARHDRSZ + sizeof(int4)) #define CALCGTSIZE(flag) ( GTHDRSIZE+(((flag) & ALLISTRUE) ? 0 : SIGLEN) ) #define GETSIGN(x) ( (BITVECP)( (char*)x+GTHDRSIZE ) ) @@ -145,12 +145,12 @@ typedef struct ITEM typedef struct { - int4 len; + int32 vl_len_; /* varlena header (do not touch directly!) */ int4 size; char data[1]; } QUERYTYPE; -#define HDRSIZEQT ( 2*sizeof(int4) ) +#define HDRSIZEQT (VARHDRSZ + sizeof(int4)) #define COMPUTESIZE(size) ( HDRSIZEQT + size * sizeof(ITEM) ) #define GETQUERY(x) (ITEM*)( (char*)(x)+HDRSIZEQT ) |