Renamed max/min/avg macros to LW_MAX, LW_MIN, LW_AVG.

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

diff --git a/lwgeom/liblwgeom.h b/lwgeom/liblwgeom.h
index 528a850895972704c304c98a0d37e1f275e49018..f43ce9c3170bb84cb3e3b4247e700803cd082876 100644 (file)
--- a/lwgeom/liblwgeom.h
+++ b/lwgeom/liblwgeom.h
@@ -883,11 +883,9 @@ extern double nextUp_d(float d);
 
 
 
-//#if ! defined(__MINGW32__)
-#define max(a,b)               ((a) >  (b) ? (a) : (b))
-#define min(a,b)               ((a) <= (b) ? (a) : (b))
-//#endif
-#define abs(a)                 ((a) <  (0) ? (-a) : (a))
+#define LW_MAX(a,b)    ((a) >  (b) ? (a) : (b))
+#define LW_MIN(a,b)    ((a) <= (b) ? (a) : (b))
+#define LW_ABS(a)      ((a) <  (0) ? (-a) : (a))
 
 
 // general utilities 

diff --git a/lwgeom/lwgeom_estimate.c b/lwgeom/lwgeom_estimate.c
index 011a41fc7cb74e080616f0130aa7226e0fb6b417..850ddea3a8f20c0ff5b1bc6eedd9ebe903505d9b 100644 (file)
--- a/lwgeom/lwgeom_estimate.c
+++ b/lwgeom/lwgeom_estimate.c
@@ -8,47 +8,6 @@
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU General Public Licence. See the COPYING file.
  * 
- **********************************************************************
- * $Log$
- * Revision 1.11  2004/10/27 11:02:24  strk
- * Removed another getbox2d() call.
- *
- * Revision 1.10  2004/10/25 17:07:09  strk
- * Obsoleted getbox2d(). Use getbox2d_p() or getbox2d_internal() instead.
- *
- * Revision 1.9  2004/10/08 13:20:54  strk
- *
- * Changed LWGEOM structure to point to an actual BOX2DFLOAT4.
- * Renamed most function to reflect a TYPE_method naming convention.
- * (you'll need a dump/reload for it to work)
- * Added more manipulation functions.
- *
- * Revision 1.8  2004/10/05 21:54:48  strk
- * Yes another change in SPI_cursor_open
- *
- * Revision 1.7  2004/09/29 10:50:30  strk
- * Big layout change.
- * lwgeom.h is public API
- * liblwgeom.h is private header
- * lwgeom_pg.h is for PG-links
- * lw<type>.c contains type-specific functions
- *
- * Revision 1.6  2004/09/27 08:26:03  strk
- * Debugging defines set to NODEBUG.
- *
- * Revision 1.5  2004/09/16 09:06:12  strk
- * Changed SPI_cursor_open call changes to be used for USE_VERSION > 80
- * (change seems to be intended for future releases)
- *
- * Revision 1.4  2004/09/14 07:43:00  strk
- * Updated call to SPI_cursor_open to 8.0 (beta2) interface.
- *
- * Revision 1.3  2004/08/19 13:54:15  strk
- * cpp checks updated to use 80 instead of 75 for USE_VERSION
- *
- * Revision 1.2  2004/08/19 13:18:01  strk
- * Added selectivity estimation
- *
  **********************************************************************/
 
 #include <math.h>
@@ -1926,3 +1885,22 @@ Datum LWGEOM_analyze(PG_FUNCTION_ARGS)
 #endif
 
 
+/**********************************************************************
+ * $Log$
+ * Revision 1.12  2004/11/04 11:40:08  strk
+ * Renamed max/min/avg macros to LW_MAX, LW_MIN, LW_AVG.
+ *
+ * Revision 1.11  2004/10/27 11:02:24  strk
+ * Removed another getbox2d() call.
+ *
+ * Revision 1.10  2004/10/25 17:07:09  strk
+ * Obsoleted getbox2d(). Use getbox2d_p() or getbox2d_internal() instead.
+ *
+ * Revision 1.9  2004/10/08 13:20:54  strk
+ *
+ * Changed LWGEOM structure to point to an actual BOX2DFLOAT4.
+ * Renamed most function to reflect a TYPE_method naming convention.
+ * (you'll need a dump/reload for it to work)
+ * Added more manipulation functions.
+ *
+ **********************************************************************/

diff --git a/lwgeom/misures.c b/lwgeom/misures.c
index fa1593c770bb2195a28c95e72eebf33c631514e5..5c122700a3ce59dd9ca750a8190f582964b8e329 100644 (file)
--- a/lwgeom/misures.c
+++ b/lwgeom/misures.c
@@ -100,7 +100,7 @@ double distance2d_pt_seg(POINT2D *p, POINT2D *A, POINT2D *B)
        s = ( (A->y-p->y)*(B->x-A->x)- (A->x-p->x)*(B->y-A->y) ) /
                ( (B->x-A->x)*(B->x-A->x) +(B->y-A->y)*(B->y-A->y) );
 
-       return abs(s) * sqrt(
+       return LW_ABS(s) * sqrt(
                (B->x-A->x)*(B->x-A->x) + (B->y-A->y)*(B->y-A->y)
                );
 }
@@ -158,9 +158,9 @@ double distance2d_seg_seg(POINT2D *A, POINT2D *B, POINT2D *C, POINT2D *D)
        if  ( (r_bot==0) || (s_bot == 0) )
        {
                return (
-                       min(distance2d_pt_seg(A,C,D),
-                               min(distance2d_pt_seg(B,C,D),
-                                       min(distance2d_pt_seg(C,A,B),
+                       LW_MIN(distance2d_pt_seg(A,C,D),
+                               LW_MIN(distance2d_pt_seg(B,C,D),
+                                       LW_MIN(distance2d_pt_seg(C,A,B),
                                                distance2d_pt_seg(D,A,B))
                                )
                        )
@@ -173,9 +173,9 @@ double distance2d_seg_seg(POINT2D *A, POINT2D *B, POINT2D *C, POINT2D *D)
        {
                //no intersection
                return (
-                       min(distance2d_pt_seg(A,C,D),
-                               min(distance2d_pt_seg(B,C,D),
-                                       min(distance2d_pt_seg(C,A,B),
+                       LW_MIN(distance2d_pt_seg(A,C,D),
+                               LW_MIN(distance2d_pt_seg(B,C,D),
+                                       LW_MIN(distance2d_pt_seg(C,A,B),
                                                distance2d_pt_seg(D,A,B))
                                )
                        )
@@ -203,7 +203,7 @@ double distance2d_pt_ptarray(POINT2D *p, POINTARRAY *pa)
                end = (POINT2D *)getPoint(pa, t);
                dist = distance2d_pt_seg(p, start, end);
                if (t==1) result = dist;
-               else result = min(result, dist);
+               else result = LW_MIN(result, dist);
 
                if ( result == 0 ) return 0;
 
@@ -243,7 +243,7 @@ double distance2d_ptarray_ptarray(POINTARRAY *l1, POINTARRAY *l2)
 //printf("line_line; seg %i * seg %i, dist = %g\n",t,u,dist_this);
 
                        if (result_okay)
-                               result = min(result,dist);
+                               result = LW_MIN(result,dist);
                        else
                        {
                                result_okay = 1;
@@ -304,7 +304,7 @@ double distance2d_ptarray_poly(POINTARRAY *pa, LWPOLY *poly)
        for (i=0; i<poly->nrings; i++)
        {
                double dist = distance2d_ptarray_ptarray(pa, poly->rings[i]);
-               if (i) mindist = min(mindist, dist);
+               if (i) mindist = LW_MIN(mindist, dist);
                else mindist = dist;
 #ifdef DEBUG
        elog(NOTICE, " distance from ring %d: %f, mindist: %f",
@@ -434,7 +434,7 @@ double distance2d_poly_poly(LWPOLY *poly1, LWPOLY *poly2)
        for (i=0; i<poly1->nrings; i++)
        {
                double dist = distance2d_ptarray_poly(poly1->rings[i], poly2);
-               if (i) mindist = min(mindist, dist);
+               if (i) mindist = LW_MIN(mindist, dist);
                else mindist = dist;
 
 #ifdef DEBUG
@@ -521,7 +521,7 @@ double lwgeom_polygon_area(LWPOLY *poly)
 
                ringarea  /= 2.0;
 //elog(NOTICE," ring 1 has area %lf",ringarea);
-               ringarea  = fabs(ringarea );
+               ringarea  = fabs(ringarea);
                if (i != 0)     //outer
                        ringarea  = -1.0*ringarea ; // its a hole
 
@@ -583,7 +583,7 @@ lwgeom_mindistance2d_recursive(char *lw1, char *lw2)
                        dist = lwgeom_mindistance2d_recursive(g1, lw2);
                        if ( dist == 0 ) return 0.0; // can't be closer
                        if ( mindist == -1 ) mindist = dist;
-                       else mindist = min(dist, mindist);
+                       else mindist = LW_MIN(dist, mindist);
                        continue;
                }
 
@@ -670,7 +670,7 @@ lwgeom_mindistance2d_recursive(char *lw1, char *lw2)
                        }
 
                        if (mindist == -1 ) mindist = dist;
-                       else mindist = min(dist, mindist);
+                       else mindist = LW_MIN(dist, mindist);
 
 #ifdef DEBUG
                elog(NOTICE, "dist %d-%d: %f - mindist: %f",