Bug 1423174 - Rename CS to avoid macro conflict on Solaris. r=jgilbert
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 05 Dec 2017 04:10:29 -0800
changeset 448579 eda5e8f3d9b29ab4bf758202c90c94569bce5601
parent 448578 1a51f96077609295f10a6b6715eae7738a47ee8a
child 448580 69ecf79f0dcb00e595d982a5122c8656ae20c4c6
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1423174
milestone59.0a1
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 1423174 - Rename CS to avoid macro conflict on Solaris. r=jgilbert
dom/plugins/ipc/PluginModuleParent.cpp
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -694,26 +694,26 @@ PluginModuleChromeParent::~PluginModuleC
 }
 
 void
 PluginModuleChromeParent::WriteExtraDataForMinidump()
 {
     // mCrashReporterMutex is already held by the caller
     mCrashReporterMutex.AssertCurrentThreadOwns();
 
-    typedef nsDependentCString CS;
+    typedef nsDependentCString cstring;
 
     // Get the plugin filename, try to get just the file leafname
     const std::string& pluginFile = mSubprocess->GetPluginFilePath();
     size_t filePos = pluginFile.rfind(FILE_PATH_SEPARATOR);
     if (filePos == std::string::npos)
         filePos = 0;
     else
         filePos++;
-    mCrashReporter->AddNote(NS_LITERAL_CSTRING("PluginFilename"), CS(pluginFile.substr(filePos).c_str()));
+    mCrashReporter->AddNote(NS_LITERAL_CSTRING("PluginFilename"), cstring(pluginFile.substr(filePos).c_str()));
 
     mCrashReporter->AddNote(NS_LITERAL_CSTRING("PluginName"), mPluginName);
     mCrashReporter->AddNote(NS_LITERAL_CSTRING("PluginVersion"), mPluginVersion);
 
     if (mCrashReporter) {
 #ifdef XP_WIN
         if (mPluginCpuUsageOnHang.Length() > 0) {
             mCrashReporter->AddNote(NS_LITERAL_CSTRING("NumberOfProcessors"),