From c7fbbd516cd165a719650835061f729b0c82b137 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sat, 6 Mar 2010 05:59:00 -0600
Subject: [PATCH] Bug 441324 - mingw fix

---
 memory/mozalloc/mozalloc.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h
index eb592cf595e4..29b57bae0fac 100644
--- a/memory/mozalloc/mozalloc.h
+++ b/memory/mozalloc/mozalloc.h
@@ -210,8 +210,14 @@ MOZALLOC_EXPORT void* moz_valloc(size_t size)
 #  define MOZALLOC_EXPORT_NEW
 #endif
 
+#ifdef __MINGW32__
+#define MOZALLOC_THROW_BAD_ALLOC throw(std::bad_alloc)
+#else
+#define MOZALLOC_THROW_BAD_ALLOC throw()
+#endif
+
 MOZALLOC_EXPORT_NEW MOZALLOC_INLINE
-void* operator new(size_t size) throw()
+void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC
 {
     return moz_xmalloc(size);
 }
@@ -223,7 +229,7 @@ void* operator new(size_t size, const std::nothrow_t&) throw()
 }
 
 MOZALLOC_EXPORT_NEW MOZALLOC_INLINE
-void* operator new[](size_t size) throw()
+void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC
 {
     return moz_xmalloc(size);
 }