Sfoglia il codice sorgente

Rename round() -> i_round() to avoid conflict with C99 function of that name

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39130 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 anni fa
parent
commit
49b8e2fe5a
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      raster/r.mapcalc/xround.c

+ 4 - 4
raster/r.mapcalc/xround.c

@@ -19,9 +19,9 @@ round(x)
   numbers, and subtracting .5 from negatives.
 **********************************************************************/
 
-/* round(x) rounds x to nearest CELL value, handles negative correctly */
+/* i_round(x) rounds x to nearest CELL value, handles negative correctly */
 
-static int round(double x)
+static int i_round(double x)
 {
     int n;
 
@@ -77,7 +77,7 @@ int f_round(int argc, const int *argt, void **args)
 		if (IS_NULL_F(&arg1[i]))
 		    SET_NULL_C(&res[i]);
 		else
-		    res[i] = round(arg1[i]);
+		    res[i] = i_round(arg1[i]);
 	    return 0;
 	}
     case DCELL_TYPE:
@@ -88,7 +88,7 @@ int f_round(int argc, const int *argt, void **args)
 		if (IS_NULL_D(&arg1[i]))
 		    SET_NULL_C(&res[i]);
 		else
-		    res[i] = round(arg1[i]);
+		    res[i] = i_round(arg1[i]);
 	    return 0;
 	}
     default: