From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 23 Aug 2020 02:15:41 +0000 (-0700)
Subject: remove the need to have lib/ast in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c63fc88c8facaa092aa23729205073264867cfb;p=graphviz

remove the need to have lib/ast in the include path

Related to #1785.
---

diff --git a/lib/ast/pathaccess.c b/lib/ast/pathaccess.c
index f5410eb9d..7e9b57900 100644
--- a/lib/ast/pathaccess.c
+++ b/lib/ast/pathaccess.c
@@ -26,7 +26,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/ast/pathexists.c b/lib/ast/pathexists.c
index 58f7e81aa..fb604cfbb 100644
--- a/lib/ast/pathexists.c
+++ b/lib/ast/pathexists.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef _WIN32
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 
 typedef struct Tree_s {
diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c
index 991587b58..0c96f879a 100644
--- a/lib/ast/pathfind.c
+++ b/lib/ast/pathfind.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
diff --git a/lib/ast/pathgetlink.c b/lib/ast/pathgetlink.c
index 360a486e8..d0eeabf91 100644
--- a/lib/ast/pathgetlink.c
+++ b/lib/ast/pathgetlink.c
@@ -28,7 +28,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 
 /*
diff --git a/lib/ast/pathpath.c b/lib/ast/pathpath.c
index f453f7161..2e8312564 100644
--- a/lib/ast/pathpath.c
+++ b/lib/ast/pathpath.c
@@ -30,7 +30,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 
 char **opt_info_argv;
diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index 745e76db1..d5f6bdf49 100644
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -652,7 +652,7 @@ exccopen(Expr_t* expr, Exccdisc_t* disc)
 	if (!(disc->flags & EX_CC_DUMP))
 	{
 		sfprintf(disc->text, "/* : : generated by %s : : */\n", exversion);
-		sfprintf(disc->text, "\n#include <ast.h>\n");
+		sfprintf(disc->text, "\n#include <ast/ast.h>\n");
 		if (*id)
 			sfsprintf(cc->id, strlen(id) + 2, "%s_", id);
 		sfprintf(disc->text, "\n");
diff --git a/lib/expr/exlib.h b/lib/expr/exlib.h
index c84a169fd..69a4957fe 100644
--- a/lib/expr/exlib.h
+++ b/lib/expr/exlib.h
@@ -25,7 +25,7 @@ extern "C" {
 #ifndef _EXLIB_H
 #define _EXLIB_H
 
-#include <ast.h>
+#include <ast/ast.h>
 
 #define sfstrseek(f,p,m) \
     ( \
@@ -129,8 +129,8 @@ typedef struct Print_s			/* compiled printf arg node	*/
 
 #include <expr.h>
 #include <ctype.h>
-#include <error.h>
-#include <sfstr.h>
+#include <ast/error.h>
+#include <ast/sfstr.h>
 
 #define id_string	(&exbuiltin[0])
 
diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index 78bac3107..841109cc7 100644
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -25,7 +25,7 @@ extern "C" {
 #ifndef _EXPR_H
 #define _EXPR_H
 
-#include <ast.h>
+#include <ast/ast.h>
 #include <inttypes.h>
 
 #undef	RS	/* hp.pa <signal.h> grabs this!! */
diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 5d03f05ac..576b8d96d 100644
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -19,7 +19,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 
 #ifdef ENABLE_LTDL
diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index 6f6ef06bb..4ff64d77f 100644
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -20,7 +20,7 @@ extern "C" {
 
 #include "sfio.h"
 #include "cgraph.h"
-#include "ast.h"
+#include <ast/ast.h>
 #include "vmalloc.h"
 #include "expr.h"
 #include "gvpr.h"