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

disambiguate plugin/webp #includes

Related to #1785.
---

diff --git a/plugin/webp/Makefile.am b/plugin/webp/Makefile.am
index 63e6e2fff..92004a23f 100644
--- a/plugin/webp/Makefile.am
+++ b/plugin/webp/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/webp/gvdevice_webp.c b/plugin/webp/gvdevice_webp.c
index 1b9033489..ac7728141 100644
--- a/plugin/webp/gvdevice_webp.c
+++ b/plugin/webp/gvdevice_webp.c
@@ -13,8 +13,8 @@
 
 #include "config.h"
 
-#include "gvplugin_device.h"
-#include "gvio.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvio.h>
 
 #ifdef HAVE_WEBP
 #include "webp/encode.h"
diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c
index 5c8282905..be32fd7b4 100644
--- a/plugin/webp/gvloadimage_webp.c
+++ b/plugin/webp/gvloadimage_webp.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_loadimage.h"
-#include "gvio.h"
+#include <gvc/gvplugin_loadimage.h>
+#include <gvc/gvio.h>
 
 #ifdef HAVE_WEBP
 #ifdef HAVE_PANGOCAIRO
diff --git a/plugin/webp/gvplugin_webp.c b/plugin/webp/gvplugin_webp.c
index 0aad26cb9..b0b1cad35 100644
--- a/plugin/webp/gvplugin_webp.c
+++ b/plugin/webp/gvplugin_webp.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_webp_types[];
 extern gvplugin_installed_t gvloadimage_webp_types[];