aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2012-06-25 01:51:46 +0300
committerPeter Eisentraut <peter_e@gmx.net>2012-06-25 01:51:46 +0300
commitb8b2e3b2deeaab19715af063fc009b7c230b2336 (patch)
treec6ee1310487d59e37e3e143835b5609e78524f65 /src/backend/optimizer
parent7eb8c7851458eb88def80c290a4b5bc37cc321f3 (diff)
downloadpostgresql-b8b2e3b2deeaab19715af063fc009b7c230b2336.tar.gz
postgresql-b8b2e3b2deeaab19715af063fc009b7c230b2336.zip
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.
Diffstat (limited to 'src/backend/optimizer')
-rw-r--r--src/backend/optimizer/prep/prepunion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 6475633ae7d..8ee6cf7f0e0 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -987,7 +987,7 @@ generate_setop_tlist(List *colTypes, List *colCollations,
expr = (Node *) makeConst(INT4OID,
-1,
InvalidOid,
- sizeof(int4),
+ sizeof(int32),
Int32GetDatum(flag),
false,
true);