[SCM] PostGIS branch master updated. 3.6.0rc2-356-g8a31ce8c6

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  8a31ce8c686766caacde19e8fa5977ed49a4068e (commit)
      from  04b9a7cb3a17edde9291944ad0d0e1ab1398d568 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a31ce8c686766caacde19e8fa5977ed49a4068e
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Mar 5 22:18:25 2026 +0400

    Fix mingw clang redeclaration errors in gserialized_estimate

diff --git a/postgis/gserialized_estimate.c b/postgis/gserialized_estimate.c
index 7f5e6d89c..15791f382 100644
--- a/postgis/gserialized_estimate.c
+++ b/postgis/gserialized_estimate.c
@@ -124,12 +124,9 @@ dimensionality cases. (2D geometry) &&& (3D column), etc.
 
 /************************************************************************/
 
-
 /* Prototypes */
-Datum gserialized_gist_joinsel(PG_FUNCTION_ARGS);
 Datum gserialized_gist_joinsel_2d(PG_FUNCTION_ARGS);
 Datum gserialized_gist_joinsel_nd(PG_FUNCTION_ARGS);
-Datum gserialized_gist_sel(PG_FUNCTION_ARGS);
 Datum gserialized_gist_sel_2d(PG_FUNCTION_ARGS);
 Datum gserialized_gist_sel_nd(PG_FUNCTION_ARGS);
 Datum gserialized_analyze_nd(PG_FUNCTION_ARGS);
@@ -1087,36 +1084,6 @@ estimate_join_selectivity(const ND_STATS *s1, const ND_STATS *s2)
 	return selectivity;
 }
 
-/**
-* For (geometry &&& geometry) and (geography && geography)
-* we call into the N-D mode.
-*/
-PG_FUNCTION_INFO_V1(gserialized_gist_joinsel_nd);
-Datum gserialized_gist_joinsel_nd(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(DirectFunctionCall5(
-	   gserialized_gist_joinsel,
-	   PG_GETARG_DATUM(0), PG_GETARG_DATUM(1),
-	   PG_GETARG_DATUM(2), PG_GETARG_DATUM(3),
-	   Int32GetDatum(0) /* ND mode */
-	));
-}
-
-/**
-* For (geometry && geometry)
-* we call into the 2-D mode.
-*/
-PG_FUNCTION_INFO_V1(gserialized_gist_joinsel_2d);
-Datum gserialized_gist_joinsel_2d(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(DirectFunctionCall5(
-	   gserialized_gist_joinsel,
-	   PG_GETARG_DATUM(0), PG_GETARG_DATUM(1),
-	   PG_GETARG_DATUM(2), PG_GETARG_DATUM(3),
-	   Int32GetDatum(2) /* 2D mode */
-	));
-}
-
 double
 gserialized_joinsel_internal(PlannerInfo *root, List *args, JoinType jointype, int mode)
 {
@@ -1201,6 +1168,40 @@ Datum gserialized_gist_joinsel(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(gserialized_joinsel_internal(root, args, jointype, mode));
 }
 
+/**
+ * For (geometry &&& geometry) and (geography && geography)
+ * we call into the N-D mode.
+ */
+PG_FUNCTION_INFO_V1(gserialized_gist_joinsel_nd);
+Datum
+gserialized_gist_joinsel_nd(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall5(gserialized_gist_joinsel,
+					    PG_GETARG_DATUM(0),
+					    PG_GETARG_DATUM(1),
+					    PG_GETARG_DATUM(2),
+					    PG_GETARG_DATUM(3),
+					    Int32GetDatum(0) /* ND mode */
+					    ));
+}
+
+/**
+ * For (geometry && geometry)
+ * we call into the 2-D mode.
+ */
+PG_FUNCTION_INFO_V1(gserialized_gist_joinsel_2d);
+Datum
+gserialized_gist_joinsel_2d(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall5(gserialized_gist_joinsel,
+					    PG_GETARG_DATUM(0),
+					    PG_GETARG_DATUM(1),
+					    PG_GETARG_DATUM(2),
+					    PG_GETARG_DATUM(3),
+					    Int32GetDatum(2) /* 2D mode */
+					    ));
+}
+
 /**
  * The gserialized_analyze_nd sets this function as a
  * callback on the stats object when called by the ANALYZE
@@ -2017,37 +2018,6 @@ Datum _postgis_gserialized_joinsel(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(selectivity);
 }
 
-/**
-* For (geometry && geometry)
-* we call into the 2-D mode.
-*/
-PG_FUNCTION_INFO_V1(gserialized_gist_sel_2d);
-Datum gserialized_gist_sel_2d(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(DirectFunctionCall5(
-	   gserialized_gist_sel,
-	   PG_GETARG_DATUM(0), PG_GETARG_DATUM(1),
-	   PG_GETARG_DATUM(2), PG_GETARG_DATUM(3),
-	   Int32GetDatum(2) /* 2-D mode */
-	));
-}
-
-/**
-* For (geometry &&& geometry) and (geography && geography)
-* we call into the N-D mode.
-*/
-PG_FUNCTION_INFO_V1(gserialized_gist_sel_nd);
-Datum gserialized_gist_sel_nd(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(DirectFunctionCall5(
-	   gserialized_gist_sel,
-	   PG_GETARG_DATUM(0), PG_GETARG_DATUM(1),
-	   PG_GETARG_DATUM(2), PG_GETARG_DATUM(3),
-	   Int32GetDatum(0) /* N-D mode */
-	));
-}
-
-
 /**
  * This function should return an estimation of the number of
  * rows returned by a query involving an overlap check
@@ -2132,6 +2102,40 @@ Datum gserialized_gist_sel(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(selectivity);
 }
 
+/**
+ * For (geometry && geometry)
+ * we call into the 2-D mode.
+ */
+PG_FUNCTION_INFO_V1(gserialized_gist_sel_2d);
+Datum
+gserialized_gist_sel_2d(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall5(gserialized_gist_sel,
+					    PG_GETARG_DATUM(0),
+					    PG_GETARG_DATUM(1),
+					    PG_GETARG_DATUM(2),
+					    PG_GETARG_DATUM(3),
+					    Int32GetDatum(2) /* 2-D mode */
+					    ));
+}
+
+/**
+ * For (geometry &&& geometry) and (geography && geography)
+ * we call into the N-D mode.
+ */
+PG_FUNCTION_INFO_V1(gserialized_gist_sel_nd);
+Datum
+gserialized_gist_sel_nd(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall5(gserialized_gist_sel,
+					    PG_GETARG_DATUM(0),
+					    PG_GETARG_DATUM(1),
+					    PG_GETARG_DATUM(2),
+					    PG_GETARG_DATUM(3),
+					    Int32GetDatum(0) /* N-D mode */
+					    ));
+}
+
 /************************************************************************/
 
 

-----------------------------------------------------------------------

Summary of changes:
 postgis/gserialized_estimate.c | 132 +++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 64 deletions(-)


hooks/post-receive
-- 
PostGIS