--- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/inc/EapMsChapV2.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/inc/EapMsChapV2.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 19 %
+* %version: 26 %
 */
 
 #ifndef _EAPMSCHAPV2_H_
@@ -24,8 +24,32 @@
 
 // INCLUDES
 #include <EapTypePlugin.h>
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAPMSCHAPV2_H)
+	#define EAP_CLASS_VISIBILITY_EAPMSCHAPV2_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAPMSCHAPV2_H 
+	#define EAP_C_FUNC_VISIBILITY_EAPMSCHAPV2_H 
+	#define EAP_FUNC_EXPORT_EAPMSCHAPV2_H 
+	#define EAP_C_FUNC_EXPORT_EAPMSCHAPV2_H 
+#elif defined(EAP_EXPORT_EAPMSCHAPV2_H)
+	#define EAP_CLASS_VISIBILITY_EAPMSCHAPV2_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAPMSCHAPV2_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPMSCHAPV2_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAPMSCHAPV2_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAPMSCHAPV2_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAPMSCHAPV2_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAPMSCHAPV2_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAPMSCHAPV2_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAPMSCHAPV2_H 
+	#define EAP_C_FUNC_EXPORT_EAPMSCHAPV2_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_header.h"
 
+class AbsPacStoreInitializer;
+
 // LOCAL CONSTANTS
 
 // CLASS DECLARATION
@@ -33,7 +57,7 @@
 * Class that implements the generic EAP type interface. Implements EAP MSCHAPv2 and 
 * plain MSCHAPv2 protocol.
 */
-class CEapMsChapV2 : public CEapTypePlugin
+class EAP_CLASS_VISIBILITY_EAPMSCHAPV2_H CEapMsChapV2 : public CEapTypePlugin
 {
 public:		
 	/**
@@ -41,14 +65,14 @@
 	* @param aIapInfo Pointer to the class that contains information about bearer type and unique index.
 	* @return Pointer to the instance.
 	*/
-	static CEapMsChapV2* NewL(SIapInfo *aIapInfo);	
+	static CEapMsChapV2* NewL(SPluginInfo *aIapInfo);	
 	
 	/**
 	* Construction function. Called by ECom after the plain MSCHAPv2 plugin has been loaded.
 	* @param aIapInfo Pointer to the class that contains information about bearer type and unique index.
 	* @return Pointer to the instance.
 	*/
-	static CEapMsChapV2* NewPlainMSCHAPv2L(SIapInfo *aIapInfo);
+	static CEapMsChapV2* NewPlainMSCHAPv2L(SPluginInfo *aIapInfo);
 	
 	/**
 	* Destructor does nothing.
@@ -150,6 +174,8 @@
 	*/
 	void CopySettingsL(const TIndexType aDestinationIndexType, const TInt aDestinationIndex);
 
+	TInt InitialisePacStore(AbsPacStoreInitializer * const initializer);
+
 protected:
 
 	/**