1 diff -u include_pristine/apaserverapp.h include/apaserverapp.h

     2 --- include_pristine/apaserverapp.h	2006-07-03 18:21:52.162351600 +0300

     3 +++ include/apaserverapp.h	2006-07-03 19:21:46.121331300 +0300

     4 @@ -97,11 +97,14 @@

     5  	a command ID from the UI if exit was triggered from the UI, or an error code

     6  	if the server app exited unexpectedly. */

     7  	virtual void HandleServerAppExit(TInt aReason) = 0;

     8 +

     9  protected:

    10 -	IMPORT_C MApaServerAppExitObserver();

    11 +  //XXX PyS60 mod

    12 +	//IMPORT_C MApaServerAppExitObserver();

    13  private:

    14 -	IMPORT_C virtual void MApaServerAppExitObserver_Reserved1();

    15 -	IMPORT_C virtual void MApaServerAppExitObserver_Reserved2();

    16 +  //XXX PyS60 mod

    17 +	//IMPORT_C virtual void MApaServerAppExitObserver_Reserved1();

    18 +	//IMPORT_C virtual void MApaServerAppExitObserver_Reserved2();

    19  private:

    20  	TInt iMApaServerAppExitObserver_Reserved1;

    21  	};

    22 diff -u include_pristine/apparc.h include/apparc.h

    23 --- include_pristine/apparc.h	2006-07-03 18:21:52.212422600 +0300

    24 +++ include/apparc.h	2006-07-03 19:24:05.671734700 +0300

    25 @@ -583,8 +583,9 @@

    26  protected:

    27  	IMPORT_C MApaEmbeddedDocObserver();

    28  private:

    29 -	IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved1();

    30 -	IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved2();

    31 +	// XXX PyS60 mod

    32 +	//IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved1();

    33 +	//IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved2();

    34  private:

    35  	TInt iMApaEmbeddedDocObserver_Reserved1;

    36  	};

    37 diff -u include_pristine/e32def.h include/e32def.h

    38 --- include_pristine/e32def.h	2006-07-03 18:21:54.065049600 +0300

    39 +++ include/e32def.h	2006-07-03 18:22:43.134629600 +0300

    40 @@ -2703,7 +2703,9 @@

    41  /**

    42  @internalComponent

    43  */

    44 +#if defined(__cplusplus)

    45  static const char* const KSuppressPlatSecDiagnosticMagicValue = (const char*)1;

    46 +#endif

    47  

    48  #ifndef __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__

    49  /**

    50 @@ -2766,7 +2768,10 @@

    51  @publishedPartner

    52  @released

    53  */

    54 +

    55 +#if defined(__cplusplus)

    56  static const char* const KSuppressPlatSecDiagnostic = KSuppressPlatSecDiagnosticMagicValue;

    57 +#endif

    58  

    59  #else /* __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__ */

    60