Bug 586325 - Maemo5/6 build bustage. cast fix. r=benjamin.
authorOleg Romashin <romaxa@gmail.com>
Wed, 11 Aug 2010 18:21:43 -0700
changeset 49690 b5039f0659cab0de619bafebf6d30fe00b046053
parent 49689 812cdded39a16c891f650bd48dadfe4200db475e
child 49691 27c2719d5cad659b2efb22e700a9aaf801987fd8
push id15029
push userromaxa@gmail.com
push dateThu, 12 Aug 2010 11:16:52 +0000
treeherderautoland@27c2719d5cad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin
bugs586325
milestone2.0b4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 586325 - Maemo5/6 build bustage. cast fix. r=benjamin.
intl/locale/src/nsLocaleService.cpp
--- a/intl/locale/src/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp
@@ -174,27 +174,27 @@ nsLocaleService::nsLocaleService(void)
         int i;
 
         resultLocale = new nsLocale();
         if ( resultLocale == NULL ) { 
             return; 
         }
 
         // Get system configuration
-        char* lang = getenv("LANG");
+        const char* lang = getenv("LANG");
 #if (MOZ_PLATFORM_MAEMO >= 6)
         nsCAutoString gconfLocaleString;
         nsresult rv;
         nsCOMPtr<nsIGConfService> gconf =
             do_GetService(NS_GCONFSERVICE_CONTRACTID, &rv);
         if (NS_SUCCEEDED(rv)) {
             rv = gconf->GetString(NS_LITERAL_CSTRING("/meegotouch/i18n/language"),
                                   gconfLocaleString);
             if (NS_SUCCEEDED(rv) && !gconfLocaleString.IsEmpty()) {
-                lang = static_cast<const char*>(gconfLocaleString.get());
+                lang = gconfLocaleString.get();
                 // For setlocale() doing the right thing we need to export
                 // this as LANG to the environment
                 setenv("LANG", lang, 1);
             }
         }
 #endif
         for( i = 0; i < LocaleListLength; i++ ) {
             nsresult result;