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

disambiguate plugin/glitz #includes

Related to #1785.
---

diff --git a/plugin/glitz/Makefile.am b/plugin/glitz/Makefile.am
index f4068e70a..df5fb8ed5 100644
--- a/plugin/glitz/Makefile.am
+++ b/plugin/glitz/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/glitz/gvdevice_glitz.c b/plugin/glitz/gvdevice_glitz.c
index 701377890..b69423bff 100644
--- a/plugin/glitz/gvdevice_glitz.c
+++ b/plugin/glitz/gvdevice_glitz.c
@@ -35,7 +35,7 @@
 #endif
 #include <errno.h>
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_GLITZ_SURFACE
diff --git a/plugin/glitz/gvplugin_glitz.c b/plugin/glitz/gvplugin_glitz.c
index e6b993700..9b2271a5f 100644
--- a/plugin/glitz/gvplugin_glitz.c
+++ b/plugin/glitz/gvplugin_glitz.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvdevice_types_glitz[];