From 17bb07d52267231d546aa79dee135e61071efa83 Mon Sep 17 00:00:00 2001
From: Alexander Mai <amai@users.sf.net>
Date: Sun, 14 Feb 2016 11:51:18 +0100
Subject: [PATCH] #6913 max-configs=1 buggs out includefile resolving in case
 of circular dependency. Use simplified paths for internal list of includes
 parsed already

---
 lib/preprocessor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 566f1c4b7..c0571ae93 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -2285,7 +2285,8 @@ std::string Preprocessor::handleIncludes(const std::string &code, const std::str
                     continue;
                 }
 
-                includes.push_back(filename);
+                // #6913 - simplify Path to avoid strange recursion
+                includes.push_back(Path::simplifyPath(filename));
 
                 // Don't include header if it's already included and contains #pragma once
                 if (pragmaOnce.find(filename) != pragmaOnce.end()) {