diff -r dd21522fd290 -r 7c90e6132015 webengine/osswebengine/MemoryManager/Group/MemMan.mmp --- a/webengine/osswebengine/MemoryManager/Group/MemMan.mmp Mon Mar 30 12:54:55 2009 +0300 +++ b/webengine/osswebengine/MemoryManager/Group/MemMan.mmp Fri May 08 08:25:06 2009 +0300 @@ -25,22 +25,26 @@ TARGETTYPE dll +OPTION ARMCC -O3 -Otime UID 0x1000008D 0x10281B6D //MACRO OOM_LOGGING MACRO USE_FAST_MALLOC MACRO NOKIA_CHANGES +MACRO __NEW_ALLOCATOR__ +//MACRO TRACE_CHUNK_USAGE CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT EPOCALLOWDLLDATA #ifndef __BROWSER_SDK MW_LAYER_SYSTEMINCLUDE -MW_LAYER_LIBC_SYSTEMINCLUDE +//MW_LAYER_LIBC_SYSTEMINCLUDE #else SYSTEMINCLUDE /Epoc32/include +#endif SYSTEMINCLUDE /epoc32/include/libc -#endif +//#endif USERINCLUDE ../Inc @@ -50,6 +54,8 @@ SOURCE StopScheduler.cpp SOURCE fast_malloc.cpp SOURCE FastAllocator.cpp +SOURCE heap.cpp +SOURCE SymbianDLAllocatorWrapper.cpp LIBRARY euser.lib DEBUGLIBRARY flogger.lib