nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 441324 - mingw fix

Browse source
This commit is contained in:
Jacek Caban 2010-03-06 05:59:00 -06:00
parent 76eec45c74
commit c7fbbd516c
1 changed files with 8 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
memory/mozalloc/mozalloc.h
View file

@ -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);
}