From 4eec2e03c34f9a357d86317b1cd05d80a2ab559d Mon Sep 17 00:00:00 2001 From: John Naylor Date: Sat, 27 Aug 2022 11:17:36 +0700 Subject: Be more careful to avoid including system headers after perl.h Commit 121d2d3d70 included simd.h into pg_wchar.h. This caused a problem on Windows, since Perl has "#define free" (referring to globals), which breaks the Windows' header. To fix, move the static inline function definitions from plperl_helpers.h, into plperl.h, where we already document the necessary inclusion order. Since those functions were the only reason for the existence of plperl_helpers.h, remove it. First reported by Justin Pryzby Diagnosis and review by Andres Freund, patch by myself per suggestion from Tom Lane Discussion: https://www.postgresql.org/message-id/20220826115546.GE2342%40telsasoft.com --- contrib/hstore_plperl/hstore_plperl.c | 1 - 1 file changed, 1 deletion(-) (limited to 'contrib/hstore_plperl') diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c index c72785d99ec..4a1629cad51 100644 --- a/contrib/hstore_plperl/hstore_plperl.c +++ b/contrib/hstore_plperl/hstore_plperl.c @@ -3,7 +3,6 @@ #include "fmgr.h" #include "hstore/hstore.h" #include "plperl.h" -#include "plperl_helpers.h" PG_MODULE_MAGIC; -- cgit v1.2.3