diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-04-28 11:50:58 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-04-28 11:51:08 -0400 |
commit | 94a16531b37628de456e082ee0d60e309607e9dd (patch) | |
tree | bd3de10db684c54adaa9fb9bdfdb7bee103877b3 /src | |
parent | 695718f99c4b9581fe6cc12543b69f2654a07f3b (diff) | |
download | postgresql-94a16531b37628de456e082ee0d60e309607e9dd.tar.gz postgresql-94a16531b37628de456e082ee0d60e309607e9dd.zip |
Adjust DatumGetBool macro, this time for sure.
Commit 23a41573c attempted to fix the DatumGetBool macro to ignore bits
in a Datum that are to the left of the actual bool value. But it did that
by casting the Datum to bool; and on compilers that use C99 semantics for
bool, that ends up being a whole-word test, not a 1-byte test. This seems
to be the true explanation for contrib/seg failing in VS2015. To fix, use
GET_1_BYTE() explicitly. I think in the previous patch, I'd had some idea
of not having to commit to bool being exactly 1 byte wide, but regardless
of what the compiler's bool is, boolean columns and Datums are certainly
1 byte wide.
The previous fix was (eventually) back-patched into all active versions,
so do likewise with this one.
Diffstat (limited to 'src')
-rw-r--r-- | src/include/postgres.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/postgres.h b/src/include/postgres.h index ccf1605455e..ef905bb0358 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -398,7 +398,7 @@ typedef Datum *DatumPtr; * the left of the width of bool, per comment above. */ -#define DatumGetBool(X) ((bool) (((bool) (X)) != 0)) +#define DatumGetBool(X) ((bool) (GET_1_BYTE(X) != 0)) /* * BoolGetDatum |