diff -r 0e43dd645395 -r 372d2d6c5cf9 eapol/eapol_framework/eapol_symbian/eap_server/src/EapScheduler.cpp
--- a/eapol/eapol_framework/eapol_symbian/eap_server/src/EapScheduler.cpp	Thu May 27 13:25:51 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/EapScheduler.cpp	Thu Jun 10 16:12:28 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15 %
+* %version: 16 %
 */
 
 #include "EapScheduler.h"
@@ -128,7 +128,9 @@
     // get cleanup stack
     EAP_TRACE_DEBUG_SYMBIAN((_L("CEapScheduler::ThreadStart()")));           
 
+#if defined(USE_EAP_HEAP_CHECK)
     __UHEAP_MARK;
+#endif //#if defined(USE_EAP_HEAP_CHECK)
 
     CTrapCleanup* cleanup=CTrapCleanup::New();
 
@@ -140,7 +142,9 @@
 		delete cleanup;
 		}
 
+#if defined(USE_EAP_HEAP_CHECK)
     __UHEAP_MARKEND;
+#endif //#if defined(USE_EAP_HEAP_CHECK)
 
     EAP_TRACE_DEBUG_SYMBIAN((_L("CEapScheduler::ThreadStart end err=%d"), err));           
     return err;