--- a/skins/AknSkins/sdcsrc/SDCPkgOutput.cpp	Fri Apr 16 16:01:57 2010 +0300
+++ b/skins/AknSkins/sdcsrc/SDCPkgOutput.cpp	Mon May 03 13:28:06 2010 +0300
@@ -20,6 +20,7 @@
 #include "SDCException.h"
 #include "SDCInput.h"
 #include "AknsConstants.hrh"
+#include "SDCCompat.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -114,8 +115,6 @@
 
     char trgPath[256];
 
-    fprintf( file, "IF package(0x102032be) ; Check for S60 3.1 stub sis\n");
-//-------- New 3.1 compatible install directory
     if( storagePid.iPID2 == 0 )
         {
         sprintf( trgPath, "!:\\resource\\skins\\%08x", storagePid.iPID1 );
@@ -131,8 +130,6 @@
         fprintf( file, "\"%s.mif\" - \"%s\\%s.mif\"\n", aSkinName, trgPath, aSkinName );
         }
 
-    fprintf( file, "ELSE\n");
-//-------- 3.0 compatible install directory
     if( storagePid.iPID2 == 0 )
         {
         sprintf( trgPath, "!:\\private\\10207114\\import\\%08x", storagePid.iPID1 );
@@ -142,13 +139,6 @@
         sprintf( trgPath, "!:\\private\\10207114\\import\\%08x%08x", storagePid.iPID1, storagePid.iPID2 );
         }
 
-    fprintf( file, "\"%s.mbm\" - \"%s\\%s.mbm\"\n", aSkinName, trgPath, aSkinName );
-    if( aData->IsScalable() )
-        {
-        fprintf( file, "\"%s.mif\" - \"%s\\%s.mif\"\n", aSkinName, trgPath, aSkinName );
-        }
-    fprintf( file, "ENDIF\n") ;
-// ------- ENDIF
     if( drm )
         {
         fprintf( file, ";SKN file %s.skn moved to DRM definition file\n", aSkinName );
@@ -173,16 +163,16 @@
 
 
     vector<wchar_t*> soundFiles;
-    int i;
+    unsigned int i;
     for( i=0; i<aData->iStringDefVector.size(); i++ )
         {
         TSDCStringDef* entry = aData->iStringDefVector[i];
         if( entry->iIID.iMajor == EAknsMajorSound )
             {
             bool alreadyAppended = false;
-            for( int a=0; a<soundFiles.size(); a++ )
+            for( unsigned int a=0; a<soundFiles.size(); a++ )
                 {
-                if( !wcsicmp( entry->iString, soundFiles[a] ) )
+                if( ! sd_wcscasecmp( entry->iString, soundFiles[a] ) )
                     {
                     alreadyAppended = true;
                     }