Changeset: c8930dc38111 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8930dc38111
Modified Files:
geom/lib/libgeom.h
geom/monetdb5/geom.c
Branch: Nov2019
Log Message:
The proj_api.h stuff has been deprecated. For now silence with a define.
diffs (32 lines):
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -29,6 +29,7 @@
#include <geos_c.h>
#ifdef HAVE_PROJ
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
#include <proj_api.h> //it is needed to transform from one srid to another
#endif
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -45,7 +45,7 @@ wkbNULLcopy(void)
#ifdef HAVE_PROJ
/** convert degrees to radians */
-static void
+static inline void
degrees2radians(double *x, double *y, double *z)
{
*x *= M_PI / 180.0;
@@ -54,7 +54,7 @@ degrees2radians(double *x, double *y, do
}
/** convert radians to degrees */
-static void
+static inline void
radians2degrees(double *x, double *y, double *z)
{
*x *= 180.0 / M_PI;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
