From e4bffb68a4a29993462777c44a4b5f41c406039a Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 8 Jan 2025 11:36:56 +0100 Subject: [PATCH 1/3] Minor cosmetic improvements --- contrib/postgres_fdw/Makefile | 2 +- contrib/postgres_fdw/meson.build | 6 +++--- src/interfaces/libpq/libpq-int.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile index 6c12c8e9251..adfbd2ef758 100644 --- a/contrib/postgres_fdw/Makefile +++ b/contrib/postgres_fdw/Makefile @@ -8,7 +8,6 @@ OBJS = \ option.o \ postgres_fdw.o \ shippable.o -TAP_TESTS = 1 PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL" PG_CPPFLAGS = -I$(libpq_srcdir) @@ -18,6 +17,7 @@ EXTENSION = postgres_fdw DATA = postgres_fdw--1.0.sql postgres_fdw--1.0--1.1.sql postgres_fdw--1.1--1.2.sql REGRESS = postgres_fdw query_cancel +TAP_TESTS = 1 ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/postgres_fdw/meson.build b/contrib/postgres_fdw/meson.build index 61269934c18..8b29be24dee 100644 --- a/contrib/postgres_fdw/meson.build +++ b/contrib/postgres_fdw/meson.build @@ -42,8 +42,8 @@ tests += { 'regress_args': ['--dlpath', meson.build_root() / 'src/test/regress'], }, 'tap': { - 'tests': [ - 't/001_auth_scram.pl', - ], + 'tests': [ + 't/001_auth_scram.pl', + ], }, } diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 79097b63ec0..d29ef1cfb77 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -521,9 +521,9 @@ struct pg_conn * tried host */ bool send_appname; /* okay to send application_name? */ size_t scram_client_key_len; - char *scram_client_key_binary; + void *scram_client_key_binary; size_t scram_server_key_len; - char *scram_server_key_binary; + void *scram_server_key_binary; /* Miscellaneous stuff */ int be_pid; /* PID of backend --- needed for cancels */ -- 2.47.1