--- a/contentmgmt/contentaccessfwfordrm/group/CafUtils.mmp	Tue Jul 21 01:04:32 2009 +0100
+++ b/contentmgmt/contentaccessfwfordrm/group/CafUtils.mmp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,68 +1,66 @@
-/*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* cafutils.dll Provides Content Access Framework utility functionality
-*
-*/
-
-
-
-
-/**
- @file
-*/
-
-TARGET		cafutils.dll
-CAPABILITY	All -Tcb
-TARGETTYPE	DLL
-
-UID			0x101FD9B8
-VENDORID	0x70000001
-
-UNPAGED
-
-SOURCEPATH	../source/cafutils
-SOURCE		Cafutils.cpp
-SOURCE		attributeset.cpp
-SOURCE		stringattribute.cpp
-SOURCE		stringattributeset.cpp
-SOURCE		virtualpath.cpp
-SOURCE		Metadata.cpp
-SOURCE		Metadataarray.cpp
-SOURCE		embeddedobject.cpp
-SOURCE		rightsinfo.cpp
-SOURCE		Virtualpathptr.cpp
-SOURCE		dirstreamable.cpp
-
-#ifndef REMOVE_CAF1
-// deprecated stuff from CAF 1.0
-SOURCE		bitset.cpp
-SOURCE		cafmimeheader.cpp
-SOURCE		mimefieldanddata.cpp
-#endif
-
-USERINCLUDE	../inc
-USERINCLUDE	../source/cafutils
-
-SYSTEMINCLUDE	/epoc32/include 
-SYSTEMINCLUDE	/epoc32/include/caf
-SYSTEMINCLUDE	/epoc32/include/libc
-
-LIBRARY		euser.lib
-LIBRARY		estor.lib
-LIBRARY		charconv.lib
-LIBRARY		efsrv.lib
-LIBRARY		apgrfx.lib
-LIBRARY		ecom.lib
-LIBRARY		apmime.lib
+/*
+* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* cafutils.dll Provides Content Access Framework utility functionality
+*
+*/
+
+
+/**
+ @file
+*/
+
+TARGET		cafutils.dll
+CAPABILITY	All -Tcb
+TARGETTYPE	DLL
+
+UID			0x101FD9B8
+VENDORID	0x70000001
+
+UNPAGED
+
+SOURCEPATH	../source/cafutils
+SOURCE		Cafutils.cpp
+SOURCE		attributeset.cpp
+SOURCE		stringattribute.cpp
+SOURCE		stringattributeset.cpp
+SOURCE		virtualpath.cpp
+SOURCE		Metadata.cpp
+SOURCE		Metadataarray.cpp
+SOURCE		embeddedobject.cpp
+SOURCE		rightsinfo.cpp
+SOURCE		Virtualpathptr.cpp
+SOURCE		dirstreamable.cpp
+
+#ifndef REMOVE_CAF1
+// deprecated stuff from CAF 1.0
+SOURCE		bitset.cpp
+SOURCE		cafmimeheader.cpp
+SOURCE		mimefieldanddata.cpp
+#endif
+
+USERINCLUDE	../inc
+USERINCLUDE	../source/cafutils
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+
+LIBRARY		euser.lib
+LIBRARY		estor.lib
+LIBRARY		charconv.lib
+LIBRARY		efsrv.lib
+LIBRARY		apgrfx.lib
+LIBRARY		ecom.lib
+LIBRARY		apmime.lib
+SMPSAFE