[SCM] PostGIS branch stable-3.1 updated. 3.1.11-32-gc5e3974a5

[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, stable-3.1 has been updated
       via  c5e3974a5dd4164cea2ec56ad932f3eb99c174d6 (commit)
       via  6f1822eec571b18fbaf261b41489bc0be2517e82 (commit)
       via  769def5d394c4ce25b989d0234452cad2115fad7 (commit)
      from  9bd8a0d223e02213d6f6f0c04bbbff6612072306 (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 c5e3974a5dd4164cea2ec56ad932f3eb99c174d6
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jun 5 12:51:19 2025 -0700

    Remove incorrectly placed include for pcre1

diff --git a/extensions/address_standardizer/address_parser.c b/extensions/address_standardizer/address_parser.c
index 892b42c45..3e1c642bf 100644
--- a/extensions/address_standardizer/address_parser.c
+++ b/extensions/address_standardizer/address_parser.c
@@ -8,7 +8,6 @@
 #include "utils/builtins.h"
 
 #include "parseaddress-api.h"
-#include <pcre.h>
 #include <string.h>
 
 #undef DEBUG

commit 6f1822eec571b18fbaf261b41489bc0be2517e82
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jun 5 13:06:45 2025 -0700

    Merge conflict

diff --git a/extensions/address_standardizer/parseaddress-api.c b/extensions/address_standardizer/parseaddress-api.c
index a7b49f971..b426d39e5 100644
--- a/extensions/address_standardizer/parseaddress-api.c
+++ b/extensions/address_standardizer/parseaddress-api.c
@@ -184,7 +184,6 @@ ADDRESS *parseaddress(HHash *stH, char *s, int *reterr)
 
 	(void)mi;
 	(void)comma;
-
 	ret = (ADDRESS *) palloc0(sizeof(ADDRESS));
 
 	/* check if we were passed a lat lon */

commit 769def5d394c4ce25b989d0234452cad2115fad7
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jun 5 13:05:46 2025 -0700

    Merge conflict

diff --git a/extensions/address_standardizer/parseaddress-api.c b/extensions/address_standardizer/parseaddress-api.c
index b426d39e5..a7b49f971 100644
--- a/extensions/address_standardizer/parseaddress-api.c
+++ b/extensions/address_standardizer/parseaddress-api.c
@@ -184,6 +184,7 @@ ADDRESS *parseaddress(HHash *stH, char *s, int *reterr)
 
 	(void)mi;
 	(void)comma;
+
 	ret = (ADDRESS *) palloc0(sizeof(ADDRESS));
 
 	/* check if we were passed a lat lon */

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

Summary of changes:
 extensions/address_standardizer/address_parser.c | 1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
PostGIS