]> granicus.if.org Git - graphviz/commitdiff
remove the need to have lib/ast in the include path
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 23 Aug 2020 02:15:41 +0000 (19:15 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Mon, 5 Oct 2020 14:30:59 +0000 (07:30 -0700)
Related to #1785.

lib/ast/pathaccess.c
lib/ast/pathexists.c
lib/ast/pathfind.c
lib/ast/pathgetlink.c
lib/ast/pathpath.c
lib/expr/excc.c
lib/expr/exlib.h
lib/expr/expr.h
lib/gvc/gvplugin.c
lib/gvpr/gprstate.h

index f5410eb9dbf98821cde2a7835b59b2b3424e9027..7e9b579006f752cfd0353b22da09450126d5fb83 100644 (file)
@@ -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>
index 58f7e81aac98323cfe19184e2722474bd65a82d0..fb604cfbb57d9b1cd32b48b544baa84d6b3726e1 100644 (file)
@@ -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 {
index 991587b5851cb729dd6dda5641e99c631dff27ac..0c96f879aef53a4907ec41a3697ea83b2ade6961 100644 (file)
@@ -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>
index 360a486e84e3a828a137f1a98dbbac72221d1956..d0eeabf911488aafd520806f9daf44ce78cec23b 100644 (file)
@@ -28,7 +28,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
-#include <compat_unistd.h>
+#include <ast/compat_unistd.h>
 #endif
 
 /*
index f453f716157d76978c8106de8f547d3af1a3ee86..2e83125647090e8cd8497ba0b47c4b1abed22785 100644 (file)
@@ -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;
index 745e76db1721ecb882e386ee8c4de07d317fbcb3..d5f6bdf4947e04d441f9db33c17c3ff885c18289 100644 (file)
@@ -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");
index c84a169fdae674d19bf6e2ab77031d5ed4e84de6..69a4957fedcc24639b9e77fcc4a7a2c5a6d9ce38 100644 (file)
@@ -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])
 
index 78bac31078293c800a32552f480e6af5d3b33ef2..841109cc7c5f4d95662e5900723e54df1e935ba1 100644 (file)
@@ -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!! */
index 5d03f05ac7ddf55ecf0d1d14a8c92e24c47d40cc..576b8d96dc9d9bd91a7219896a4d1257d4979b12 100644 (file)
@@ -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
index 6f6ef06bb5d42e4a9b055eaa777c4708a5e5082c..4ff64d77faa6d8cf3800e21bba771f03d6efda5e 100644 (file)
@@ -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"