Remove warnings in llvm/clang

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

diff --git a/configure.ac b/configure.ac
index 170a8bf32ebf67c999bb06e215a67f656928cfc1..154295863b1fa582820c9aa9ce311e4f776818c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,9 @@ AC_DEFINE([HAVE_VASPRINTF])
 AC_CHECK_FUNC(asprintf, [HAVE_ASPRINTF=1], [HAVE_ASPRINTF=0])
 AC_DEFINE([HAVE_ASPRINTF])
 AC_FUNC_FSEEKO()
+AC_CHECK_FUNC(isfinite, [HAVE_ISFINITE=1], [HAVE_ISFINITE=0])
+AC_DEFINE([HAVE_ISFINITE])
+
 
 dnl 
 dnl MingW requires use of pwd -W to give proper Windows (not MingW) paths 

diff --git a/liblwgeom/g_box.c b/liblwgeom/g_box.c
index 6fb8b9238bedc79f195b9b9f0923356ffaf9b534..f89f35dd44236e2672ba6d50fa286174b6e0a1d6 100644 (file)
--- a/liblwgeom/g_box.c
+++ b/liblwgeom/g_box.c
@@ -9,6 +9,12 @@
  *
  **********************************************************************/
 
+#if !HAVE_ISFINITE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#endif
+
 #include "liblwgeom_internal.h"
 #include "lwgeom_log.h"
 #include <stdlib.h>
@@ -146,28 +152,28 @@ int gbox_same(const GBOX *g1, const GBOX *g2)
 int gbox_is_valid(const GBOX *gbox)
 {
        /* X */
-       if ( ! finite(gbox->xmin) || isnan(gbox->xmin) ||
-            ! finite(gbox->xmax) || isnan(gbox->xmax) )
+       if ( ! isfinite(gbox->xmin) || isnan(gbox->xmin) ||
+            ! isfinite(gbox->xmax) || isnan(gbox->xmax) )
                return LW_FALSE;
                
        /* Y */
-       if ( ! finite(gbox->ymin) || isnan(gbox->ymin) ||
-            ! finite(gbox->ymax) || isnan(gbox->ymax) )
+       if ( ! isfinite(gbox->ymin) || isnan(gbox->ymin) ||
+            ! isfinite(gbox->ymax) || isnan(gbox->ymax) )
                return LW_FALSE;
                
        /* Z */
        if ( FLAGS_GET_GEODETIC(gbox->flags) || FLAGS_GET_Z(gbox->flags) )
        {
-               if ( ! finite(gbox->zmin) || isnan(gbox->zmin) ||
-                    ! finite(gbox->zmax) || isnan(gbox->zmax) )
+               if ( ! isfinite(gbox->zmin) || isnan(gbox->zmin) ||
+                    ! isfinite(gbox->zmax) || isnan(gbox->zmax) )
                        return LW_FALSE;
        }
 
        /* M */
        if ( FLAGS_GET_M(gbox->flags) )
        {
-               if ( ! finite(gbox->mmin) || isnan(gbox->mmin) ||
-                    ! finite(gbox->mmax) || isnan(gbox->mmax) )
+               if ( ! isfinite(gbox->mmin) || isnan(gbox->mmin) ||
+                    ! isfinite(gbox->mmax) || isnan(gbox->mmax) )
                        return LW_FALSE;
        }
        

diff --git a/liblwgeom/lwcircstring.c b/liblwgeom/lwcircstring.c
index f381b3eb28a70d86d2cc790f5ee1a32a3ce4fedd..00dc6cf70cb0013f118bce2e584e769a6ae97cd8 100644 (file)
--- a/liblwgeom/lwcircstring.c
+++ b/liblwgeom/lwcircstring.c
@@ -274,11 +274,10 @@ double lwcircstring_length(const LWCIRCSTRING *circ)
 
 double lwcircstring_length_2d(const LWCIRCSTRING *circ)
 {
-       double length = 0.0;
        if ( lwcircstring_is_empty(circ) )
                return 0.0;
        
-    return ptarray_arc_length_2d(circ->points);
+       return ptarray_arc_length_2d(circ->points);
 }
 
 /*

diff --git a/postgis/gserialized_gist_2d.c b/postgis/gserialized_gist_2d.c
index 65dce94e9fbf523ea7daeeaff2e2ab5e0530ca6d..345791706f0429129363fc23a43ff0f44ade1206 100644 (file)
--- a/postgis/gserialized_gist_2d.c
+++ b/postgis/gserialized_gist_2d.c
@@ -814,8 +814,8 @@ Datum gserialized_gist_compress_2d(PG_FUNCTION_ARGS)
        POSTGIS_DEBUGF(4, "[GIST] got entry_in->key: %s", box2df_to_string(&bbox_out));
 
        /* Check all the dimensions for finite values */
-       if ( ! finite(bbox_out.xmax) || ! finite(bbox_out.xmin) ||
-            ! finite(bbox_out.ymax) || ! finite(bbox_out.ymin) )
+       if ( ! isfinite(bbox_out.xmax) || ! isfinite(bbox_out.xmin) ||
+            ! isfinite(bbox_out.ymax) || ! isfinite(bbox_out.ymin) )
        {
                POSTGIS_DEBUG(4, "[GIST] infinite geometry!");
                PG_RETURN_POINTER(entry_in);

diff --git a/postgis/gserialized_gist_nd.c b/postgis/gserialized_gist_nd.c
index d01f04b55827591c79fd1376283e7af8c3d444a4..727ed9da684d5e431d0310f136a023a76f9302ff 100644 (file)
--- a/postgis/gserialized_gist_nd.c
+++ b/postgis/gserialized_gist_nd.c
@@ -585,8 +585,8 @@ Datum gserialized_gist_compress(PG_FUNCTION_ARGS)
         * If not, use the "unknown" GIDX as a key */
        for ( i = 0; i < GIDX_NDIMS(bbox_out); i++ )
        {
-               if ( ! finite(GIDX_GET_MAX(bbox_out, i))
-                    || ! finite(GIDX_GET_MIN(bbox_out, i)) )
+               if ( ! isfinite(GIDX_GET_MAX(bbox_out, i))
+                    || ! isfinite(GIDX_GET_MIN(bbox_out, i)) )
                {
                        gidx_set_unknown(bbox_out);
                        gistentryinit(*entry_out, 

diff --git a/postgis_config.h.in b/postgis_config.h.in
index edf1d08d1d9e9907d4603b99beba573b94aa21f7..094b5304cf5cfaa1289024bd40a28c92248ea6be 100644 (file)
--- a/postgis_config.h.in
+++ b/postgis_config.h.in
@@ -25,6 +25,7 @@
 #undef HAVE_VASPRINTF
 #undef HAVE_ASPRINTF
 #undef HAVE_FSEEKO
+#undef HAVE_ISFINITE
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H