Forráskód Böngészése

Fixed segfault: naming conflicts with overwrite(3) in Slackware 12

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36473 15284696-431f-4ddb-bdfa-cd5b030d7da7
Huidae Cho 16 éve
szülő
commit
b1043d2e22
3 módosított fájl, 4 hozzáadás és 4 törlés
  1. 1 1
      raster/r.mapcalc/evaluate.c
  2. 1 1
      raster/r.mapcalc/globals.h
  3. 2 2
      raster/r.mapcalc/main.c

+ 1 - 1
raster/r.mapcalc/evaluate.c

@@ -305,7 +305,7 @@ void execute(expr_list * ee)
 
 	var = e->data.bind.var;
 
-	if (!overwrite && check_output_map(var))
+	if (!overwrite_flag && check_output_map(var))
 	    G_fatal_error(_("output map <%s> exists"), var);
     }
 

+ 1 - 1
raster/r.mapcalc/globals.h

@@ -5,7 +5,7 @@
 extern volatile int floating_point_exception;
 extern volatile int floating_point_exception_occurred;
 extern int overflow_occurred;
-extern int overwrite;
+extern int overwrite_flag;
 
 extern int current_depth, current_row;
 extern int depths, rows, columns;

+ 2 - 2
raster/r.mapcalc/main.c

@@ -26,7 +26,7 @@
 /****************************************************************************/
 
 int overflow_occurred;
-int overwrite;
+int overwrite_flag;
 
 volatile int floating_point_exception;
 volatile int floating_point_exception_occurred;
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    overwrite = module->overwrite;
+    overwrite_flag = module->overwrite;
 
     if (expr->answer)
 	result = parse_string(expr->answer);