1.1 --- a/epoc32/include/kernel/hal_int.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/kernel/hal_int.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1995-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 the License "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 @@ -13,6 +13,9 @@
    1.16  // Description:
    1.17  // hal\inc\hal_int.h
    1.18  // 
    1.19 +// WARNING: This file contains some APIs which are internal and are subject
    1.20 +//          to change without notice. Such APIs should therefore not be used
    1.21 +//          outside the Kernel and Hardware Services package.
    1.22  //
    1.23  
    1.24  #ifndef __HAL_INT_H__
    1.25 @@ -21,6 +24,14 @@
    1.26  #include <hal.h>
    1.27  #include <e32svr.h>
    1.28  
    1.29 +// Work around data import/export restriction of X86 compilers
    1.30 +#if defined(__X86__) || defined(__WINS__)
    1.31 +#undef IMPORT_D
    1.32 +#undef EXPORT_D
    1.33 +#define IMPORT_D IMPORT_C
    1.34 +#define EXPORT_D
    1.35 +#endif
    1.36 +
    1.37  /**
    1.38  @publishedPartner
    1.39  @released
    1.40 @@ -59,9 +70,9 @@
    1.41  	static const TInt Offset[HAL::ENumHalAttributes];
    1.42  	// InitialValue[] is only exported for patchdata purposes (other executables
    1.43  	// must not import this array; all access should be through the published Hal
    1.44 -	// APIs).  EXPORT_C needs to be on the declaration here so that it has external
    1.45 +	// APIs).  IMPORT_D needs to be on the declaration here so that it has external
    1.46  	// linkage (class data is treated differently to non-class data).
    1.47 -	EXPORT_C static const TInt InitialValue[HAL::ENumHalAttributes];
    1.48 +	IMPORT_D static const TInt InitialValue[HAL::ENumHalAttributes];
    1.49  	static const THalImplementation Implementation[HAL::ENumHalAttributes];
    1.50  	static const TInt HalDataSize;
    1.51