avoiding dependencies on pathplan

diff --git a/lib/common/geom.h b/lib/common/geom.h
index e52f0f7290ef728a5a06de0e3f18423a6225b22b..c606a9e3a24b9939c9efdbed513381c7f59a449d 100644 (file)
--- a/lib/common/geom.h
+++ b/lib/common/geom.h
@@ -26,13 +26,14 @@
 extern "C" {
 #endif
     
-typedef struct point { int x, y; } point;
+typedef struct { int x, y; } point;
 
-typedef Ppoint_t pointf;
+typedef struct pointf_s { double x, y; } pointf;
+#define HAVE_POINTF_S
 
-typedef struct box { point LL, UR; } box;
+typedef struct { point LL, UR; } box;
 
-typedef struct boxf { pointf LL, UR; } boxf;
+typedef struct { pointf LL, UR; } boxf;
 
 #ifdef MIN
 #undef MIN
@@ -121,7 +122,6 @@ extern boolean boxf_contains(boxf, boxf);
 extern box flip_rec_box(box b, point p);
 
 extern int lineToBox(pointf p1, pointf p2, boxf b);
-extern double dist2(pointf p, pointf q);
 
 extern point ccwrotatep(point p, int ccwrot);
 extern pointf ccwrotatepf(pointf p, int ccwrot);

diff --git a/lib/common/render.h b/lib/common/render.h
index f4ead6837f34d4dd5332c3696b7f886d85884679..0454b89f46b3cb77a3faaab6fdd697c983f07cd4 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -50,8 +50,8 @@
 #endif
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
+#include "pathplan.h"
 #include "macros.h"
 #include "const.h"
 #include "types.h"

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 2d5631a4a1c43ea17f4ac04874fa24518c584aa5..2b30799354cab5c119bdaaa3166ce1917677ddf3 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -30,7 +30,6 @@
 #endif
 
 #include        "logic.h"
-#include        "pathplan.h"
 #include        "geom.h"
 #include        "macros.h"
 #include        "const.h"

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index e5ce0c843981b13b0861bc40f75e8f84a586addb..7bf67158eff946594bd61cd066a386497a01324e 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -30,7 +30,6 @@
 #include        <stdlib.h>
 
 #include       "logic.h"
-#include       "pathplan.h"
 #include       "geom.h"
 #include       "macros.h"
 #include       "types.h"

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index fc88f04da78689cee3b2be49dd90089f330ceedc..a0df29f303d66da376e9a0b9233dc43d97fba3aa 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
 #include "const.h"
 #include "types.h"

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index 1237b9b6590ac06f85644d4bb9ac2e3b03b90404..d7d263e836b4caee2d705b6833e9c96960387829 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -22,7 +22,6 @@
 #include       <stdlib.h>
 
 #include       "logic.h"
-#include       "pathplan.h"
 #include       "geom.h"
 #include       "types.h"
 #include        "gvplugin.h"

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index b3760f2690819027e195eae371fe2d820816f2d8..16ede4ae5e775aeea90910a744652b09220a0d75 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
 #include "const.h"
 #include "types.h"

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 9ef0643935fbb5c9db928a523cc6f679b799f32f..18051aac1fda66dd443db8067e1cf99146c8604a 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -27,7 +27,6 @@
 #endif
 
 #include        "logic.h"
-#include        "pathplan.h"
 #include        "geom.h"
 #include        "types.h"
 #include        "macros.h"

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 522c04fb0d695200062c2da1ee39e5ed148e593e..d2205289e0cba88a7cd64f812638849b443c41a8 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
 #include "const.h"
 #include "types.h"

diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c
index 246c4d495c01222e63b08c64de76050cbc5d2910..c6f5b5eb057d2865ecf7331bca315f6959adcec5 100644 (file)
--- a/lib/gvc/gvtextlayout.c
+++ b/lib/gvc/gvtextlayout.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
 #include "const.h"
 #include "types.h"

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 2c374d01aaf0d0efab76a365558f6d223c70a81a..4ce4fadb45a5ef3889037a0ee75a8d5b84e2ce68 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -38,7 +38,6 @@
 #include <stdio.h>
 
 #include "logic.h"
-#include "pathplan.h"
 #include "geom.h"
 #include "const.h"
 #include "types.h"