From: Matthew Fernandez Date: Sun, 16 Aug 2020 21:30:11 +0000 (-0700) Subject: disambiguate lib/expr/*.c #includes X-Git-Tag: 2.46.0~20^2^2~90^2~43 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14fa2e49b45487c330754dd599b4044f5ca4ecfb;p=graphviz disambiguate lib/expr/*.c #includes Related to #1785. --- diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am index 17f521000..f022ec69d 100644 --- 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 e179e8a12..745e76db1 100644 --- 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 #include #define EX_CC_DUMP 0x8000 diff --git a/lib/expr/excontext.c b/lib/expr/excontext.c index c3abf34f6..9f1b61e7a 100644 --- a/lib/expr/excontext.c +++ b/lib/expr/excontext.c @@ -17,7 +17,7 @@ * expression library */ -#include "exlib.h" +#include /* * 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 d46d809de..267e5eca2 100644 --- 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 +#include const char* exversion = id + 10; diff --git a/lib/expr/exerror.c b/lib/expr/exerror.c index 235d4f9de..bf3b9315a 100644 --- a/lib/expr/exerror.c +++ b/lib/expr/exerror.c @@ -17,7 +17,7 @@ * expression library */ -#include +#include /* * library error handler diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 3e3018f39..7fc906f87 100644 --- 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 +#include #include #include #include diff --git a/lib/expr/exexpr.c b/lib/expr/exexpr.c index ae7abd57e..e04002250 100644 --- a/lib/expr/exexpr.c +++ b/lib/expr/exexpr.c @@ -17,7 +17,7 @@ * expression library */ -#include "exlib.h" +#include /* * return the expression for name or sym coerced to type diff --git a/lib/expr/exlexname.c b/lib/expr/exlexname.c index f40406622..dbc5aa01e 100644 --- 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 +#include #define TOTNAME 3 #define MAXNAME 16 diff --git a/lib/expr/exnospace.c b/lib/expr/exnospace.c index 553fba2c9..bbddf5fe8 100644 --- a/lib/expr/exnospace.c +++ b/lib/expr/exnospace.c @@ -17,7 +17,7 @@ * expression library */ -#include +#include /* * no space message with default (empty) string value diff --git a/lib/expr/exopen.c b/lib/expr/exopen.c index f94ede76a..1fb31e4e1 100644 --- a/lib/expr/exopen.c +++ b/lib/expr/exopen.c @@ -24,7 +24,7 @@ #define _BLD_sfio 1 #endif -#include +#include #include /* diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y index 38e6a307f..ac28a96c4 100644 --- a/lib/expr/exparse.y +++ b/lib/expr/exparse.y @@ -37,7 +37,7 @@ #endif #include -#include +#include #undef RS /* hp.pa grabs this!! */ diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj index bf9bc25ec..50262bf69 100644 --- a/lib/expr/expr.vcxproj +++ b/lib/expr/expr.vcxproj @@ -51,7 +51,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -69,7 +69,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/expr/exrewind.c b/lib/expr/exrewind.c index e8673de11..7f933e89a 100644 --- a/lib/expr/exrewind.c +++ b/lib/expr/exrewind.c @@ -18,7 +18,7 @@ * expression library */ -#include "exlib.h" +#include #include int diff --git a/lib/expr/exstash.c b/lib/expr/exstash.c index 8c4f2f435..5b0b9e543 100644 --- a/lib/expr/exstash.c +++ b/lib/expr/exstash.c @@ -18,7 +18,7 @@ * expression library */ -#include +#include /* * 0 terminate string and optionally vmstrdup() return value diff --git a/lib/expr/extoken.c b/lib/expr/extoken.c index 00b46d0f3..8a6baa568 100644 --- a/lib/expr/extoken.c +++ b/lib/expr/extoken.c @@ -20,7 +20,7 @@ #include "config.h" -#include "exlib.h" +#include #include #if !defined(TRACE_lex) && _BLD_DEBUG diff --git a/lib/expr/extype.c b/lib/expr/extype.c index 5e8f6a651..5f9e9e4af 100644 --- a/lib/expr/extype.c +++ b/lib/expr/extype.c @@ -18,7 +18,7 @@ * expression library C program generator */ -#include "exlib.h" +#include #define str(s) # s #define xstr(s) str(s) diff --git a/lib/expr/exzero.c b/lib/expr/exzero.c index 4dff70316..93799147a 100644 --- a/lib/expr/exzero.c +++ b/lib/expr/exzero.c @@ -18,7 +18,7 @@ * expression library support */ -#include "exlib.h" +#include /* * 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