Replace name bisect with gvbisect to avoid conflicts.

diff --git a/lib/neatogen/edges.c b/lib/neatogen/edges.c
index e7f83df8f451b5afa72d8debe84242e646c0e637..168ad5a3b1787720ff42a8ece709b4dd4725f3eb 100644 (file)
--- a/lib/neatogen/edges.c
+++ b/lib/neatogen/edges.c
@@ -29,7 +29,7 @@ void edgeinit()
     nedges = 0;
 }
 
-Edge *bisect(Site * s1, Site * s2)
+Edge *gvbisect(Site * s1, Site * s2)
 {
     double dx, dy, adx, ady;
     Edge *newedge;

diff --git a/lib/neatogen/edges.h b/lib/neatogen/edges.h
index 411fbf7aaa67b90d2d25d4e815715e0fa23849e9..1868ccbf21dba7cf9d656b578343504b1ddc0261 100644 (file)
--- a/lib/neatogen/edges.h
+++ b/lib/neatogen/edges.h
@@ -36,7 +36,7 @@ extern "C" {
     extern void edgeinit(void);
     extern void endpoint(Edge *, int, Site *);
     extern void clip_line(Edge * e);
-    extern Edge *bisect(Site *, Site *);
+    extern Edge *gvbisect(Site *, Site *);
 
 #endif
 

diff --git a/lib/neatogen/voronoi.c b/lib/neatogen/voronoi.c
index dac489d0b4fe2c08cc91f4f1b83b1480d624a66f..f3b2c83bcc21decc305e9cb49a7c394952019875 100644 (file)
--- a/lib/neatogen/voronoi.c
+++ b/lib/neatogen/voronoi.c
@@ -56,7 +56,7 @@ void voronoi(int triangulate, Site * (*nextsite) (void))
            lbnd = ELleftbnd(&(newsite->coord));
            rbnd = ELright(lbnd);
            bot = rightreg(lbnd);
-           e = bisect(bot, newsite);
+           e = gvbisect(bot, newsite);
            bisector = HEcreate(e, le);
            ELinsert(lbnd, bisector);
            if ((p = hintersect(lbnd, bisector)) != (struct Site *) NULL) {
@@ -94,7 +94,7 @@ void voronoi(int triangulate, Site * (*nextsite) (void))
                top = temp;
                pm = re;
            }
-           e = bisect(bot, top);
+           e = gvbisect(bot, top);
            bisector = HEcreate(e, pm);
            ELinsert(llbnd, bisector);
            endpoint(e, re - pm, v);