From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 30 Aug 2020 03:44:16 +0000 (-0700)
Subject: disambiguate lib/label #includes
X-Git-Tag: 2.46.0~20^2^2~52^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd2c325c9f98173fe9991f0c799e2aea375949a3;p=graphviz

disambiguate lib/label #includes

Related to #1785.
---

diff --git a/lib/label/index.h b/lib/label/index.h
index 472d2e0ae..ba0a3917d 100644
--- a/lib/label/index.h
+++ b/lib/label/index.h
@@ -47,9 +47,9 @@ extern "C" {
 #define NODECARD 64
 typedef struct RTree RTree_t;
 
-#include <rectangle.h>
-#include <node.h>
-#include <split.q.h>
+#include <label/rectangle.h>
+#include <label/node.h>
+#include <label/split.q.h>
 
 #define CX(i)  (i)
 #define NX(i)  (i+NUMDIMS)
diff --git a/lib/label/node.h b/lib/label/node.h
index e6c76f4dc..fd2774404 100644
--- a/lib/label/node.h
+++ b/lib/label/node.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <index.h>
+#include <label/index.h>
 
 typedef struct Branch {
     Rect_t rect;
diff --git a/lib/label/split.q.h b/lib/label/split.q.h
index 7279bb74c..fd44c1658 100644
--- a/lib/label/split.q.h
+++ b/lib/label/split.q.h
@@ -20,8 +20,8 @@ extern "C" {
 /*-----------------------------------------------------------------------------
 | Definitions and global variables.
 -----------------------------------------------------------------------------*/
-#include <rectangle.h>
-#include <index.h>
+#include <label/rectangle.h>
+#include <label/index.h>
 
 #ifndef METHODS
 #define METHODS 1
diff --git a/lib/label/xlabels.h b/lib/label/xlabels.h
index 63286bdc5..86b433ada 100644
--- a/lib/label/xlabels.h
+++ b/lib/label/xlabels.h
@@ -41,7 +41,7 @@ int placeLabels(object_t * objs, int n_objs,
 		xlabel_t * lbls, int n_lbls, label_params_t * params);
 
 #ifdef XLABEL_INT
-#include <index.h>
+#include <label/index.h>
 #include <logic.h>
 #include <cdt.h>