From c85507b001b4ff8eb87db7377e7364cf69c7628d Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Wed, 2 Sep 2020 21:05:57 -0700 Subject: [PATCH] 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. --- lib/common/render.h | 2 +- lib/neatogen/fPQ.h | 2 +- lib/sparse/general.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/common/render.h b/lib/common/render.h index 8d9f088fc..f531a7001 100644 --- 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 #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 268b87c04..edec6473d 100644 --- 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 +#include #include /* Priority queue: diff --git a/lib/sparse/general.h b/lib/sparse/general.h index f03be46e6..458d8bab0 100644 --- 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 #endif /* STANDALONE */ #define real double -- 2.40.0