From: Tatsuo Ishii Date: Tue, 3 Oct 2023 01:46:46 +0000 (+0900) Subject: Fix compiler warnings regarding DEFAULT_PGSOCKET_DIR. X-Git-Tag: V4_1_18~7 X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=2fe31f6ad42830375090ad552ec78204a51b5fa2;p=pgpool2.git 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. --- diff --git a/src/include/pcp/libpcp_ext.h b/src/include/pcp/libpcp_ext.h index 3c8972563..7e6c45e5f 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 5d3c0e11f..5722a5a9a 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 "protocol/pool_proto_modules.h" #include "protocol/protocol_defs.h"