1.1 --- a/epoc32/include/apmstd.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/apmstd.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// 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
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -46,6 +46,7 @@
    1.16  @released */
    1.17  const TInt32 KDataTypePriorityUserSpecified=KMaxTInt16;
    1.18  
    1.19 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.20  /** This is a special priority that overrides any user settings. Applications must
    1.21  have EWriteDeviceData to use this priority. If they have not then they will be
    1.22  downgraded to KDataTypePriorityNormal.
    1.23 @@ -55,6 +56,8 @@
    1.24  @see TDataTypeWithPriority */
    1.25  const TInt32 KDataTypePrioritySystem = 0xFFF9;
    1.26  
    1.27 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
    1.28 +
    1.29  /** Trusted applications may use this priority value to ensure 
    1.30      their MIME type associations cannot be overridden by 
    1.31      self signed (untrusted) applications.
    1.32 @@ -149,7 +152,7 @@
    1.33  	TBuf8<KMaxDataTypeLength> iDataType;
    1.34  	TUid iUid;
    1.35  	};
    1.36 -
    1.37 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.38  /**
    1.39  @internalComponent
    1.40  */
    1.41 @@ -160,7 +163,7 @@
    1.42  */
    1.43  _LIT8(KEpocUrlDataTypeHeader, "X-Epoc-Url/");
    1.44  
    1.45 -
    1.46 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
    1.47  
    1.48  class TDataTypeWithPriority
    1.49  /** A data (MIME) type and a priority value for that data type.