make lib/ast/*.c #includes unambiguous

Unfortunately we cannot also convert the headers because they are #included by
other libraries. We will do this in a future commit. Related to #1785.

diff --git a/lib/ast/Makefile.am b/lib/ast/Makefile.am
index 88177387302633e14dd78f44e27a1b5d04fdce90..43e97ad7673aad2c15b7d5078bbfbdf5eb2c2a7c 100644 (file)
--- a/lib/ast/Makefile.am
+++ b/lib/ast/Makefile.am
@@ -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 -I$(top_srcdir)/lib/sfio
 
 noinst_HEADERS = ast.h error.h hashkey.h
 noinst_LTLIBRARIES = libast_C.la

diff --git a/lib/ast/ast.vcxproj b/lib/ast/ast.vcxproj
index b7817c9d4186b61f85b453c73bf5657dbcbb5755..2667b4cbde085879e1f88870974bb76ccd47f343 100644 (file)
--- a/lib/ast/ast.vcxproj
+++ b/lib/ast/ast.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib/sfio</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;$(SolutionDir)lib\sfio</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib/sfio</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/ast/chresc.c b/lib/ast/chresc.c
index 41653a813dc708cd46803d71bccc5e1e0513549c..7a08569fbe0fdcf4fbf4ddc50b028ab5670a143e 100644 (file)
--- a/lib/ast/chresc.c
+++ b/lib/ast/chresc.c
@@ -20,7 +20,7 @@
  * p is updated to point to the next character in s
  */
 
-#include <ast.h>
+#include "ast.h"
 
 int chresc(register const char *s, char **p)
 {

diff --git a/lib/ast/chrtoi.c b/lib/ast/chrtoi.c
index 80cbc670410e0b745bf7ddc812673a9022e4470c..68af8f9e535e3460b84b7b1b29245159c1ead796 100644 (file)
--- a/lib/ast/chrtoi.c
+++ b/lib/ast/chrtoi.c
@@ -18,7 +18,7 @@
  * convert a 0 terminated character constant string to an int
  */
 
-#include <ast.h>
+#include "ast.h"
 
 int chrtoi(register const char *s)
 {

diff --git a/lib/ast/error.c b/lib/ast/error.c
index 85bc2d206a089bbdfa49bb07761312182bcabd96..8d98682ef39effb6660115e298ce4539fc5f2030 100644 (file)
--- a/lib/ast/error.c
+++ b/lib/ast/error.c
@@ -23,8 +23,8 @@
 #endif
 #endif
 
-#include <ast.h>
-#include <error.h>
+#include "ast.h"
+#include "error.h"
 #include <string.h>
 #include <errno.h>
 

diff --git a/lib/ast/fmtbuf.c b/lib/ast/fmtbuf.c
index 20113bdda83504eec38ccff2ad1743e6e6a6b835..a9b3d47c41877cef31a2bdaabe48775333174d48 100644 (file)
--- a/lib/ast/fmtbuf.c
+++ b/lib/ast/fmtbuf.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include <ast.h>
+#include "ast.h"
 
 /*
  * return small format buffer chunk of size n

diff --git a/lib/ast/fmtesc.c b/lib/ast/fmtesc.c
index 9a9d0ef79c9db306d7342d3479c56d03203e98be..e37da4589984772aba1c8582bd7c40f844b384e6 100644 (file)
--- a/lib/ast/fmtesc.c
+++ b/lib/ast/fmtesc.c
@@ -18,7 +18,7 @@
  * return string with expanded escape chars
  */
 
-#include <ast.h>
+#include "ast.h"
 #include <string.h>
 #include <ctype.h>
 

diff --git a/lib/ast/pathaccess.c b/lib/ast/pathaccess.c
index 4240dfbd6d1001d2ca08b328b19201a4958ecdd0..54c654207092a1752e21f6a9f05f4f3f6b17345e 100644 (file)
--- a/lib/ast/pathaccess.c
+++ b/lib/ast/pathaccess.c
@@ -22,7 +22,7 @@
  * path returned in path buffer
  */
 
-#include <ast.h>
+#include "ast.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else

diff --git a/lib/ast/pathbin.c b/lib/ast/pathbin.c
index 0fe008bb073748e1769028aee241127a3480321f..057e15e49e3b3e45fe9725d5e32beabb38054f75 100644 (file)
--- a/lib/ast/pathbin.c
+++ b/lib/ast/pathbin.c
@@ -18,7 +18,7 @@
  * return current PATH
  */
 
-#include <ast.h>
+#include "ast.h"
 
 char *pathbin(void)
 {

diff --git a/lib/ast/pathcanon.c b/lib/ast/pathcanon.c
index c02055eb4d7e12794f7adf4c90cabb338f31cfc7..0807a6042ddfdf757c66afa1777483b545740c8c 100644 (file)
--- a/lib/ast/pathcanon.c
+++ b/lib/ast/pathcanon.c
@@ -32,9 +32,9 @@
  * will contain the components following the failure point
  */
 
-#include <ast.h>
+#include "ast.h"
 #include <errno.h>
-#include <error.h>
+#include "error.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>

diff --git a/lib/ast/pathcat.c b/lib/ast/pathcat.c
index 09add2190a6c281cb36627c352a30088fd955709..73d8651f203bcc5ed67869a1a604ef4836d72b70 100644 (file)
--- a/lib/ast/pathcat.c
+++ b/lib/ast/pathcat.c
@@ -18,7 +18,7 @@
  * single dir support for pathaccess()
  */
 
-#include <ast.h>
+#include "ast.h"
 
 char *pathcat(char *path, register const char *dirs, int sep,
              const char *a, register const char *b)

diff --git a/lib/ast/pathexists.c b/lib/ast/pathexists.c
index 92a0db903c9fcfb8154b166cb8d22e1112f0b20f..fd7c29f80ae14f1b136f24161e2605271dc782b4 100644 (file)
--- a/lib/ast/pathexists.c
+++ b/lib/ast/pathexists.c
@@ -22,8 +22,8 @@
  * in half by checking ENOTDIR vs. ENOENT
  */
 
-#include <ast.h>
-#include <error.h>
+#include "ast.h"
+#include "error.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c
index 85e7e665b5fd03dd2d0b8a20a64e270f809146ef..a1958ab74eb157ad969925fafeab999f6e633b26 100644 (file)
--- a/lib/ast/pathfind.c
+++ b/lib/ast/pathfind.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include <ast.h>
+#include "ast.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else

diff --git a/lib/ast/pathgetlink.c b/lib/ast/pathgetlink.c
index f5d9caeda80d238b7d63cf229dbc2e79dca14f29..49cf0026b7705d814904d8a9d406d96d6ec820bd 100644 (file)
--- a/lib/ast/pathgetlink.c
+++ b/lib/ast/pathgetlink.c
@@ -17,7 +17,7 @@
 */
 
 #include "config.h"
-#include "errno.h"
+#include <errno.h>
 
 #ifdef UNIV_MAX
 

diff --git a/lib/ast/pathpath.c b/lib/ast/pathpath.c
index f60ad2f515b910423f4cce4ea0427c7a9606f190..7e011ee4d30689a33f4bb78e66a7f2b852f31ee1 100644 (file)
--- a/lib/ast/pathpath.c
+++ b/lib/ast/pathpath.c
@@ -25,7 +25,7 @@
  * if path==0 then the space is malloc'd
  */
 
-#include <ast.h>
+#include "ast.h"
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/lib/ast/strcopy.c b/lib/ast/strcopy.c
index 3c835c4a722c7e60ae450d82b1ecbda5204110e1..8c87f8aae99a03b00bdadf51e770b462b5552009 100644 (file)
--- a/lib/ast/strcopy.c
+++ b/lib/ast/strcopy.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include <ast.h>
+#include "ast.h"
 
 /*
  * copy t into s, return a pointer to the end of s ('\0')

diff --git a/lib/ast/stresc.c b/lib/ast/stresc.c
index c54bd2ddeae7d6ce3c2bb3146405f3f663039c75..3ff33754167ef7f87075a0d2ccb682760189a5a6 100644 (file)
--- a/lib/ast/stresc.c
+++ b/lib/ast/stresc.c
@@ -19,7 +19,7 @@
  * the length of the converted s is returned (may have imbedded \0's)
  */
 
-#include <ast.h>
+#include "ast.h"
 
 int stresc(register char *s)
 {

diff --git a/lib/ast/strmatch.c b/lib/ast/strmatch.c
index b91f3b41e958e5e03f771d6750fb122e13bc407b..539f7ee8126f4e150cacf1979758b4f8ff664668 100644 (file)
--- a/lib/ast/strmatch.c
+++ b/lib/ast/strmatch.c
@@ -51,9 +51,9 @@
  *       element size
  */
 
-#include <ast.h>
+#include "ast.h"
 #include <ctype.h>
-#include <hashkey.h>
+#include "hashkey.h"
 #include <string.h>
 
 #if _hdr_wchar && _lib_wctype && _lib_iswctype
@@ -120,7 +120,7 @@ static int iswblank(wint_t wc)
 #endif
 
 #if _DEBUG_MATCH
-#include <error.h>
+#include "error.h"
 #endif
 
 #define MAXGROUP       10

diff --git a/lib/ast/strton.c b/lib/ast/strton.c
index 6140da849671d3065cacfa2758a565539a7aa214..b60ac569194b5ec0f21014d18ad7770c462186ec 100644 (file)
--- a/lib/ast/strton.c
+++ b/lib/ast/strton.c
@@ -53,7 +53,7 @@
 
 #include <ctype.h>
 
-#include "sfhdr.h"
+#include <sfio/sfhdr.h>
 
 #define QL             01
 #define QU             02