Fix incompatibility with PG14

Due to vanilla change 8597a48d01b geo_decls.h can not be used with
redefinition of EPSILON anymore. Private versions of macro are copied
from PG code.

Author: knizhnik

gnomo.c

@@ -1,10 +1,8 @@
 #include <postgres.h>
 #include <fmgr.h>
 
-#include <utils/geo_decls.h> /* Point */
-
-#include <point.h> /* SPoint */
 #include <gnomo.h>
+#include <point.h> /* SPoint from pgsphere */
 
 #include <math.h>
 

path.c

@@ -506,22 +506,26 @@ spherepath_in(PG_FUNCTION_ARGS)
 	char	   *c = PG_GETARG_CSTRING(0);
 	int32		i, nelem;
 	void		sphere_yyparse(void);
-	SPoint     *arr;
 
 	init_buffer(c);
 	sphere_yyparse();
 
 	nelem = get_path_count();
-	if (nelem > 1)
+	if (nelem > MAX_POINTS)
 	{
-		arr = (SPoint *)palloc(sizeof(SPoint)*nelem);
+		reset_buffer();
+		elog(ERROR, "spherepath_in: too much points");
+		PG_RETURN_NULL();
+	}
+	else if (nelem > 1)
+	{
+		SPoint		arr[MAX_POINTS];
 
 		for (i = 0; i < nelem; i++)
 		{
 			get_path_elem(i, &arr[i].lng, &arr[i].lat);
 		}
 		path = spherepath_from_array(&arr[0], nelem);
-		pfree(arr);
 	}
 	else
 	{

pg_sphere.h

@@ -35,7 +35,6 @@
 
 #include "postgres.h"
 #include "fmgr.h"
-#include "utils/geo_decls.h"
 #include "utils/array.h"
 #include "utils/elog.h"
 #include "utils/builtins.h"
@@ -46,6 +45,56 @@
 
 #include "pgs_util.h"
 
+#define EPSILON					1.0E-09
+
+#define FPzero(A)				(fabs(A) <= EPSILON)
+
+static inline bool
+FPeq(double A, double B)
+{
+	return A == B || fabs(A - B) <= EPSILON;
+}
+
+static inline bool
+FPne(double A, double B)
+{
+	return A != B && fabs(A - B) > EPSILON;
+}
+
+static inline bool
+FPlt(double A, double B)
+{
+	return A + EPSILON < B;
+}
+
+static inline bool
+FPle(double A, double B)
+{
+	return A <= B + EPSILON;
+}
+
+static inline bool
+FPgt(double A, double B)
+{
+	return A > B + EPSILON;
+}
+
+static inline bool
+FPge(double A, double B)
+{
+	return A + EPSILON >= B;
+}
+
+/*---------------------------------------------------------------------
+ * Point - (x,y)
+ *-------------------------------------------------------------------*/
+typedef struct
+{
+	float8		x,
+				y;
+} Point;
+
 void	sphere_yyparse(void);
 
 #endif
+

polygon.c

@@ -815,24 +815,29 @@ spherepoly_in(PG_FUNCTION_ARGS)
 	char	   *c = PG_GETARG_CSTRING(0);
 	int32		i,
 				nelem;
-	SPoint	   *arr;
 
 	void		sphere_yyparse(void);
 
 	init_buffer(c);
 	sphere_yyparse();
 
 	nelem = get_path_count();
+	if (nelem > MAX_POINTS)
+	{
+		reset_buffer();
+		elog(ERROR, "spherepoly_in: too much points");
+		PG_RETURN_NULL();
+
+	}
 	if (nelem > 2)
 	{
-		arr = (SPoint *)palloc(sizeof(SPoint)*nelem);
+		SPoint		arr[MAX_POINTS];
 
 		for (i = 0; i < nelem; i++)
 		{
 			get_path_elem(i, &arr[i].lng, &arr[i].lat);
 		}
 		poly = spherepoly_from_array(&arr[0], nelem);
-		pfree(arr);
 	}
 	else
 	{
@@ -894,12 +899,11 @@ spherepoly_area(PG_FUNCTION_ARGS)
 {
 	SPOLY	   *poly = PG_GETARG_SPOLY(0);
 	int32		i;
-	SPoint 	   *s;
+	SPoint		s[MAX_POINTS + 2];
 	SPoint		stmp[2];
 	SEuler		se;
 	float8		sum = 0.0;
 
-	s=(SPoint *)palloc(sizeof(SPoint)*(poly->npts + 2));
 	memcpy((void *) &s[1],
 		   (void *) &poly->p[0],
 		   poly->npts * sizeof(SPoint));
@@ -939,7 +943,6 @@ spherepoly_area(PG_FUNCTION_ARGS)
 		sum = 0.0;
 	}
 
-	pfree(s);
 	PG_RETURN_FLOAT8(sum);
 }
 

polygon.h

@@ -17,6 +17,7 @@ typedef struct
 	SPoint	p[1];		/* variable length array of SPoints */
 } SPOLY;
 
+#define MAX_POINTS 1024
 
 /* Polygon and ellipse */
 #define PGS_ELLIPSE_POLY_AVOID 0	/* ellipse avoids polygon */