Rename variable 'includes' -> 'includeFolders'

Author: cmaglie

legacy/builder/container_find_includes.go

@@ -316,9 +316,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
 		// search path, but only for the source code of the library, so we temporary
 		// copy the current search path list and add the library' utility directory
 		// if needed.
-		includes := ctx.IncludeFolders
+		includeFolders := ctx.IncludeFolders
 		if library := sourceFile.Library; library != nil && library.UtilityDir != nil {
-			includes = append(includes, library.UtilityDir)
+			includeFolders = append(includeFolders, library.UtilityDir)
 		}
 
 		if library := sourceFile.Library; library != nil {
@@ -342,7 +342,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
 				ctx.Info(tr("Using cached library dependencies for file: %[1]s", sourcePath))
 			}
 		} else {
-			preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includes)
+			preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includeFolders)
 			// Unwrap error and see if it is an ExitError.
 			if preproc_err == nil {
 				// Preprocessor successful, done
@@ -371,7 +371,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
 			// return errors.WithStack(err)
 			if preproc_err == nil || preproc_stderr == nil {
 				// Filename came from cache, so run preprocessor to obtain error to show
-				preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includes)
+				preproc_stderr, preproc_err = GCCPreprocRunnerForDiscoveringIncludes(ctx, sourcePath, targetFilePath, includeFolders)
 				if preproc_err == nil {
 					// If there is a missing #include in the cache, but running
 					// gcc does not reproduce that, there is something wrong.