From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 30 Aug 2020 23:00:01 +0000 (-0700)
Subject: remove the need for lib/sfio to be in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11a0d72b466d7f6a2b3e46816d67d0fd1cb257b6;p=graphviz

remove the need for lib/sfio to be in the include path
---

diff --git a/lib/ast/ast.h b/lib/ast/ast.h
index 2d19838d7..dc5eeda4d 100644
--- a/lib/ast/ast.h
+++ b/lib/ast/ast.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef AST_H
 #define AST_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #ifdef sun
diff --git a/lib/ast/sfstr.h b/lib/ast/sfstr.h
index 33b37bf4e..daa893a06 100644
--- a/lib/ast/sfstr.h
+++ b/lib/ast/sfstr.h
@@ -22,7 +22,7 @@ extern "C" {
 #ifndef _SFSTR_H
 #define _SFSTR_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 
 #define sfstropen()	sfnew((Sfio_t*)0,(char*)0,-1,-1,SF_WRITE|SF_STRING)
 #define sfstrclose(f)	sfclose(f)
diff --git a/lib/gvpr/compile.h b/lib/gvpr/compile.h
index bae862abe..8107cf477 100644
--- a/lib/gvpr/compile.h
+++ b/lib/gvpr/compile.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef COMPILE_H
 #define COMPILE_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 #include <parse.h>
 #include <gprstate.h>
 #include <expr/expr.h>
diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index b7c20ec41..3790950a2 100644
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef GPRSTATE_H
 #define GPRSTATE_H
 
-#include "sfio.h"
+#include <sfio/sfio.h>
 #include "cgraph.h"
 #include <ast/ast.h>
 #include "vmalloc.h"
diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 853c80e89..cf2169e9a 100644
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -27,10 +27,10 @@ extern "C" {
 **	Written by Kiem-Phong Vo
 */
 
-#include	"sfio_t.h"
+#include	<sfio/sfio_t.h>
 #include	"config.h"
 
-#include	"vthread.h"
+#include	<sfio/vthread.h>
 
 #if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE)
 #define _NO_LARGEFILE64_SOURCE  1
diff --git a/lib/sfio/sfio_t.h b/lib/sfio/sfio_t.h
index 8643d4072..dd9f630fb 100644
--- a/lib/sfio/sfio_t.h
+++ b/lib/sfio/sfio_t.h
@@ -43,7 +43,7 @@ extern "C" {
 	Sfoff_t			lpos;	/* last seek position		*/ \
 	size_t			iosz;	/* prefer size for I/O          */
 
-#include	"sfio.h"
+#include	<sfio/sfio.h>
 
 /* mode bit to indicate that the structure hasn't been initialized */
 #define SF_INIT		0000004u