remove DMALLOC bits

various include fixups (eg some missing string.h)

diff --git a/lib/agraph/refstr.c b/lib/agraph/refstr.c
index 263d7db1a6633c2bb5559d66bb33af9877c67c30..8853d3e438c37239614a0c8785de10eafc03ddad 100644 (file)
--- a/lib/agraph/refstr.c
+++ b/lib/agraph/refstr.c
@@ -15,11 +15,8 @@
 **********************************************************/
 
 
-#include <aghdr.h>
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
+#include <string.h>
+#include "aghdr.h"
 
 /*
  * reference counted strings.

diff --git a/lib/agraph/scan.l b/lib/agraph/scan.l
index e9e831acfd4006c8d712d3fce24d3520ad8b8c95..4789242c7d4a0b32637dddc7c3956a9b55acfa0d 100644 (file)
--- a/lib/agraph/scan.l
+++ b/lib/agraph/scan.l
@@ -17,9 +17,11 @@
 
 /* requires flex (i.e. not lex)  */
 %{
-#include <grammar.h>
-#include <aghdr.h>
+#include <string.h>
 #include <ctype.h>
+#include "grammar.h"
+#include "aghdr.h"
+
 #define GRAPH_EOF_TOKEN                '@'             /* lex class must be defined below */
        /* this is a workaround for linux flex */
 static int line_num = 1;