I've never trusted common variables. Take those bare ints out of

latin.h and put them in latin.c with 'extern' declarations in the
header.

[originally from svn r8794]

diff --git a/latin.c b/latin.c
index 34c06c480bd48d28eb71f92193d5b4e614b4bd60..116cdaee363d757b3d024f10d450327c68dd42b4 100644 (file)
--- a/latin.c
+++ b/latin.c
@@ -16,6 +16,10 @@
  * Solver.
  */
 
+#ifdef STANDALONE_SOLVER
+int solver_show_working, solver_recurse_depth;
+#endif
+
 /*
  * Function called when we are certain that a particular square has
  * a particular number in it. The y-coordinate passed in here is

diff --git a/latin.h b/latin.h
index dbea6e4ee01ffdbd69fad20b879ec195109409fa..4ec6954a2895114b7c9bf58785920e2c038865e0 100644 (file)
--- a/latin.h
+++ b/latin.h
@@ -8,7 +8,7 @@ typedef unsigned char digit;
 /* --- Solver structures, definitions --- */
 
 #ifdef STANDALONE_SOLVER
-int solver_show_working, solver_recurse_depth;
+extern int solver_show_working, solver_recurse_depth;
 #endif
 
 struct latin_solver {