From d80f685dbacc2cfa3e496415739b4d6cfad32233 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 13:13:22 -0700
Subject: [PATCH] disambiguate plugin/quartz #includes

Related to #1785.
---
 plugin/quartz/GVTextLayout.m        | 4 ++--
 plugin/quartz/Makefile.am           | 1 +
 plugin/quartz/gvdevice_quartz.c     | 2 +-
 plugin/quartz/gvloadimage_quartz.c  | 2 +-
 plugin/quartz/gvplugin_quartz.c     | 8 ++++----
 plugin/quartz/gvrender_quartz.c     | 6 +++---
 plugin/quartz/gvtextlayout_quartz.c | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugin/quartz/GVTextLayout.m b/plugin/quartz/GVTextLayout.m
index 2d11611aa..10cf87dad 100644
--- a/plugin/quartz/GVTextLayout.m
+++ b/plugin/quartz/GVTextLayout.m
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "types.h"
-#include "gvcjob.h"
+#include <common/types.h>
+#include <gvc/gvcjob.h>
 
 #include "gvplugin_quartz.h"
 
diff --git a/plugin/quartz/Makefile.am b/plugin/quartz/Makefile.am
index 7578da5da..3c717bbe7 100644
--- a/plugin/quartz/Makefile.am
+++ b/plugin/quartz/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/quartz/gvdevice_quartz.c b/plugin/quartz/gvdevice_quartz.c
index b338d20bf..72c2a8216 100644
--- a/plugin/quartz/gvdevice_quartz.c
+++ b/plugin/quartz/gvdevice_quartz.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include "gvplugin_quartz.h"
 
diff --git a/plugin/quartz/gvloadimage_quartz.c b/plugin/quartz/gvloadimage_quartz.c
index 382d9b0a1..777432e95 100644
--- a/plugin/quartz/gvloadimage_quartz.c
+++ b/plugin/quartz/gvloadimage_quartz.c
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "gvplugin_loadimage.h"
+#include <gvc/gvplugin_loadimage.h>
 
 #include "gvplugin_quartz.h"
 
diff --git a/plugin/quartz/gvplugin_quartz.c b/plugin/quartz/gvplugin_quartz.c
index b5728eaff..24977b916 100644
--- a/plugin/quartz/gvplugin_quartz.c
+++ b/plugin/quartz/gvplugin_quartz.c
@@ -13,10 +13,10 @@
 
 #include "config.h"
 
-#include "types.h"
-#include "gvplugin.h"
-#include "gvplugin_quartz.h"
-#include "gvio.h"
+#include <common/types.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvplugin_quartz.h>
+#include <gvc/gvio.h>
 
 extern gvplugin_installed_t gvrender_quartz_types;
 extern gvplugin_installed_t gvtextlayout_quartz_types;
diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c
index fb3c66e29..a34709b3d 100644
--- a/plugin/quartz/gvrender_quartz.c
+++ b/plugin/quartz/gvrender_quartz.c
@@ -25,9 +25,9 @@
 #include <ImageIO/ImageIO.h>
 #endif
 
-#include "gvplugin_device.h"
-#include "gvplugin_render.h"
-#include "cgraph.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvplugin_render.h>
+#include <cgraph/cgraph.h>
 
 #include "gvplugin_quartz.h"
 
diff --git a/plugin/quartz/gvtextlayout_quartz.c b/plugin/quartz/gvtextlayout_quartz.c
index ae64a6ec9..2d9e17d24 100644
--- a/plugin/quartz/gvtextlayout_quartz.c
+++ b/plugin/quartz/gvtextlayout_quartz.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_textlayout.h"
-#include "gvplugin_quartz.h"
+#include <gvc/gvplugin_textlayout.h>
+#include <gvc/gvplugin_quartz.h>
 
 #if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 30200
 #include <CoreText/CoreText.h>
-- 
2.40.0