Committed to both google/gcc-4_6-google and google/gcc-4_6-mobile (mobile release branch).
Diego, I just realize we need this patch for google/gcc-main, since it is a local patch. OK? Thanks, Jing On Thu, Dec 15, 2011 at 4:42 AM, Diego Novillo <dnovi...@google.com> wrote: > On 11-12-14 13:43 , Jing Yu wrote: > >> Index: config/locale/generic/c_locale.cc >> =================================================================== >> --- config/locale/generic/c_locale.cc (revision 182019) >> +++ config/locale/generic/c_locale.cc (working copy) >> @@ -52,8 +52,8 @@ >> { >> // Assumes __s formatted for "C" locale. >> char* __old = setlocale(LC_ALL, 0); >> - char* __sav = NULL; >> - if (__old != NULL) >> + char* __sav = 0; >> + if (__old != 0) > > > > Just 'if (__old)', as Paolo suggested. Similarly in all the other uses. > > > OK with that change. > > > Diego.