From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 22:24:13 +0000 (-0700)
Subject: disambiguate plugin/visio #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c1f1ea544ce1c796fffaac4c769fa3d4c3ede0e;p=graphviz

disambiguate plugin/visio #includes

Related to #1785.
---

diff --git a/plugin/visio/Makefile.am b/plugin/visio/Makefile.am
index 3cdffe9c6..f1022070a 100644
--- a/plugin/visio/Makefile.am
+++ b/plugin/visio/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/gvc \
diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
index 6e7c045ca..8e6d9e0c9 100644
--- a/plugin/visio/VisioGraphic.cpp
+++ b/plugin/visio/VisioGraphic.cpp
@@ -32,8 +32,8 @@
 #include <cstdlib>
 #include "VisioGraphic.h"
 
-#include "gvcjob.h"
-#include "gvio.h"
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 
 namespace Visio
 {
diff --git a/plugin/visio/VisioGraphic.h b/plugin/visio/VisioGraphic.h
index e99a2382b..18ff935da 100644
--- a/plugin/visio/VisioGraphic.h
+++ b/plugin/visio/VisioGraphic.h
@@ -14,7 +14,7 @@
 #ifndef VISIOGRAPHIC_H
 #define VISIOGRAPHIC_H
 
-#include "types.h"
+#include <common/types.h>
 
 namespace Visio
 {
diff --git a/plugin/visio/VisioRender.cpp b/plugin/visio/VisioRender.cpp
index 481e82e5e..2b6964640 100644
--- a/plugin/visio/VisioRender.cpp
+++ b/plugin/visio/VisioRender.cpp
@@ -29,10 +29,10 @@
 
 #include "VisioRender.h"
 
-#include "const.h"
-#include "macros.h"
-#include "gvcjob.h"
-#include "gvio.h"
+#include <common/const.h>
+#include <common/macros.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 
 namespace Visio
 {
diff --git a/plugin/visio/VisioRender.h b/plugin/visio/VisioRender.h
index c993d4bed..de86647d5 100644
--- a/plugin/visio/VisioRender.h
+++ b/plugin/visio/VisioRender.h
@@ -17,7 +17,7 @@
 #include <map>
 #include <vector>
 
-#include "types.h"
+#include <common/types.h>
 
 #include "VisioGraphic.h"
 #include "VisioText.h"
diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp
index 3c6441a04..46fbfeb47 100644
--- a/plugin/visio/VisioText.cpp
+++ b/plugin/visio/VisioText.cpp
@@ -15,8 +15,8 @@
 
 #include "VisioText.h"
 
-#include "gvcjob.h"
-#include "gvio.h"
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 #include <cstdlib>
 #include <string.h>
 
diff --git a/plugin/visio/VisioText.h b/plugin/visio/VisioText.h
index f1f410a56..484ab7a22 100644
--- a/plugin/visio/VisioText.h
+++ b/plugin/visio/VisioText.h
@@ -14,7 +14,7 @@
 #ifndef VISIOTEXT_H
 #define VISIOTEXT_H
 
-#include "types.h"
+#include <common/types.h>
 
 namespace Visio
 {
diff --git a/plugin/visio/gvplugin_visio.c b/plugin/visio/gvplugin_visio.c
index da2421e60..631c2b742 100644
--- a/plugin/visio/gvplugin_visio.c
+++ b/plugin/visio/gvplugin_visio.c
@@ -17,7 +17,7 @@
 #endif
 
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvdevice_vdx_types[];
 extern gvplugin_installed_t gvrender_vdx_types[];
diff --git a/plugin/visio/gvrender_visio_vdx.cpp b/plugin/visio/gvrender_visio_vdx.cpp
index e8c1abb9b..0b7b57268 100644
--- a/plugin/visio/gvrender_visio_vdx.cpp
+++ b/plugin/visio/gvrender_visio_vdx.cpp
@@ -17,8 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
 
 #include "VisioRender.h"