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

disambiguate plugin/ming #includes

Related to #1785.
---

diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index c9d3cbdd4..0944a9d30 100644
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -4,6 +4,7 @@
 pkgfontdir = ${pkgdatadir}/font
 
 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/ming/gvplugin_ming.c b/plugin/ming/gvplugin_ming.c
index 7f5e5b9e6..13261f46a 100644
--- a/plugin/ming/gvplugin_ming.c
+++ b/plugin/ming/gvplugin_ming.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 gvrender_ming_types[];
 extern gvplugin_installed_t gvdevice_ming_types[];
diff --git a/plugin/ming/gvrender_ming.c b/plugin/ming/gvrender_ming.c
index 5d5745273..5fd42a9e0 100644
--- a/plugin/ming/gvrender_ming.c
+++ b/plugin/ming/gvrender_ming.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "gvplugin_render.h"
+#include <gvc/gvplugin_render.h>
 
 /* from config.h - would conflict with ming.h definitions */
 #undef PACKAGE