# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1260817618 21600
# Node ID dabe5b8e3aecb3677f2aabd263461c238456096a
# Parent  8e79006903413b6c7bba415d28d0fc99f71c1e08# Parent  7b05fffc0084dd032419d375a9f7ac962744cf76
Merge commit

diff -r 8e7900690341 -r dabe5b8e3aec builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Mon Dec 14 12:59:27 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Mon Dec 14 13:06:58 2009 -0600
@@ -228,7 +228,7 @@
 		if (oemDir.exists()) {
 			includeEntries.add(new CIncludePathEntry(new Path(oemDir.getAbsolutePath()), 0));
 		}
-
+		
 		// cache the macros
 		macroEntries = new ArrayList<ICLanguageSettingEntry>(0);
 
diff -r 8e7900690341 -r dabe5b8e3aec core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Dec 14 12:59:27 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Dec 14 13:06:58 2009 -0600
@@ -305,7 +305,14 @@
 		if (installedRVCTTools.length > 0) {
 			rvctFragment = getRVCTFragment(installedRVCTTools[0]);
 		}
-		return getSDK().getIncludePath().append(rvctFragment).append(rvctFragment + ".h"); //$NON-NLS-1$
+		IPath prefixFilePath = getSDK().getIncludePath().append(rvctFragment).append(rvctFragment + ".h"); //$NON-NLS-1$
+		if (prefixFilePath.toFile().exists()){
+			return prefixFilePath;
+		} else {
+			// SF kits around SF^3 started to only use a single rvct.h header instead of specific versioned ones
+			// based on the default installation
+			return getSDK().getIncludePath().append("rvct").append("rvct" + ".h");
+		}
 	}
 
 	private String getRVCTFragment(IRVCTToolChainInfo info) {