cgraph fixes

diff --git a/lib/circogen/circular.h b/lib/circogen/circular.h
index 14c0a6d3d84ee45cc68647db55583a0a5898cfe6..658ca30dffcbb0a582ca916b74e1b7568164672d 100644 (file)
--- a/lib/circogen/circular.h
+++ b/lib/circogen/circular.h
@@ -17,9 +17,9 @@
 #ifndef CIRCULAR_H
 #define CIRCULAR_H
 
-#include <render.h>
-#include <block.h>
-#include <stack.h>
+#include "render.h"
+#include "block.h"
+#include "stack.h"
 
 typedef struct {
     blocklist_t bl;
@@ -79,13 +79,13 @@ typedef struct {
     int order;
 } edata;
 
-#define NDATA(n) ((ndata*)((n)->u.alg))
+#define NDATA(n) ((ndata*)(ND_alg(n)))
 #define DNODE(n)       (NDATA(n)->dnode)
 
-#define EDGEDATA(e)  ((edata*)((e)->u.alg))
+#define EDGEDATA(e)  ((edata*)(ED_alg(e)))
 #define EDGEORDER(e) (EDGEDATA(e)->order)
 
-#define DATA(n) ((cdata*)((n)->u.alg))
+#define DATA(n) ((cdata*)(ND_alg(n)))
 #define ORIGG(n)       (DATA(n)->orig.g)
 #define ORIGN(n)       (DATA(n)->orig.np)
 #define FLAGS(n) (DATA(n)->flags)