diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mw/conarc.h --- a/epoc32/include/mw/conarc.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/mw/conarc.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,9 +1,9 @@ // Copyright (c) 1997-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 "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members +// under the terms of "Eclipse Public License v1.0" // which accompanies this distribution, and is available -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +// at the URL "http://www.eclipse.org/legal/epl-v10.html". // // Initial Contributors: // Nokia Corporation - initial contribution. @@ -79,6 +79,7 @@ #define KUidConverterDll KUidConverterDll8 #endif +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS /** @internalComponent @deprecated @@ -91,6 +92,9 @@ */ const TUid KUidConverterDll8={KUidConverterDllValue8}; +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS + +//gmahe. This needs to be promoted to publishedAll. /** @internalComponent */ @@ -102,6 +106,7 @@ */ const TUid KUidConverterInfoFile={KUidConverterInfoFileValue}; +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS /** @internalComponent */ @@ -112,6 +117,7 @@ */ const TUid KUidConverterInfoStream={KUidConverterInfoStreamValue}; +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS /** The UID2 of converter-type DLLs. @publishedAll