summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2015-08-12 14:02:20 +0000
committerAndres Freund2015-08-15 14:32:38 +0000
commit6c772c7453e3e1fa97e3ef0d7e90b22c7f4ea721 (patch)
treef4ee936d1edc4aad4b43d6e71757bd8af31530b6
parenta8015fe7f54c6410866d3751783c48e0dabfacde (diff)
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: [email protected] Backpatch: 9.0-master
-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 68f58b7905..fe9dfabe99 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;