# HG changeset patch
# User t_mrc-ct@users.osdn.jp
# Date 1436092744 -32400
#      Sun Jul 05 19:39:04 2015 +0900
# Branch THUNDERBIRD3880_2016050308_RELBRANCH
# Node ID 72cbe113aa338c894c01135f148926bc4d0f2959
# Parent  cf842b8551aa2fb937657dedb6923979ccbe1ca4
variable name 'override' brings build error

diff --git a/mail/components/migration/src/nsMailProfileMigratorUtils.cpp b/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
--- a/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
+++ b/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
@@ -32,30 +32,30 @@
 }
 
 void ParseOverrideServers(const char* aServers, nsIPrefBranch* aBranch)
 {
   // Windows (and Opera) formats its proxy override list in the form:
   // server;server;server where server is a server name or ip address,
   // or "<local>". Mozilla's format is server,server,server, and <local>
   // must be translated to "localhost,127.0.0.1"
-  nsAutoCString override(aServers);
+  nsAutoCString overrideServer(aServers);
   int32_t left = 0, right = 0;
   for (;;) {
-    right = override.FindChar(';', right);
-    const nsACString& host = Substring(override, left,
-                                       (right < 0 ? override.Length() : right) - left);
+    right = overrideServer.FindChar(';', right);
+    const nsACString& host = Substring(overrideServer, left,
+                                       (right < 0 ? overrideServer.Length() : right) - left);
     if (host.Equals("<local>"))
-      override.Replace(left, 7, NS_LITERAL_CSTRING("localhost,127.0.0.1"));
+      overrideServer.Replace(left, 7, NS_LITERAL_CSTRING("localhost,127.0.0.1"));
     if (right < 0)
       break;
     left = right + 1;
-    override.Replace(right, 1, NS_LITERAL_CSTRING(","));
+    overrideServer.Replace(right, 1, NS_LITERAL_CSTRING(","));
   }
-  aBranch->SetCharPref("network.proxy.no_proxies_on", override.get());
+  aBranch->SetCharPref("network.proxy.no_proxies_on", overrideServer.get());
 }
 
 void GetMigrateDataFromArray(MigrationData* aDataArray, int32_t aDataArrayLength,
                              bool aReplace, nsIFile* aSourceProfile,
                              uint16_t* aResult)
 {
   nsCOMPtr<nsIFile> sourceFile;
   bool exists;
