From b8b2e3b2deeaab19715af063fc009b7c230b2336 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 25 Jun 2012 01:51:46 +0300 Subject: Replace int2/int4 in C code with int16/int32 The latter was already the dominant use, and it's preferable because in C the convention is that intXX means XX bits. Therefore, allowing mixed use of int2, int4, int8, int16, int32 is obviously confusing. Remove the typedefs for int2 and int4 for now. They don't seem to be widely used outside of the PostgreSQL source tree, and the few uses can probably be cleaned up by the time this ships. --- src/backend/utils/adt/tsquery_gist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/utils/adt/tsquery_gist.c') diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 74e40246c42..f76f9fb54e3 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -150,7 +150,7 @@ gtsquery_penalty(PG_FUNCTION_ARGS) typedef struct { OffsetNumber pos; - int4 cost; + int32 cost; } SPLITCOST; static int @@ -174,11 +174,11 @@ gtsquery_picksplit(PG_FUNCTION_ARGS) j; TSQuerySign datum_l, datum_r; - int4 size_alpha, + int32 size_alpha, size_beta; - int4 size_waste, + int32 size_waste, waste = -1; - int4 nbytes; + int32 nbytes; OffsetNumber seed_1 = 0, seed_2 = 0; OffsetNumber *left, -- cgit v1.2.3