Revert "Revert "Merge branch 'Grimler/graphviz-malloc.h-problem'""

This reverts commit 27592b90bfae96b68e8b52639be2bd827116bf92.

diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index bb6147b916c12d4873f9e3bf9aba55b2e25904e6..419940a7c349563c49052900e4014fd39aa6f79c 100644 (file)
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -8,10 +8,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
-       -I$(top_srcdir)/lib/cdt
+       -I$(top_srcdir)/lib/cdt \
+       -Iinclude
 
 pkginclude_HEADERS = cgraph.h
-noinst_HEADERS = agxbuf.h cghdr.h malloc.h
+noinst_HEADERS = agxbuf.h cghdr.h include/malloc.h
 noinst_LTLIBRARIES = libcgraph_C.la
 lib_LTLIBRARIES = libcgraph.la
 pkgconfig_DATA = libcgraph.pc

diff --git a/lib/cgraph/malloc.h b/lib/cgraph/include/malloc.h
similarity index 100%
rename from lib/cgraph/malloc.h
rename to lib/cgraph/include/malloc.h

diff --git a/lib/sfdpgen/PriorityQueue.c b/lib/sfdpgen/PriorityQueue.c
index cc48038261b815010322f49d1808f7cacc9d5b4f..1c4c7072f5b3510ae9f480f68407c2c89cbdda10 100644 (file)
--- a/lib/sfdpgen/PriorityQueue.c
+++ b/lib/sfdpgen/PriorityQueue.c
@@ -11,6 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
+#include <malloc.h>
+
 #include "LinkedList.h"
 #include "PriorityQueue.h"
 #include "memory.h"
@@ -18,12 +20,6 @@
 #include "assert.h"
 #include "arith.h"
 
-#define MALLOC gmalloc
-#define REALLOC grealloc
-#define FREE free
-#define MEMCPY memcpy
-
-
 PriorityQueue PriorityQueue_new(int n, int ngain){
   PriorityQueue q;
   int i;
@@ -50,15 +46,15 @@ void PriorityQueue_delete(PriorityQueue q){
   if (q){
     if (q->buckets){
       for (i = 0; i < q->ngain+1; i++) DoubleLinkedList_delete((q->buckets)[i], free);
-      FREE(q->buckets);
+      free(q->buckets);
     }
 
     if (q->where){
-      FREE(q->where);
+      free(q->where);
     }
 
-    FREE(q->gain);
-    FREE(q);
+    free(q->gain);
+    free(q);
   }
 }