From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 17 Aug 2020 04:17:05 +0000 (-0700)
Subject: disambiguate lib/gvpr/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b6ebc068607fbd43c8a9f3230b1fc331c9f252f;p=graphviz

disambiguate lib/gvpr/*.c #includes

Related to #1785.
---

diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 482e37c18..659422bc7 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -7,6 +7,7 @@ HOSTCC ?= $(CC)
 GVPR_VERSION="2:0:0"
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/expr \
 	-I$(top_builddir)/lib/expr \
 	-I$(top_srcdir)/lib/vmalloc \
diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
index d2b34e219..82ba87578 100644
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
@@ -16,15 +16,15 @@
  *  Code for main functions in gpr
  */
 
-#include <actions.h>
-#include <error.h>
-#include <ast.h>
-#include "compile.h"
-#include "sfstr.h"
+#include <gvpr/actions.h>
+#include <ast/error.h>
+#include <ast/ast.h>
+#include <gvpr/compile.h>
+#include <ast/sfstr.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 #define KINDS(p) ((AGTYPE(p) == AGRAPH) ? "graph" : (AGTYPE(p) == AGNODE) ? "node" : "edge")
 
@@ -816,9 +816,9 @@ char *canon(Expr_t * pgm, char *arg)
 
 #include <stdlib.h>
 
-#include "arith.h"
-#include "color.h"
-#include "colortbl.h"
+#include <common/arith.h>
+#include <common/color.h>
+#include <common/colortbl.h>
 
 static char* colorscheme;
 
diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
index 855bca46c..b77154e2f 100644
--- a/lib/gvpr/compile.c
+++ b/lib/gvpr/compile.c
@@ -22,12 +22,12 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "compile.h"
+#include <gvpr/compile.h>
 #include <assert.h>
-#include "cgraph.h"
-#include <error.h>
-#include <actions.h>
-#include "sfstr.h"
+#include <cgraph/cgraph.h>
+#include <ast/error.h>
+#include <gvpr/actions.h>
+#include <ast/sfstr.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
@@ -36,10 +36,10 @@
 #define MIN(a,b)        ((a)<(b)?(a):(b))
 #define MAX(a,b)        ((a)>(b)?(a):(b))
 
-#include <gdefs.h>
+#include <gvpr/gdefs.h>
 
-#include "ctype.h"
-#include "trie.c"
+#include <ctype.h>
+#include <gvpr/trie.c>
 
 #define BITS_PER_BYTE 8
 #ifdef HAVE_INTPTR_T
diff --git a/lib/gvpr/gprstate.c b/lib/gvpr/gprstate.c
index d380c3758..00730a6f5 100644
--- a/lib/gvpr/gprstate.c
+++ b/lib/gvpr/gprstate.c
@@ -22,9 +22,9 @@
 #include "shlwapi.h"
 #endif
 
-#include <gprstate.h>
-#include <error.h>
-#include <sfstr.h>
+#include <gvpr/gprstate.h>
+#include <ast/error.h>
+#include <ast/sfstr.h>
 
 static int name_used;
 
diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
index 791bcc539..a3be0b0d9 100644
--- a/lib/gvpr/gvpr.c
+++ b/lib/gvpr/gvpr.c
@@ -23,19 +23,19 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include "compat_unistd.h"
+#include <ast/compat_unistd.h>
 #endif
 #include "builddate.h"
-#include "gprstate.h"
-#include "cgraph.h"
-#include "globals.h"
-#include "ingraphs.h"
-#include "compile.h"
-#include "queue.h"
-#include "gvpr.h"
-#include "actions.h"
-#include "sfstr.h"
-#include <error.h>
+#include <gvpr/gprstate.h>
+#include <cgraph/cgraph.h>
+#include <common/globals.h>
+#include <ingraphs/ingraphs.h>
+#include <gvpr/compile.h>
+#include <gvpr/queue.h>
+#include <gvpr/gvpr.h>
+#include <gvpr/actions.h>
+#include <ast/sfstr.h>
+#include <ast/error.h>
 #include <string.h>
 #include <ctype.h>
 #include <setjmp.h>
diff --git a/lib/gvpr/gvprlib.vcxproj b/lib/gvpr/gvprlib.vcxproj
index 1ba9a78a7..3880dcdfd 100644
--- a/lib/gvpr/gvprlib.vcxproj
+++ b/lib/gvpr/gvprlib.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_GVPR;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -74,7 +74,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_GVPR;_LIB;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/gvpr/parse.c b/lib/gvpr/parse.c
index 8b7cdf4e3..fce550606 100644
--- a/lib/gvpr/parse.c
+++ b/lib/gvpr/parse.c
@@ -17,10 +17,10 @@
  *
  */
 
-#include <ast.h>
-#include <sfstr.h>
-#include <error.h>
-#include <parse.h>
+#include <ast/ast.h>
+#include <ast/sfstr.h>
+#include <ast/error.h>
+#include <gvpr/parse.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/lib/gvpr/queue.c b/lib/gvpr/queue.c
index 33db3875d..9374ef326 100644
--- a/lib/gvpr/queue.c
+++ b/lib/gvpr/queue.c
@@ -17,8 +17,8 @@
  *
  */
 
-#include <queue.h>
-#include <ast.h>
+#include <gvpr/queue.h>
+#include <ast/ast.h>
 
 typedef struct {
     Dtlink_t link;
diff --git a/lib/gvpr/trie.c b/lib/gvpr/trie.c
index aff27b248..b4f8ecdac 100644
--- a/lib/gvpr/trie.c
+++ b/lib/gvpr/trie.c
@@ -1,6 +1,6 @@
 #define UNDERLINE
 
-#include "trieFA.h"
+#include <gvpr/trieFA.h>
 
 TrieState           TrieStateTbl[70] = {
     { -1, 0, 0x3b8620 },
diff --git a/windows/include/gdefs.h b/windows/include/gvpr/gdefs.h
similarity index 100%
rename from windows/include/gdefs.h
rename to windows/include/gvpr/gdefs.h