From 6393de352b2be5b24040286dfb5d4b27e2c52922 Mon Sep 17 00:00:00 2001
From: charras <Unknown>
Date: Mon, 20 Oct 2008 05:59:58 +0000
Subject: [PATCH] made cvpcb and gerbview compilable with last changes in
 pcbnew

---
 cvpcb/cvpcb.cpp       | 1 +
 gerbview/gerbview.cpp | 1 +
 pcbnew/autoplac.cpp   | 1 +
 pcbnew/autorout.cpp   | 1 +
 pcbnew/autorout.h     | 7 -------
 pcbnew/board.cpp      | 1 +
 pcbnew/graphpcb.cpp   | 1 +
 pcbnew/solve.cpp      | 1 +
 pcbnew/zones.h        | 7 +++++++
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index 88f369424d..c49eceb33f 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -10,6 +10,7 @@
 #include "cvpcb.h"
 #include "trigo.h"
 #include "gr_basic.h"
+#include "zones.h"
 
 #include "bitmaps.h"
 
diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp
index d047d44900..1aea96a9d3 100644
--- a/gerbview/gerbview.cpp
+++ b/gerbview/gerbview.cpp
@@ -14,6 +14,7 @@
 #include "gerbview.h"
 #include "pcbplot.h"
 #include "trigo.h"
+#include "zones.h"
 #include "bitmaps.h"
 #include "protos.h"
 
diff --git a/pcbnew/autoplac.cpp b/pcbnew/autoplac.cpp
index 927607ac89..0f0f180ffb 100644
--- a/pcbnew/autoplac.cpp
+++ b/pcbnew/autoplac.cpp
@@ -9,6 +9,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "cell.h"
 
 #include "protos.h"
diff --git a/pcbnew/autorout.cpp b/pcbnew/autorout.cpp
index 3ab8818e4e..8411b33ffa 100644
--- a/pcbnew/autorout.cpp
+++ b/pcbnew/autorout.cpp
@@ -8,6 +8,7 @@
 #include "pcbnew.h"
 #include "autorout.h"
 #include "cell.h"
+#include "zones.h"
 
 #include "protos.h"
 
diff --git a/pcbnew/autorout.h b/pcbnew/autorout.h
index 7ce8e8ee8c..7d13eaf5c3 100644
--- a/pcbnew/autorout.h
+++ b/pcbnew/autorout.h
@@ -96,13 +96,6 @@ enum CommandOpt {
     ROUTE_PAD
 };
 
-/* parametre Pas de routage pour routage automatique et generation des zones */
-
-#if defined MAIN
-int        g_GridRoutingSize = 250;
-#else
-extern int g_GridRoutingSize;
-#endif
 
 /* Variables et structures d'autoroutage */
 
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index e1270a3b84..16ee42255c 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "cell.h"
 
 #include "protos.h"
diff --git a/pcbnew/graphpcb.cpp b/pcbnew/graphpcb.cpp
index d1760ea781..dda6ffaaab 100644
--- a/pcbnew/graphpcb.cpp
+++ b/pcbnew/graphpcb.cpp
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "trigo.h"
 #include "cell.h"
 
diff --git a/pcbnew/solve.cpp b/pcbnew/solve.cpp
index 471e4b4394..3cbfcf5357 100644
--- a/pcbnew/solve.cpp
+++ b/pcbnew/solve.cpp
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 
 #include "protos.h"
 
diff --git a/pcbnew/zones.h b/pcbnew/zones.h
index 22f43495b5..eaf2a52c15 100644
--- a/pcbnew/zones.h
+++ b/pcbnew/zones.h
@@ -28,6 +28,13 @@ enum zone_cmd {
 /* variables used in zone dialogs and functions */
 /************************************************/
 
+/* parametre grid size for automatic routing and zone filling  */
+#if defined MAIN
+int        g_GridRoutingSize = 250;
+#else
+extern int g_GridRoutingSize;
+#endif
+
 // @todo: make a class like ZONE_GENERAL_SETTING instead of many global variables
 eda_global bool g_Zone_45_Only
 #ifdef MAIN