# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1267803729 0
# Node ID c61edc9c3687443f64456c2b050496f4acd0f6a6
# Parent  eaa01f4c05c02e967089c1643a3304cf23363fe0# Parent  f249c5589d66f7215e8969ec756bb456b9779505
Merge Compiler Compatibility fixes onto default branch

diff -r eaa01f4c05c0 -r c61edc9c3687 build/data/s60_sbs_config.xml
--- a/build/data/s60_sbs_config.xml	Tue Feb 02 02:03:15 2010 +0200
+++ b/build/data/s60_sbs_config.xml	Fri Mar 05 15:42:09 2010 +0000
@@ -7,14 +7,13 @@
 	<!-- End-user overrides for existing build configurations for SBSv2 (aka Raptor).-->
 
 	<!-- binding of FLM interfaces to certain build/makefile phase to ensure proper order of execution during build -->
-
 	<var name="make_changes">
-	<set name="bitmap.selector.iface" value="\.(bitmap|extension|mifconv|akniconinterfaces|removegtfiles|skingenerator|cryptoprep|builder|help_files|version_update)$"/>
+		<set name="bitmap.selector.iface" value="\.(bitmap|extension|mifconv|akniconinterfaces|removegtfiles|skingenerator|cryptoprep|builder|help_files|version_update)$"/>
 		<set name="resource.selector.iface" value="\.(resource|extension|mif2cdlindex|nativejava|genericcopy)$"/>
-   <set name="default.selector.iface" value="\.(?!export$|bitmap$|resource$|mifconv$|mif2cdlindex$|nativejava$|akniconinterfaces$|removegtfiles$|genericcopy$|skingenerator$|cryptoprep$|builder$|help_files$|version_update$).*$"/>
-    <!-- 4.5 min -->
-	  <set name='TALON_TIMEOUT' value='540000'/> 
-  </var>
+		<set name="default.selector.iface" value="\.(?!export$|bitmap$|resource$|mifconv$|mif2cdlindex$|nativejava$|akniconinterfaces$|removegtfiles$|genericcopy$|skingenerator$|cryptoprep$|builder$|help_files$|version_update$).*$"/>
+		<!-- 4.5 min -->
+		<set name='TALON_TIMEOUT' value='540000'/> 
+	</var>
 
 	<!-- emake -->
 	<alias name="emake" meaning="emake_engine.make_changes"/>  
@@ -22,5 +21,7 @@
 	<!-- gnu make -->
 	<alias name="make" meaning="make_engine.make_changes"/>
 
-
+	<var name="permissive">
+		<append name="CC_ERRORS_CONTROL_OPTION" value="-fpermissive"/>
+	</var>
 </build>