Fix build with gcc<4.5.

For example, fix build on DragonFly 3.0.1.
See https://bugzilla.mozilla.org/show_bug.cgi?id=621446
This commit is contained in:
ryoon 2012-03-23 22:01:45 +00:00
parent 5371baabab
commit bab44dddfe
2 changed files with 26 additions and 4 deletions

View file

@ -1,11 +1,8 @@
$NetBSD: distinfo,v 1.77 2012/03/19 20:28:11 ryoon Exp $
$NetBSD: distinfo,v 1.78 2012/03/23 22:01:45 ryoon Exp $
SHA1 (comm-release-f60c071e187b.tar.bz2) = 7b3770d918a7662688d6641bc367c1c375bc7200
RMD160 (comm-release-f60c071e187b.tar.bz2) = e1efa6624eaf565b95f7e9d68ca04a3cbbe47f05
Size (comm-release-f60c071e187b.tar.bz2) = 2261054 bytes
SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4
RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51
Size (enigmail-1.4.tar.gz) = 1323467 bytes
SHA1 (seamonkey-2.8.source.tar.bz2) = 8f5ef8cb2a3ac495add99fb3394d8c007a5d91af
RMD160 (seamonkey-2.8.source.tar.bz2) = 7aa190c00585cf9cb2f7bccbdf58e6c980be344c
Size (seamonkey-2.8.source.tar.bz2) = 101616662 bytes
@ -86,6 +83,7 @@ SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = 953932b7eaab97580738c2cddb
SHA1 (patch-mozilla_js_src_yarr_pcre_pcre.h) = ccfdd5ecd8db100c3aea9222a5c8142f5f248f6c
SHA1 (patch-mozilla_media_libvpx_vpx_config.h) = f92424a5a4c27cd8d2304dbb9637d3600d32f958
SHA1 (patch-mozilla_media_libvpx_vpx_config_c.c) = f38806e2917654b0379fe514295ee66795451cf2
SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = 3c245b1c3b61a4244c47760a0b9d4158f4abe13a
SHA1 (patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg) = d67879a3eeab10fc43211ab48d03e6903b166c92
SHA1 (patch-mozilla_nsprpub_pr_include_md___pth.h) = 28ebe7ed1487b3a535995db38031053662441f51
SHA1 (patch-mozilla_nsprpub_pr_include_md_prosdep.h) = eb3e0263277bd9fbe12917ae2eeded603b81e0ae

View file

@ -0,0 +1,24 @@
$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.1 2012/03/23 22:01:45 ryoon Exp $
* Fix build with gcc<4.5, for example, DragonFly 3.0.1.
See https://bugzilla.mozilla.org/show_bug.cgi?id=621446
--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-03-13 02:43:37.000000000 +0000
+++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp
@@ -333,10 +333,15 @@ HttpChannelParent::RecvUpdateAssociatedC
return true;
}
-// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
+// Bug 621446 investigation, we don't want conditional PR_Aborts below to be
// merged to a single address.
#pragma warning(disable : 4068)
+// Compiling with a version of GCC <= 4.4 fails with an internal compiler
+// error.
+#if !defined(__GNUC__) || \
+ (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
#pragma GCC optimize ("O0")
+#endif
bool
HttpChannelParent::RecvRedirect2Verify(const nsresult& result,