From 9b95270c3073c3cc7878cd71d0e53b06aae7da1f Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Tue, 3 Oct 2023 10:46:46 +0900 Subject: [PATCH] Fix compiler warnings regarding DEFAULT_PGSOCKET_DIR. Commit 3bd6941f accidentally add "#include "pg_config_manual.h", which should have been "#include parser/pg_config_manual.h". This caused to include parser/pg_config_manual.h and pg_config_manual.h, which caused compiler warning: ../src/include/parser/pg_config_manual.h:227:0: warning: "DEFAULT_PGSOCKET_DIR" redefined [enabled by default] #define DEFAULT_PGSOCKET_DIR "/tmp" If DEFAULT_PGSOCKET_DIR value was different among these header files. Reported by: Peng Bo. --- src/include/pcp/libpcp_ext.h | 2 +- src/protocol/pool_process_query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/pcp/libpcp_ext.h b/src/include/pcp/libpcp_ext.h index 6d2eb1f44..70345050c 100644 --- a/src/include/pcp/libpcp_ext.h +++ b/src/include/pcp/libpcp_ext.h @@ -29,7 +29,7 @@ #include #include -#include "pg_config_manual.h" +#include "parser/pg_config_manual.h" /* * startup packet definitions (v2) stolen from PostgreSQL diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c index 544d2d0a9..a7585ba2d 100644 --- a/src/protocol/pool_process_query.c +++ b/src/protocol/pool_process_query.c @@ -42,7 +42,7 @@ #include "pool.h" #include "pool_config.h" -#include "pg_config_manual.h" +#include "parser/pg_config_manual.h" #include "rewrite/pool_timestamp.h" #include "main/pool_internal_comms.h" #include "protocol/pool_process_query.h" -- 2.39.5