Bug 621446: followup to investigation patch - wrap MSVC-only pragma in ifdef so other compilers don't complain about it. r=jduell
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 13 Mar 2012 14:57:28 -0700
changeset 92290 90f6b58ce0fa0e83b16bbb0670fd1c86d491bd96
parent 92289 f09cef6d248037fd673208c043a3d6f33b85e217
child 92292 2485d40bdbe5b6ae61c67e5e32067dc37c460841
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjduell
bugs621446
milestone14.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 621446: followup to investigation patch - wrap MSVC-only pragma in ifdef so other compilers don't complain about it. r=jduell
netwerk/protocol/http/HttpChannelParent.cpp
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -328,17 +328,19 @@ HttpChannelParent::RecvUpdateAssociatedC
     mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken);
     mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no);
   }
   return true;
 }
 
 // Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
 // merged to a single address.
+#ifdef _MSC_VER
 #pragma warning(disable : 4068)
+#endif
 #pragma GCC optimize ("O0")
 
 bool
 HttpChannelParent::RecvRedirect2Verify(const nsresult& result, 
                                        const RequestHeaderTuples& changedHeaders)
 {
   if (NS_SUCCEEDED(result)) {
     nsCOMPtr<nsIHttpChannel> newHttpChannel =