aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2015-08-12 16:02:20 +0200
committerAndres Freund <andres@anarazel.de>2015-08-15 16:44:33 +0200
commitc9b727310b4488a15795464a5fb1f3153738076a (patch)
tree0ca129f4a52f5e560d6d3acb92c249d395fd1766 /src/backend
parent2360f01efa9041d75cab9a9e7640327979864b2c (diff)
downloadpostgresql-c9b727310b4488a15795464a5fb1f3153738076a.tar.gz
postgresql-c9b727310b4488a15795464a5fb1f3153738076a.zip
Don't use 'bool' as a struct member name in help_config.c.
Doing so doesn't work if bool is a macro rather than a typedef. Although c.h spends some effort to support configurations where bool is a preexisting macro, help_config.c has existed this way since 2003 (b700a6), and there have not been any reports of problems. Backpatch anyway since this is as riskless as it gets. Discussion: 20150812084351.GD8470@awork2.anarazel.de Backpatch: 9.0-master
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/utils/misc/help_config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c
index 4a19b833f71..6bafe2572e3 100644
--- a/src/backend/utils/misc/help_config.c
+++ b/src/backend/utils/misc/help_config.c
@@ -31,7 +31,7 @@
typedef union
{
struct config_generic generic;
- struct config_bool bool;
+ struct config_bool _bool;
struct config_real real;
struct config_int integer;
struct config_string string;
@@ -98,7 +98,7 @@ printMixedStruct(mixedStruct *structToPrint)
case PGC_BOOL:
printf("BOOLEAN\t%s\t\t\t",
- (structToPrint->bool.reset_val == 0) ?
+ (structToPrint->_bool.reset_val == 0) ?
"FALSE" : "TRUE");
break;