]> granicus.if.org Git - graphviz/commitdiff
disambiguate plugin/ming #includes
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 29 Aug 2020 18:14:12 +0000 (11:14 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Tue, 22 Sep 2020 14:55:28 +0000 (07:55 -0700)
Related to #1785.

plugin/ming/Makefile.am
plugin/ming/gvplugin_ming.c
plugin/ming/gvrender_ming.c

index c9d3cbdd4ca92847395a64d52ef492cb900c0485..0944a9d30972d4cdc72cd222549d17ec6e7429bf 100644 (file)
@@ -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 \
index 7f5e5b9e62d55bb5cc49fe9b37b1179945120ed5..13261f46a68801e86dae128e0936c41d34346014 100644 (file)
@@ -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[];
index 5d5745273722961a7882faac6aaa6f53463b6000..5fd42a9e0451be2b87849792aeb30f5bc2de643e 100644 (file)
@@ -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