# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1267802109 0
# Node ID d1c432433c4308496b085922020489b2b2348215
# Parent  eeae1e4e84ea858f6bbe58c64245471587101c41
Revert changes to support new bootstrap.flm, which isn't compatible with bootstrap.mk (see Bug 2149)

diff -r eeae1e4e84ea -r d1c432433c43 bsptemplate/asspandvariant/template_variant/bld.inf
--- a/bsptemplate/asspandvariant/template_variant/bld.inf	Sat Feb 27 19:02:54 2010 +0000
+++ b/bsptemplate/asspandvariant/template_variant/bld.inf	Fri Mar 05 15:15:09 2010 +0000
@@ -109,6 +109,7 @@
 
 PRJ_EXTENSIONS
 
+#if 0 // Removing changes associated with introduction of bootstrap.flm - see Bug 2149
 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter
 
 start		extension		base.bootstrap bootstrap
@@ -130,6 +131,9 @@
 end
 
 #else // !SBSV2
+#endif // more workaround - close the #ifdef SBSV2 here, to regain the other bit
+#endif // first part of workaround - close the #ifdef 0
+
 
 start		extension		base/bootstrap bootstrap
 
@@ -149,4 +153,5 @@
 
 end
 
+#if 0  // second part of workaround - avoid dangling #endif
 #endif // !SBSV2