aboutsummaryrefslogtreecommitdiff
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:50 +0200
commit8749aafde2179de243bc8ffeec23a28a94ec5def (patch)
tree29530b141c00edda8f73f340ef973775baace694
parent665ae7f9b4a9f5763e10eddb6761d3c95ffccc55 (diff)
downloadpostgresql-8749aafde2179de243bc8ffeec23a28a94ec5def.tar.gz
postgresql-8749aafde2179de243bc8ffeec23a28a94ec5def.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
-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 1ca7ae1443c..a8f3f143ac4 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;