wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 977d6be3df40 Bug 957450 - The added "or condition" didn't prevent gonk-kk version fall into non-const definition.

Browse Source
This commit is contained in:
Marco Chen 2014-01-15 15:55:12 +08:00
parent 19fa98973b
commit e515090378
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memory/build/malloc_decls.h
View File

@ -15,7 +15,7 @@
# include "jemalloc_types.h" # include "jemalloc_types.h"
# if defined(__linux__) || (defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19)) # ifdef __linux__
typedef void * usable_ptr_t; typedef void * usable_ptr_t;
# else # else
typedef const void * usable_ptr_t; typedef const void * usable_ptr_t;

2
memory/mozjemalloc/jemalloc.c
View File

@ -6548,7 +6548,7 @@ malloc_good_size_impl(size_t size)
} }
#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19) #ifdef MOZ_MEMORY_ANDROID
MOZ_MEMORY_API size_t MOZ_MEMORY_API size_t
malloc_usable_size_impl(void *ptr) malloc_usable_size_impl(void *ptr)
#else #else