PG 12: Use standard macros for float limits

Closes #4146

git-svn-id: http://svn.osgeo.org/postgis/trunk@16692 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 81d68abf2e4dbb434b24a68d600d1e53ceefc534..4b0b51f44cdf81ab6961ad11a5b50a108246c7ee 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+PostGIS 2.5.0rc1
+2018/XX/XX
+New since PostGIS 2.5.0beta2
+  - #4146, Fix compilation error against Postgres 12 (Raúl Marín).
+
 PostGIS 2.5.0beta2
 2018/08/11
 New since PostGIS 2.5.0beta1

diff --git a/postgis/gserialized_spgist_2d.c b/postgis/gserialized_spgist_2d.c
index 8f8ff7609080ac55dd699f87181aa33bb34a1ba4..da24cef3edaf3f452b6c632b5338993b002d6b7c 100644 (file)
--- a/postgis/gserialized_spgist_2d.c
+++ b/postgis/gserialized_spgist_2d.c
@@ -155,7 +155,7 @@ static RectBox *
 initRectBox(void)
 {
        RectBox *rect_box = (RectBox *)palloc(sizeof(RectBox));
-       float infinity = get_float4_infinity();
+       float infinity = FLT_MAX;
 
        rect_box->left.xmin = -infinity;
        rect_box->left.xmax = infinity;

diff --git a/postgis/gserialized_spgist_3d.c b/postgis/gserialized_spgist_3d.c
index 2b8e8c6503301abe71aac8bae5e43cf67dfdadcb..f4d340d87eb1a3efe15bc0e1409dc1e115648edc 100644 (file)
--- a/postgis/gserialized_spgist_3d.c
+++ b/postgis/gserialized_spgist_3d.c
@@ -74,6 +74,8 @@
 #include "lwgeom_box3d.h"
 #include "lwgeom_pg.h"
 
+#include <float.h>
+
 PG_FUNCTION_INFO_V1(gserialized_overlaps_3d);
 Datum gserialized_overlaps_3d(PG_FUNCTION_ARGS)
 {
@@ -189,7 +191,7 @@ static CubeBox3D *
 initCubeBox(void)
 {
        CubeBox3D *cube_box = (CubeBox3D *)palloc(sizeof(CubeBox3D));
-       double infinity = get_float8_infinity();
+       double infinity = DBL_MAX;
 
        cube_box->left.xmin = -infinity;
        cube_box->left.xmax = infinity;