diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-27 14:57:41 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-27 14:57:41 -0500 |
| commit | 84fc571395f6986d912cda6c09826cb10caee7f0 (patch) | |
| tree | 880e703cee80d9832225f614f0ed951e76bf952a /src/include/utils/varbit.h | |
| parent | 8c61f81b3196fe9757901e90e3fc1b30283d3995 (diff) | |
Rename the C functions bitand(), bitor() to bit_and(), bit_or().
This is to avoid use of the C++ keywords "bitand" and "bitor" in
the header file utils/varbit.h. Note the functions' SQL-level
names are not changed, only their C-level names.
In passing, make some comments in varbit.c conform to project-standard
layout.
Diffstat (limited to 'src/include/utils/varbit.h')
| -rw-r--r-- | src/include/utils/varbit.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index b6c6032907c..3f35b090a66 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -80,8 +80,9 @@ extern Datum bitle(PG_FUNCTION_ARGS); extern Datum bitgt(PG_FUNCTION_ARGS); extern Datum bitge(PG_FUNCTION_ARGS); extern Datum bitcmp(PG_FUNCTION_ARGS); -extern Datum bitand(PG_FUNCTION_ARGS); -extern Datum bitor(PG_FUNCTION_ARGS); +/* avoid the names bitand and bitor, since they are C++ keywords */ +extern Datum bit_and(PG_FUNCTION_ARGS); +extern Datum bit_or(PG_FUNCTION_ARGS); extern Datum bitxor(PG_FUNCTION_ARGS); extern Datum bitnot(PG_FUNCTION_ARGS); extern Datum bitshiftleft(PG_FUNCTION_ARGS); |