Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1365460 - Remove warning exceptions for MSVC and work around them. r=njn

Browse Source 
--HG--
extra : rebase_source : 182c1e5583950f52a5eadc9fcf5d0b72ba4c56a9
This commit is contained in:
Mike Hommey 2017-05-18 12:13:34 +09:00
parent 61860e7f63
commit be0c2ffbc5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
memory/mozjemalloc/mozjemalloc.cpp
View File

@ -155,8 +155,6 @@
#include <intrin.h>
#include <algorithm>
#pragma warning( disable: 4267 4996 4146 )
#define SIZE_T_MAX SIZE_MAX
#define STDERR_FILENO 2
@ -2037,7 +2035,7 @@ malloc_rtree_set(malloc_rtree_t *rtree, uintptr_t key, void *val)
/* Return the smallest alignment multiple that is >= s. */
#define ALIGNMENT_CEILING(s, alignment) \
(((s) + (alignment - 1)) & (-(alignment)))
(((s) + (alignment - 1)) & (~(alignment - 1)))
static void *
pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size)
@ -3603,7 +3601,7 @@ ipalloc(size_t alignment, size_t size)
* will further round up to a power of two, but that never causes
* correctness issues.
*/
ceil_size = (size + (alignment - 1)) & (-alignment);
ceil_size = ALIGNMENT_CEILING(size, alignment);
/*
* (ceil_size < size) protects against the combination of maximal
* alignment and size greater than maximal alignment.