[GRASS-SVN] r56922 - in grass/trunk: lib/rst/interp_float vector/v.vol.rst

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-06-25 08:43:32 -0700 (Tue, 25 Jun 2013)
New Revision: 56922

Modified:
   grass/trunk/lib/rst/interp_float/point2d.c
   grass/trunk/vector/v.vol.rst/user3.c
Log:
rst lib, v.vol.rst: avoid namespace pollution on AIX

Modified: grass/trunk/lib/rst/interp_float/point2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/point2d.c	2013-06-25 15:34:29 UTC (rev 56921)
+++ grass/trunk/lib/rst/interp_float/point2d.c	2013-06-25 15:43:32 UTC (rev 56922)
@@ -33,6 +33,11 @@
 #define	POINT2D_C
 #include <grass/interpf.h>
 
+/* needed for AIX */
+#ifdef hz
+#undef hz
+#endif
+
 int IL_check_at_points_2d(struct interp_params *params, struct quaddata *data,	/* current region */
 			  double *b,	/* solution of linear equations */
 			  double *ertot,	/* total error */

Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c	2013-06-25 15:34:29 UTC (rev 56921)
+++ grass/trunk/vector/v.vol.rst/user3.c	2013-06-25 15:43:32 UTC (rev 56922)
@@ -47,6 +47,11 @@
 #include "points.h"
 #include <grass/bitmap.h>
 
+/* needed for AIX */
+#ifdef hz
+#undef hz
+#endif
+
 int secpar_loop(int ngstc, int nszc, int i)
 {
     double dnorm1, ro, dx2, dy2, dz2, grad1, grad2, slp, grad, oor1, oor2,