rename IncludeSearch enum names to match what they actually do

This commit is contained in:
Ash Wolf 2023-01-26 11:30:23 +00:00
parent 3d2f1da7c8
commit fc0c4c0df7
2 changed files with 9 additions and 10 deletions

View File

@ -239,19 +239,19 @@ int Deps_ChangeSpecialAccessPath(OSSpec *srcfss, Boolean initialize) {
currentsrcfss = srcfss;
switch (optsCompiler.includeSearch) {
case IncludeSearch_Type2:
case IncludeSearch_Explicit:
specialAccessPath = NULL;
return 1;
case IncludeSearch_Type0:
case IncludeSearch_Proj:
if (!initialize)
return 1;
OS_GetCWD(&pathspec);
pathspecptr = &pathspec;
break;
case IncludeSearch_Type1:
case IncludeSearch_Source:
if (!initialize)
return 1;
case IncludeSearch_Type3:
case IncludeSearch_Include:
if (srcfss) {
pathspecptr = &srcfss->path;
} else if (currentsrcfss) {
@ -282,7 +282,7 @@ static void SetSpecialAccessPathFromIncludeStackTOS(void) {
char *fnameptr;
VFile *vf;
if (optsCompiler.includeSearch == IncludeSearch_Type3 && CLT_filesp && CLT_filestack) {
if (optsCompiler.includeSearch == IncludeSearch_Include && CLT_filesp && CLT_filestack) {
if (*CLT_filesp >= 0) {
index = *CLT_filesp;
while (index) {

View File

@ -487,11 +487,10 @@ enum {
};
enum {
IncludeSearch_Type0 = 0,
IncludeSearch_Type1 = 1,
IncludeSearch_Type2 = 2,
IncludeSearch_Type3 = 3,
IncludeSearch_Type4 = 4
IncludeSearch_Proj = 0,
IncludeSearch_Source = 1,
IncludeSearch_Explicit = 2,
IncludeSearch_Include = 3
};
typedef struct PrefPanel PrefPanel;