disambiguate lib/expr/*.c #includes

Related to #1785.

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 17f52100016ce79e79f29be021ef327e46b89c98..f022ec69dcb1ca299af94d878a6acc216b6129cb 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -7,7 +7,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
-        -I. \
+       -I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/vmalloc \
        -I$(top_srcdir)/lib/sfio \
        -I$(top_srcdir)/lib/ast \

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index e179e8a1258d560a113d073480de357ed131e636..745e76db1721ecb882e386ee8c4de07d317fbcb3 100644 (file)
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -23,7 +23,7 @@
        int             tmp;            /* temp var index               */ \
        Exccdisc_t*     ccdisc;         /* excc() discipline            */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 #include <string.h>
 
 #define EX_CC_DUMP     0x8000

diff --git a/lib/expr/excontext.c b/lib/expr/excontext.c
index c3abf34f66d327746f9d2c4300966af344a55c68..9f1b61e7acf5a927f3aecaefad9ca167c9fe49ee 100644 (file)
--- a/lib/expr/excontext.c
+++ b/lib/expr/excontext.c
@@ -17,7 +17,7 @@
  * expression library
  */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 
 /*
  * copy input token error context into buf of n chars and reset the context

diff --git a/lib/expr/exdata.c b/lib/expr/exdata.c
index d46d809de3cfe5d408d7efd561a7b131b8524726..267e5eca2c1ed6e83e13440191bf80b7f50c8d8c 100644 (file)
--- a/lib/expr/exdata.c
+++ b/lib/expr/exdata.c
@@ -19,7 +19,7 @@
 
 static const char id[] = "\n@(#)$Id: libexpr (AT&T Research) 2011-06-30 $\0\n";
 
-#include <exlib.h>
+#include <expr/exlib.h>
 
 const char*    exversion = id + 10;
 

diff --git a/lib/expr/exerror.c b/lib/expr/exerror.c
index 235d4f9de34d011d7b7a5a9d28f45aa0b2132f90..bf3b9315a98d868b89da38b370faece8fe6e4679 100644 (file)
--- a/lib/expr/exerror.c
+++ b/lib/expr/exerror.c
@@ -17,7 +17,7 @@
  * expression library
  */
 
-#include <exlib.h>
+#include <expr/exlib.h>
 
 /*
  * library error handler

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index 3e3018f39ac4f47c6cb3ba59c41fe2717d1923f3..7fc906f8766cb5ac447cba6ea7932c6da2cd3a90 100644 (file)
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -23,8 +23,8 @@
 #define _BLD_sfio 1
 #endif
 
-#include "exlib.h"
-#include "exop.h"
+#include <expr/exlib.h>
+#include <expr/exop.h>
 #include <string.h>
 #include <assert.h>
 #include <time.h>

diff --git a/lib/expr/exexpr.c b/lib/expr/exexpr.c
index ae7abd57e78523504306b2d0b035ee8f5e477a3b..e040022508e36c9b1774ca632d1e727cf4e93316 100644 (file)
--- a/lib/expr/exexpr.c
+++ b/lib/expr/exexpr.c
@@ -17,7 +17,7 @@
  * expression library
  */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 
 /*
  * return the expression for name or sym coerced to type

diff --git a/lib/expr/exlexname.c b/lib/expr/exlexname.c
index f40406622903fb4b68dfad6f1a606f556d969c94..dbc5aa01e12011808974c37afff566f31285160c 100644 (file)
--- a/lib/expr/exlexname.c
+++ b/lib/expr/exlexname.c
@@ -17,8 +17,8 @@
  * return lex name for op[subop]
  */
 
-#include "exlib.h"
-#include "exop.h"
+#include <expr/exlib.h>
+#include <expr/exop.h>
 
 #define TOTNAME                3
 #define MAXNAME                16

diff --git a/lib/expr/exnospace.c b/lib/expr/exnospace.c
index 553fba2c94813c9bf054096819a5a0aff07cb94a..bbddf5fe8e38e017a6896c603ee872f637d47ffd 100644 (file)
--- a/lib/expr/exnospace.c
+++ b/lib/expr/exnospace.c
@@ -17,7 +17,7 @@
  * expression library
  */
 
-#include <exlib.h>
+#include <expr/exlib.h>
 
 /*
  * no space message with default (empty) string value

diff --git a/lib/expr/exopen.c b/lib/expr/exopen.c
index f94ede76a7dcd656402b8bcef5fc4e40b3744ec7..1fb31e4e1c9d20f3fd01f282752132cc00954466 100644 (file)
--- a/lib/expr/exopen.c
+++ b/lib/expr/exopen.c
@@ -24,7 +24,7 @@
 #define _BLD_sfio 1
 #endif
 
-#include <exlib.h>
+#include <expr/exlib.h>
 #include <string.h>
 
 /*

diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y
index 38e6a307f72ae2558b610640614ff1e35543ae10..ac28a96c4a20e358cdd4965701eb28685caa4f82 100644 (file)
--- a/lib/expr/exparse.y
+++ b/lib/expr/exparse.y
@@ -37,7 +37,7 @@
 #endif
 
 #include <stdio.h>
-#include <ast.h>
+#include <ast/ast.h>
 
 #undef RS      /* hp.pa <signal.h> grabs this!! */
 

diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj
index bf9bc25ecb9fc1b0615cd8ccd7ef9f248bc28af5..50262bf694f5564cadb2f357af71fe96bff0cf1f 100644 (file)
--- a/lib/expr/expr.vcxproj
+++ b/lib/expr/expr.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -69,7 +69,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/expr/exrewind.c b/lib/expr/exrewind.c
index e8673de11a4d5592552a96fea648e220f866a3ac..7f933e89abc7054cec0f2da84445244c4a2986c8 100644 (file)
--- a/lib/expr/exrewind.c
+++ b/lib/expr/exrewind.c
@@ -18,7 +18,7 @@
  * expression library
  */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 #include <string.h>
 
 int

diff --git a/lib/expr/exstash.c b/lib/expr/exstash.c
index 8c4f2f435bfff85932637933eeca321c8e6c431f..5b0b9e543366e5422bbcf5fe81f86c171ed8912e 100644 (file)
--- a/lib/expr/exstash.c
+++ b/lib/expr/exstash.c
@@ -18,7 +18,7 @@
  * expression library
  */
 
-#include <exlib.h>
+#include <expr/exlib.h>
 
 /*
  * 0 terminate string and optionally vmstrdup() return value

diff --git a/lib/expr/extoken.c b/lib/expr/extoken.c
index 00b46d0f35b473682289d53fdb35266376d9709d..8a6baa56824b331316abc75d65dfa7fa8f509067 100644 (file)
--- a/lib/expr/extoken.c
+++ b/lib/expr/extoken.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "exlib.h"
+#include <expr/exlib.h>
 #include <string.h>
 
 #if !defined(TRACE_lex) && _BLD_DEBUG

diff --git a/lib/expr/extype.c b/lib/expr/extype.c
index 5e8f6a6513db6fc86eff4aca4f148817925423e7..5f9e9e4afb1bf771e88650df365507ffc39045ba 100644 (file)
--- a/lib/expr/extype.c
+++ b/lib/expr/extype.c
@@ -18,7 +18,7 @@
  * expression library C program generator
  */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 
 #define str(s)         # s
 #define xstr(s)                str(s)

diff --git a/lib/expr/exzero.c b/lib/expr/exzero.c
index 4dff703163e539f699c741829763187ed0a601ba..93799147a68e0180fa7497692402be4db05c747b 100644 (file)
--- a/lib/expr/exzero.c
+++ b/lib/expr/exzero.c
@@ -18,7 +18,7 @@
  * expression library support
  */
 
-#include "exlib.h"
+#include <expr/exlib.h>
 
 /*
  * return 0 value for type

diff --git a/windows/include/exop.h b/windows/include/expr/exop.h
similarity index 100%
rename from windows/include/exop.h
rename to windows/include/expr/exop.h