--- a/package_definition.xml	Fri Feb 19 23:43:25 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="serviceapifw" name="Service API Framework" levels="plugin framework server generic specific">
-    <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
-      <component id="lifwservicehandler" filter="s60" name="Service Handler">
-        <unit bldFile="languageinterworkingfw/servicehandler/group"/>
-      </component>
-    </collection>
-    <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
-      <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
-      </component>
-      <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
-      </component>
-      <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
-      </component>
-      <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
-		<!-- consider moving the exports to the appropriate components -->
-        <unit bldFile="rtsecuritymanager/group"/>
-      </component>
-    </collection>
-    <collection id="serviceapifw_info" name="Service API Framework Info" level="specific">
-      <component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
-        <unit bldFile="serviceapifw_pub/group"/>
-      </component>
-      <component id="serviceapifw_plat" filter="s60" name="Service API Framework Platform Interfaces" class="api">
-        <unit bldFile="serviceapifw_plat/group"/>
-		<!-- these should be #included from the above bld.inf -->
-        <unit bldFile="serviceapifw_plat/liw_criteria_api/tsrc/group"/>
-        <unit bldFile="serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
-        <!-- <unit bldFile="serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-        <!-- <unit bldFile="serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>

--- a/serviceapifw_plat/liw_generic_parameter_api/inc/liwvariant.h	Fri Feb 19 23:43:25 2010 +0200
+++ b/serviceapifw_plat/liw_generic_parameter_api/inc/liwvariant.h	Wed Mar 31 23:02:14 2010 +0300
@@ -1682,7 +1682,7 @@
    	*
    	* @return an instance of \c CLiwDefaultMap   
    	*/
-    static CLiwDefaultMap* NewLC(RReadStream& aInputStream);
+    IMPORT_C static CLiwDefaultMap* NewLC(RReadStream& aInputStream);
   
   /**
     * Inserts a key-value pair element to the map collection. If