diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/itup.h | 6 | ||||
| -rw-r--r-- | src/include/access/tupmacs.h | 6 | ||||
| -rw-r--r-- | src/include/optimizer/subselect.h | 2 | ||||
| -rw-r--r-- | src/include/postgres.h | 4 | ||||
| -rw-r--r-- | src/include/storage/block.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/include/access/itup.h b/src/include/access/itup.h index e2e0d6336ef..e01cb7a31b6 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.23 2000/01/26 05:57:50 momjian Exp $ + * $Id: itup.h,v 1.24 2000/03/17 02:36:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -82,8 +82,8 @@ typedef struct PredInfo #define INDEX_NULL_MASK 0x8000 #define INDEX_VAR_MASK 0x4000 -#define IndexTupleSize(itup) (((IndexTuple) (itup))->t_info & 0x1FFF) -#define IndexTupleDSize(itup) ((itup).t_info & 0x1FFF) +#define IndexTupleSize(itup) ((Size) (((IndexTuple) (itup))->t_info & 0x1FFF)) +#define IndexTupleDSize(itup) ((Size) ((itup).t_info & 0x1FFF)) #define IndexTupleNoNulls(itup) (!(((IndexTuple) (itup))->t_info & 0x8000)) #define IndexTupleAllFixed(itup) (!(((IndexTuple) (itup))->t_info & 0x4000)) diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index d82ade6b027..ab856087a70 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.13 2000/01/26 05:57:51 momjian Exp $ + * $Id: tupmacs.h,v 1.14 2000/03/17 02:36:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -50,13 +50,13 @@ ( \ (*(A))->attbyval && (*(A))->attlen != -1 ? \ ( \ - (*(A))->attlen > sizeof(int16) ? \ + (*(A))->attlen > (int) sizeof(int16) ? \ ( \ (char *) (long) *((int32 *)(T)) \ ) \ : \ ( \ - (*(A))->attlen < sizeof(int16) ? \ + (*(A))->attlen < (int) sizeof(int16) ? \ (char *) (long) *((char *)(T)) \ : \ (char *) (long) *((int16 *)(T))) \ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index d4970e48481..a00158deb94 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -9,7 +9,7 @@ #include "nodes/plannodes.h" -extern int PlannerQueryLevel; /* level of current query */ +extern Index PlannerQueryLevel; /* level of current query */ extern List *PlannerInitPlan; /* init subplans for current query */ extern List *PlannerParamVar; /* to get Var from Param->paramid */ extern int PlannerPlanId; /* to assign unique ID to subquery plans */ diff --git a/src/include/postgres.h b/src/include/postgres.h index 5e2aad688a7..e089db510f6 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.36 2000/01/26 05:57:46 momjian Exp $ + * $Id: postgres.h,v 1.37 2000/03/17 02:36:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -97,7 +97,7 @@ struct varlena #define VARSIZE(PTR) (((struct varlena *)(PTR))->vl_len) #define VARDATA(PTR) (((struct varlena *)(PTR))->vl_dat) -#define VARHDRSZ sizeof(int32) +#define VARHDRSZ ((int32) sizeof(int32)) typedef struct varlena bytea; typedef struct varlena text; diff --git a/src/include/storage/block.h b/src/include/storage/block.h index 33c881cbd43..ca85ba7a3fc 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: block.h,v 1.10 2000/01/26 05:58:32 momjian Exp $ + * $Id: block.h,v 1.11 2000/03/17 02:36:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ typedef BlockIdData *BlockId; /* block identifier */ * True iff blockNumber is valid. */ #define BlockNumberIsValid(blockNumber) \ - ((bool) ((int32) (blockNumber) != InvalidBlockNumber)) + ((bool) ((BlockNumber) (blockNumber) != InvalidBlockNumber)) /* * BlockIdIsValid |