[GRASS-SVN] r56661 - grass/trunk/ps/ps.map

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-09 21:41:58 -0700 (Sun, 09 Jun 2013)
New Revision: 56661

Modified:
   grass/trunk/ps/ps.map/vect.c
Log:
rename nearest() fn to avoid namespace conflict with libm on AIX 7.1

Modified: grass/trunk/ps/ps.map/vect.c
===================================================================
--- grass/trunk/ps/ps.map/vect.c	2013-06-09 20:15:53 UTC (rev 56660)
+++ grass/trunk/ps/ps.map/vect.c	2013-06-10 04:41:58 UTC (rev 56661)
@@ -1,9 +1,9 @@
 /* Functions: adjust_line 
- **
- ** Author: Radim Blazek Feb 2000
- ** 
- **
+ *
+ * Author: Radim Blazek Feb 2000
+ *
  */
+
 #include <stdlib.h>
 #include <math.h>
 #include <grass/vector.h>
@@ -13,7 +13,7 @@
 #define LENGTH(DX, DY)  (  sqrt( (DX*DX)+(DY*DY) )  )
 
 /* nearest returns nearest longitude coordinate, copy from src/libes */
-static double nearest(double e0, double e1)
+static double nearest_longitude(double e0, double e1)
 {
     while (e0 - e1 > 180)
 	e1 += 360.0;
@@ -23,7 +23,8 @@
 }
 
 /* if projection is PROJECTION_LL adjust_line will change
- **   longitudes to nearest form previous point */
+ *   longitudes to nearest form previous point
+ */
 void adjust_line(struct line_pnts *Points)
 {
     int i, np;
@@ -31,7 +32,7 @@
     if (G_projection() == PROJECTION_LL) {
 	np = Points->n_points;
 	for (i = 1; i < np; i++) {
-	    Points->x[i] = nearest(Points->x[i - 1], Points->x[i]);
+	    Points->x[i] = nearest_longitude(Points->x[i - 1], Points->x[i]);
 	}
     }
 }