From ec4fe25f59fd877b0e244cefa5c9f3909372e5da Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Tue, 25 Aug 2020 18:36:25 -0700 Subject: [PATCH] disambiguate plugin/devil #includes Related to #1785. --- plugin/devil/Makefile.am | 1 + plugin/devil/gvdevice_devil.c | 2 +- plugin/devil/gvplugin_devil.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am index aa8a48ab2..fe960d307 100644 --- a/plugin/devil/Makefile.am +++ b/plugin/devil/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/devil/gvdevice_devil.c b/plugin/devil/gvdevice_devil.c index 26b287cda..bd6de17f0 100644 --- a/plugin/devil/gvdevice_devil.c +++ b/plugin/devil/gvdevice_devil.c @@ -13,7 +13,7 @@ #include "config.h" -#include "gvplugin_device.h" +#include #include #include diff --git a/plugin/devil/gvplugin_devil.c b/plugin/devil/gvplugin_devil.c index b585c2f9f..9a18f638e 100644 --- a/plugin/devil/gvplugin_devil.c +++ b/plugin/devil/gvplugin_devil.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "gvplugin.h" +#include extern gvplugin_installed_t gvdevice_devil_types[]; -- 2.50.1