]> granicus.if.org Git - graphviz/commitdiff
make sfio #includes unambiguous
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 1 Aug 2020 00:51:24 +0000 (17:51 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Thu, 6 Aug 2020 13:48:59 +0000 (06:48 -0700)
This change makes the #includes of lib/sfio headers unambiguous within the
lib/sfio C sources. The upcoming plan is to also make the header #includes and
any of lib/sfio's dependents also unambiguous this way. Related to #1785.

86 files changed:
lib/sfio/Makefile.am
lib/sfio/Sfio_dc/Makefile.am
lib/sfio/Sfio_dc/sfdcdos.c
lib/sfio/Sfio_dc/sfdcfilter.c
lib/sfio/Sfio_dc/sfdclzw.c
lib/sfio/Sfio_dc/sfdcseekable.c
lib/sfio/Sfio_dc/sfdcslow.c
lib/sfio/Sfio_dc/sfdcsubstream.c
lib/sfio/Sfio_dc/sfdctee.c
lib/sfio/Sfio_dc/sfdcunion.c
lib/sfio/Sfio_f/Makefile.am
lib/sfio/Sfio_f/_sfclrerr.c
lib/sfio/Sfio_f/_sfdlen.c
lib/sfio/Sfio_f/_sfeof.c
lib/sfio/Sfio_f/_sferror.c
lib/sfio/Sfio_f/_sffileno.c
lib/sfio/Sfio_f/_sfgetc.c
lib/sfio/Sfio_f/_sfllen.c
lib/sfio/Sfio_f/_sfputc.c
lib/sfio/Sfio_f/_sfputd.c
lib/sfio/Sfio_f/_sfputl.c
lib/sfio/Sfio_f/_sfputm.c
lib/sfio/Sfio_f/_sfputu.c
lib/sfio/Sfio_f/_sfslen.c
lib/sfio/Sfio_f/_sfstacked.c
lib/sfio/Sfio_f/_sfulen.c
lib/sfio/Sfio_f/_sfvalue.c
lib/sfio/sfclose.c
lib/sfio/sfclrlock.c
lib/sfio/sfcvt.c
lib/sfio/sfdisc.c
lib/sfio/sfdlen.c
lib/sfio/sfexcept.c
lib/sfio/sfexit.c
lib/sfio/sfextern.c
lib/sfio/sffilbuf.c
lib/sfio/sfflsbuf.c
lib/sfio/sfgetd.c
lib/sfio/sfgetl.c
lib/sfio/sfgetm.c
lib/sfio/sfgetr.c
lib/sfio/sfgetu.c
lib/sfio/sfio.vcxproj
lib/sfio/sfllen.c
lib/sfio/sfmode.c
lib/sfio/sfmutex.c
lib/sfio/sfnew.c
lib/sfio/sfnotify.c
lib/sfio/sfnputc.c
lib/sfio/sfopen.c
lib/sfio/sfpkrd.c
lib/sfio/sfpoll.c
lib/sfio/sfpool.c
lib/sfio/sfpopen.c
lib/sfio/sfprintf.c
lib/sfio/sfprints.c
lib/sfio/sfpurge.c
lib/sfio/sfputd.c
lib/sfio/sfputl.c
lib/sfio/sfputm.c
lib/sfio/sfputr.c
lib/sfio/sfputu.c
lib/sfio/sfraise.c
lib/sfio/sfrd.c
lib/sfio/sfread.c
lib/sfio/sfreserve.c
lib/sfio/sfresize.c
lib/sfio/sfscanf.c
lib/sfio/sfseek.c
lib/sfio/sfset.c
lib/sfio/sfsetbuf.c
lib/sfio/sfsetfd.c
lib/sfio/sfsize.c
lib/sfio/sfsk.c
lib/sfio/sfstack.c
lib/sfio/sfstrtod.c
lib/sfio/sfswap.c
lib/sfio/sfsync.c
lib/sfio/sftable.c
lib/sfio/sftell.c
lib/sfio/sftmp.c
lib/sfio/sfungetc.c
lib/sfio/sfvprintf.c
lib/sfio/sfvscanf.c
lib/sfio/sfwr.c
lib/sfio/sfwrite.c

index 1a131e6726b04e98ae63c315d5bef2721bd45c9a..5d488e0129dcd37dec8bc056fa38946582405afc 100644 (file)
@@ -3,6 +3,8 @@
 
 SUBDIRS = Sfio_f
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 noinst_HEADERS = sfhdr.h sfio.h sfio_t.h vthread.h
 noinst_LTLIBRARIES = libsfio_C.la
 
index 5a8e559549fda70791efee8b8cc791716be45013..cda3060df4c9633947889dc4db33a6ddb65e853f 100644 (file)
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib/sfio
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 noinst_HEADERS = sfdchdr.h sfdisc.h
 noinst_LTLIBRARIES = libsfiodc_C.la
index 7909b92bbaa83403625711a3a55f4cef70f3905e..6e54b4ac526e5d7993c2a4ec544dac437b213557 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 /*     Discipline to turn \r\n into \n.
 **     This is useful to deal with DOS text files.
index 84b327f23be99cd9a979345ac18ac00700ca0f12..36e5c93fd90df98055fb88a68bb770221f838207 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 /*     Discipline to invoke UNIX processes as data filters.
 **     These processes must be able to fit in pipelines.
index 62dbf8fd41e8fe3be0655fd31f5393813794a2e2..ee4e0e4eb09d28c62e5828281c82d7325f411d15 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 
 /*
index 753979b16c785e2860d7d802b002cb597360d78f..545d4a1276bfbf734b1ab64a3643bf395eef36a8 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 /*     Discipline to make an unseekable read stream seekable
 **
index 48e461afca096ba8980404a6a219a06ca7049e92..a8774458cc32869f5fe4b0591a0574b0988f7bd7 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "sfdchdr.h"
+#include <sfio/sfdchdr.h>
 
 /*     Make a stream op return immediately on interrupts.
 **     This is useful on slow streams (hence the name).
index b1fe7ff5e143cc4d6420032be757d3af2adee45e..8f118c6d2e5597882a5a8a1e27d6973b095c218d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 
 /*     Discipline to treat a contiguous segment of a stream as a stream
index 8cc611d947bc79de0805137fe84a71e5d7b236c4..221d77472469ad1b473129e08342e2f7bde549b0 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 /*     A discipline to tee the output to a stream to another stream.
 **     This is similar to what the "tee" program does. As implemented
index b20810eddbfe0719f4b3d0b0943cda734d1af651..24364ac352c8a7600f0f65f95b5aa5537a9f9e99 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfdchdr.h"
+#include       <sfio/sfdchdr.h>
 
 
 /*     Make a sequence of streams act like a single stream.
index 08b530345277eb75464e0dce28dffb691226142d..483a09d8d7920ab7a9e8130918c5cb8b5d9318c3 100644 (file)
@@ -1,7 +1,7 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib/sfio
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = libsfiof_C.la
 
index 25ce5e01277d29d7bae1ba9401cb6a8b3fbe142d..6fb283fa7864de0db1adb6364a0f9f8d5e9c820d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfclrerr
 
index ab71d583caca040823b0c59bbd7863cdb2e243a9..2a185ecfa5c8b2255d3601e448391524df607ee6 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfdlen
 
index 42d976f988d882d2c1e4096b3a138b9efbd746aa..765fa3b9784a54575bc63fabd8f62410cb9cae8d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfeof
 
index 499a68748e5a8a5a2df1c75f43aae29b2aff2624..d113a38b934ee58af452177d6548b7df3a4453b7 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sferror
 
index 4e874954f23bbb3f35327c22f10d8c47e6844f22..177becf31d8c37f8b824078d12a39fef99f5587a 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sffileno
 
index 229c78d084e551c84dcbb0f113ee8a45302f1f9f..a84edfaa71f6d009fcab99109a2fbeb8d5979400 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfgetc
 
index 954b703e4ce25ea02e55162f26d56466b6f448c8..a334e2e18e07e5046d65e736f29540ac65782edc 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfllen
 
index 53e5d836046bc29b3a2d1b538be112ce23b66dd6..ce79fe711e43d6c5d30f86bee1b10adf9dd3c624 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfputc
 
index 1017c43d0aa1e8f96e866a4e2d559ecb3c60cdec..ffa2fb9943d9f32fefafa6db3fc4775535ec2107 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfputd
 
index 7bd08d2b9ce9f8c70ce4244f511233f6782eb9ec..57ab161ca68a8e7238ecf060800dc9813b1348a5 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfputl
 
index 2107b390970c7694d5b12bd4366a15d2760c2015..a1baeff296a570a53f521850bb0ab7f21bf60b11 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfputm
 
index ce65aeeab466dc576c961352831425d802023eb0..07cd09a188975c16dd2551485fb63b3aee5e1990 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfputu
 
index b076d52c01320ef406cdb9a012033c2f4d478372..ab40047991784d6781b3d398c48bbe90d1518379 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfslen
 
index 440a33371444615a999190855eaa067656947294..ed42a4b5fe8cc6cfcb5e8b6fb520cbcdac365d31 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfstacked
 
index 1c0afdc69ceaa360f064781ad057c2710d722f47..fa408522ba21eb6438164f6db127dc3482df228f 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfulen
 
index e172ed9f632a47c1b058588d025fcec2fa10320e..f6eed0e5e4a9f0f8cc4b6310e6fe2b3e84a17d6a 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #undef sfvalue
 
index f6e3bad751861a26183351b3f9cf01566f0e86e3..dd41b6067f80e004babd7f5362c167b8680f0e31 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Close a stream. A file stream is synced before closing.
 **
index 047db9e34adbf4ec99509f6aa276312b1173916e..ca98fe9f94ad9a40e4a4eb12994f0e1c815bf489 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Function to clear a locked stream.
 **     This is useful for programs that longjmp from the mid of an sfio function.
index a446171a781e0c9e07ddeced286d1ead961c9e82..f50198abf0101b946fc336736fbb09fd619ea98d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Convert a floating point value to ASCII
 **
index e1492e66fdbb7c2ea56cc0f7d5d05abca5017cff..afb6be7766455fcfa2283dfd6cc8832e1fa2d536 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Set a new discipline for a stream.
 **
index 3b2c750660cd1bacdadfb346e4cca7139c55adae..0bb958d62da537bd15bdafdab915c27efc506766 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #include <math.h>
 
index bd8e0d1c03f8e9849c2afbac0adfeb5507cb91a9..57d0206c4f0cfeaaacad8224669c550bdf4fa179 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Function to handle io exceptions.
 **     Written by Kiem-Phong Vo
index eb320ce7c31a22403d41982a1b75f7f158447633..48e75f5765a22ecda2180f890c08df1ebec82b6a 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*
 **     Any required functions for process exiting.
index 215c96f9d448fc9bcc8ce95889da4a780c8de8c3..a698801d4ead64fa2eb0c9fca8141982ed955c61 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     External variables and functions used only by Sfio
 **     Written by Kiem-Phong Vo
index e44c668f2f15ee5fbcaa560055fa5b67e52601b1..437c392b294b6ed4a1002f95c1f0e3fa0abd3dea 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Fill the buffer of a stream with data.
 **     If n < 0, sffilbuf() attempts to fill the buffer if it's empty.
index e54ce8e7906faf2c851ec8dcc2db38c62b74b4e0..8079adcbaa5476770566ec8e57bc515d4c591d90 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write a buffer out to a file descriptor or
 **     extending a buffer for a SF_STRING stream.
index 607681e600fbbe1d28caf8baf301f44ba8442617..ca2784519a6e8c696fb458014d99037b36ece85e 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #include <math.h>
 
index a85cd9a21326eecd2623799285b4923a17dd9946..40aa75c27752fe9a1fd927177c60e926de8f6f50 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read a long value coded in a portable format.
 **
index cd3e5ed0e464a7039258528e9f09612d0d0df30f..17a478b74b26b9a749cd1607bb2d0524643558f7 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read an unsigned long value coded portably for a given range.
 **
index 7b3ff11a3823179900ec5e904f7e9076a9784d99..197245ae25029784b2901f34eb5f6b3a451649bb 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read a record delineated by a character.
 **     The record length can be accessed via sfvalue(f).
index 8d3f897116c2357cdf5c300cd7ed7f99fe8ba546..8734586e69f9ed103e9dc51a78c4ad6b7e9a42d5 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read an unsigned long value coded in a portable format.
 **
index d9c3eb7ab7145d841a95c11b0eae508d2856d338..b73eb03014987b317dcbef1e52b1bcca0ba9504f 100644 (file)
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
index 2807af63709a91a1cb121c2c98cd919ac56beb08..4ed85268b34e8d692e463d8f681852d08044b83c 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Get size of a long value coded in a portable format
 **
index 5f8807fd70a886ae553c1ec4d5e541842f83c176..1339b7f3076381a25f68b4297d4bc3424de89485 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 static char *Version = "\n@(#)sfio (AT&T Labs - kpv) 2001-02-01\0\n";
 
 /*     Functions to set a given stream to some desired mode
index d8de8f9f70d7b6eb71b7d5e2a184d24e339c2c81..3926cd5c42a6495e9843a942deabdd00e217cee9 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Obtain/release exclusive use of a stream.
 **
index 86a061f016e148ffde0a89ba178dc757dc5ed503..f73c93b0598fbfae9c9c373e71b349c0a263f474 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Fundamental function to create a new stream.
 **     The argument flags defines the type of stream and the scheme
index 38229348ed39e83726bb99df74c3240fff5d3bc6..2f9f865ca03405835ce8d9cec9f6871ed035bd56 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 
 /*     Set the function to be called when a stream is opened or closed
index 9e824705515721ecdc4ab88c97363664dcb76495..73fd3d929c547a91a64a109a959893e00ab3bc4d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 #include <string.h>
 
 /*     Write out a character n times
index aa791d4008f15dc757c6772de68ad3afc4d4e4c7..ee22c7aa7549d400e1b19762efaca08894053da9 100644 (file)
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 #ifdef _WIN32
-#include       "io.h"
+#include       <io.h>
 #endif
 
 /*     Open a file/string for IO.
index fc29745f82cd57f2136e797782fc817c1a68b24e..ad529ccce07fa91832f1485e07541c66baf45154 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 #ifndef FIONREAD
 #ifdef HAVE_SYS_IOCTL_H
 #include       <sys/ioctl.h>
index e2ae19031f3dbf71c1871e4b88fca82303e811cd..0077e40e552c10725ca8b13fc7e7344f6806f6db 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Poll a set of streams to see if any is available for I/O.
 **     Ready streams are moved to front of array but retain the
index dffb2d67ff8c70352b594dcd69776bd501f05540..23f37e446517358dfdfa87a151375f9b6e7606a8 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Management of pools of streams.
 **     If pf is not nil, f is pooled with pf and f becomes current;
index ec616dd4d41e49edf454ef6483a2cfccd01b771a..bbe11f848b00f5fbb3c4405ed08877ad80dfeb25 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Create a coprocess.
 **     Written by Kiem-Phong Vo.
index 62521eeeb1c8d524b61e324c338e99f3f1f07de5..338154e44e3da529bc66e681a788e544c2c89720 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Print data with a given format
 **
index 1d933dfddf80703b42d9dd7885f9cd54bcee984b..c3cf25e8de4f73df0f382d373e60ac0bbbb3ffe1 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Construct a string with the given format and data.
 **     This function allocates space as necessary to store the string.
index 6a86cd7a3d5269a5b1496800f809cc14d9c380b6..c49b91be7383b5f161d27f07971145b0a4b370dc 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Delete all pending data in the buffer
 **
index a2dbd225c7de9f73fb5982d03695b778191440f6..169602121f4941c5f7736958a35e346689ac93c8 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #include <float.h>
 #include <math.h>
index 14a86906e2fa3c4c0e1e80e0e44715f3135637e1..5621f371c5c5ee069a593c248108c921a0d6182c 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write out a long value in a portable format
 **
index 517fcb331fa8124b3838c1a5e00bd1c8fd394c54..4860c2cd48b16dc82c3e49a3f8708023ef8bebbf 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write out an unsigned long value in a portable format.
 **
index 43dd16844c83f418a0e66654a95831b309af7e55..7dca11496b3ef81d799c025d1ad603528d733ada 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Put out a null-terminated string
 **
index 2324d54562477e7cde58c66a7fa8187c3de23ece..bab39bcfd032b34c90d02f7c850782e423888947 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write out an unsigned long value in a portable format.
 **
index 9abecaa29fc0f52222cc98b8b763b12e092d11b6..b50e23965fec9b6549accd7862054ca23cc9cf76 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Invoke event handlers for a stream
 **
index f05db30f0d310b5d6e2efd016b2704e5dbd9964a..5f567e9018c6a6cea95f342f60444b45d8fc3aa7 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Internal function to do a hard read.
 **     This knows about discipline and memory mapping, peek read.
index eb8d1c2df1a669caafd02a4579f178037a1f6f55..4b4049ba5343f7836bbf913d8d31728c090095c3 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read n bytes from a stream into a buffer
 **
index 7afadb72185394ad75a54d749cf3bacae47de3c6..a7a27a4a684d7faa7c99550a82587ee0653d8311 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Reserve a segment of data or buffer.
 **
index cc1218ec56bdefa688a39955de7c858e32404848..a678b747b6f0a89529e5513d6b53f1974168ee71 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Resize a stream.
        Written by Kiem-Phong Vo.
index f4bfc41cb7093a86a7c1ea2fed7d3985efd2b64e..4d97efc4093ebe6e71232592eaf63f7f6fd5907d 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Read formatted data from a stream
 **
index ef74a38fada0d09a6bb626f8c1a8a3759a8ce35a..6cbbef96cbb561be835d5d9ee3b5fe020ff30e92 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Set the IO pointer to a specific location in the stream
 **
index 0d75481ef9a865a4dedd9c1953eddb78b139a164..91e75efc3ac1f216c79636195b9b85279fc3b324 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Set some control flags or file descript for the stream
 **
index fe9565afcf997e79ae10e65b1f9a6f2700b42c3a..602792a6cec4817fb7586df8f70fd525f05768cc 100644 (file)
@@ -17,7 +17,7 @@ __STDPP__directive pragma pp:hide getpagesize
 #define getpagesize    ______getpagesize
 #endif
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 #if defined(__STDPP__directive) && defined(__STDPP__hide)
 __STDPP__directive pragma pp:nohide getpagesize
index 32bf88ca89e6e28ca3d881969ef17199d6e6b7f9..b95c43d8c73ed7e7beb21025d70d21b5fd5c86bf 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Change the file descriptor
 **
index 4a5f16e9e9d65bd07efc7d375ce6974e9d65b64b..c37ac62473424d4c1ab77db682071b6b9132ecc3 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Get the size of a stream.
 **
index ab6dee7e3d9f3c023dd30519e179c8f9645425fa..f85ba4a69757412a17f4b32cb85e7d3218af16f0 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Seek function that knows discipline
 **
index b3cbbe9dee89da17ccb547445567a5a7120f45fe..6967328b56e7825c846ae58dc2a59299cced92b4 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 
 /*     Push/pop streams
index 115210aeccd81227577dbe37074d27e7fe46d7e4..081cfe4efdba8310ee03114ae731952c70951ade 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Convert a Sfdouble_t value represented in an ASCII format into
 **     the internal Sfdouble_t representation.
index cdc3912c7dcebb6a48573f28b8c59f060d15c3dc..21d4005461b807a29bd282655e177cce6bbcdc9c 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Swap two streams. If the second argument is NULL,
 **     a new stream will be created. Always return the second argument
index 608e45dca45605b1d610cf58f79d1790fc7cc071..273999df4170493dbcad9b6f19a48466656f302a 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Synchronize data in buffers with the file system.
 **     If f is nil, all streams are sync-ed
index d7d510b72eae9e42a1dacd2c71daabf6d138c471..5ef8d892d676d8f5b48cff97a2de581d38ff007c 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Dealing with $ argument addressing stuffs.
 **
index 913c6fda6729b490d33e046e26bc2ea93eaa49ea..7b04249c6b379fe44eb51bd87b930f92628d2cbf 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Tell the current location in a given stream
 **
index 52a63757dbbb8d0c0870f9f5971ec1e303ac5f2d..f4728e855f7753a9673fb50b1f60e620f8c05d16 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Create a temporary stream for read/write.
 **     The stream is originally created as a memory-resident stream.
index d9683950896863b9dfdb0b0221a0368615a7cd4f..62cc29350ffd26f5a357141a8a5f684d077aa83c 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Push back one byte to a given SF_READ stream
 **
index cbfd23a77c3c4379984a585f1bfb96c17ce7437c..78d6557feaa3feeb8d83048d1b6938ed3b943858 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     The engine for formatting data
 **
index b4a59c44fa1d9cae8b703e236f838ecad4fd8f5a..8e8662d244690f7ca22d7bb9c2d44a8e598611fe 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     The main engine for reading formatted data
 **
index c0c6490c1fcd2e4ec0c7fdd51e272da8e0ba0b8f..d7f0ef33b43314d2105780176c2d5e2bcb876e30 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write with discipline.
 **
index f7f115d727fc2d9bc87f6e220e83fa045784e3db..88146d22ec259ee17f79f4a368371998bc58c120 100644 (file)
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include       "sfhdr.h"
+#include       <sfio/sfhdr.h>
 
 /*     Write data out to the file system
 **