# HG changeset patch # User Shabe Razvi # Date 1247997749 -3600 # Node ID ddd6d0923b22adce25cbff5dd77e4e7db4c71a24 # Parent 6076a38bd8b4164d27b60759915836e82ffceb26 Use ossrv FCL containing sysutil.h collision fix diff -r 6076a38bd8b4 -r ddd6d0923b22 clean/sources_fcl.csv --- a/clean/sources_fcl.csv Fri Jul 17 16:25:16 2009 +0100 +++ b/clean/sources_fcl.csv Sun Jul 19 11:02:29 2009 +0100 @@ -98,7 +98,7 @@ //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml -//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml diff -r 6076a38bd8b4 -r ddd6d0923b22 clean/sysdefs/system_model_os.xml --- a/clean/sysdefs/system_model_os.xml Fri Jul 17 16:25:16 2009 +0100 +++ b/clean/sysdefs/system_model_os.xml Sun Jul 19 11:02:29 2009 +0100 @@ -612,9 +612,9 @@ - +