disambiguate remaining memory.h #includes

Unlike the preceding changes to disambiguate #includes, we cannot do this with
all the lib/common headers at once. Some of them are installed to users, so
making this change everywhere would be an API break that is undesirable at this
time. This specific header is disambiguated to fix #1242.

diff --git a/lib/common/render.h b/lib/common/render.h
index 8d9f088fcf8bbd13dafb710f859c9cfbfc5be727..f531a7001e552e7dc1924f49da08fe198230cc9b 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -41,7 +41,7 @@ extern "C" {
 #include "macros.h"
 #include "const.h"
 #include "globals.h"
-#include "memory.h"
+#include <common/memory.h>
 #include "colorprocs.h"                /* must collow color.h (in types.h) */
 #include "geomprocs.h"         /* must follow geom.h (in types.h) */
 #include "agxbuf.h"

diff --git a/lib/neatogen/fPQ.h b/lib/neatogen/fPQ.h
index 268b87c047f63485541e93fb061694816c9a20f6..edec6473dfe50924bc22fcd2fbfb225fcbea15da 100644 (file)
--- a/lib/neatogen/fPQ.h
+++ b/lib/neatogen/fPQ.h
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <memory.h>
+#include <common/memory.h>
 #include <stdio.h>
 
 /* Priority queue:

diff --git a/lib/sparse/general.h b/lib/sparse/general.h
index f03be46e6ef05c2e175fa9aa99d24456fad768fc..458d8bab00f471ecd5e610ecec97d3759c57531e 100644 (file)
--- a/lib/sparse/general.h
+++ b/lib/sparse/general.h
@@ -28,7 +28,7 @@
 #include "globals.h"
 #include "logic.h"
 #include "arith.h"
-#include "memory.h"
+#include <common/memory.h>
 #endif  /* STANDALONE */
 
 #define real double