remove DMALLOC bits

various include fixups (eg some missing string.h)

diff --git a/lib/agraph/edge.c b/lib/agraph/edge.c
index 11574934f700a1c1987294e43f0b45b187ae1ee7..427d2b526b6aa35c06c2108f9f36d44735684c55 100644 (file)
--- a/lib/agraph/edge.c
+++ b/lib/agraph/edge.c
@@ -15,11 +15,7 @@
 **********************************************************/
 
 
-#include <aghdr.h>
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include "aghdr.h"
 
 #define IN_SET FALSE
 #define OUT_SET TRUE

diff --git a/lib/agraph/flatten.c b/lib/agraph/flatten.c
index c8a642aefc5b65738487b7cb9c7ae0b8ea279dc6..209330f11647ea8f25ae4e5747841ef322563b00 100644 (file)
--- a/lib/agraph/flatten.c
+++ b/lib/agraph/flatten.c
@@ -15,11 +15,7 @@
 **********************************************************/
 
 
-#include <aghdr.h>
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include "aghdr.h"
 
 void agflatten_elist(Dict_t * d, Dtlink_t ** lptr)
 {

diff --git a/lib/agraph/grammar.y b/lib/agraph/grammar.y
index 36799d90ac3233086e258c43b2be7c4f3835d56e..1c7fa124bb6150b7ec69f91c4f21332fc33768ec 100644 (file)
--- a/lib/agraph/grammar.y
+++ b/lib/agraph/grammar.y
@@ -17,7 +17,8 @@
 %{
 
 #include <stdio.h>  /* SAFE */
-#include <aghdr.h>     /* SAFE */
+#include <string.h>
+#include "aghdr.h"     /* SAFE */
 
 #ifdef _WIN32
 #define gettxt(a,b)    (b)