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

disambiguate plugin/xlib #includes

Related to #1785.
---

diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index a6b542ea7..63ff0b005 100644
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -4,6 +4,7 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 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/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index ed2b0e855..55219b10d 100644
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -42,7 +42,7 @@
 #include <poll.h>
 #endif
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_XLIB_SURFACE
diff --git a/plugin/xlib/gvplugin_xlib.c b/plugin/xlib/gvplugin_xlib.c
index b855822c5..14282ab7b 100644
--- a/plugin/xlib/gvplugin_xlib.c
+++ b/plugin/xlib/gvplugin_xlib.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_xlib[];