diff options
| author | Christopher Ferris <cferris@google.com> | 2016-11-08 14:47:48 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2016-11-10 12:20:42 -0800 |
| commit | fb1f094f163a3bf15d8958ba845e83559c0e6dfe (patch) | |
| tree | b0605297b74ae918b10f34a37916e79e2ba63d13 /include/jemalloc/jemalloc.h | |
| parent | 00fa4482d89786a43fb6f76d6e86996e1587e16f (diff) | |
| parent | 0110fa8451af905affd77c3bea0d545fee2251b2 (diff) | |
| download | jemalloc-fb1f094f163a3bf15d8958ba845e83559c0e6dfe.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-new' into fix
Included in this change are all of the updated generated files.
Bug: 32673024
Test: Built the angler build (normal config) and the volantis build
Test: (svelte config). Ran memory_replay 32 bit and 64 bit on both
Test: platforms before and after and verified results are similar.
Test: Ran bionic unit tests and jemalloc unit tests.
Test: Verified that two jemalloc unit test failures are due to
Test: Android extension that puts all large chunks on arena 0.
Change-Id: I12428bdbe15f51383489c9a1d72d687499fff01b
Diffstat (limited to 'include/jemalloc/jemalloc.h')
| -rw-r--r-- | include/jemalloc/jemalloc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h index c983dc8..7706510 100644 --- a/include/jemalloc/jemalloc.h +++ b/include/jemalloc/jemalloc.h @@ -94,12 +94,12 @@ extern "C" { #include <limits.h> #include <strings.h> -#define JEMALLOC_VERSION "4.2.1-0-g3de035335255d553bdb344c32ffdb603816195d8" +#define JEMALLOC_VERSION "4.3.1-0-g0110fa8451af905affd77c3bea0d545fee2251b2" #define JEMALLOC_VERSION_MAJOR 4 -#define JEMALLOC_VERSION_MINOR 2 +#define JEMALLOC_VERSION_MINOR 3 #define JEMALLOC_VERSION_BUGFIX 1 #define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "3de035335255d553bdb344c32ffdb603816195d8" +#define JEMALLOC_VERSION_GID "0110fa8451af905affd77c3bea0d545fee2251b2" # define MALLOCX_LG_ALIGN(la) ((int)(la)) # if LG_SIZEOF_PTR == 2 @@ -127,7 +127,7 @@ extern "C" { # define JEMALLOC_CXX_THROW #endif -#if defined(_MSC_VER) +#if _MSC_VER # define JEMALLOC_ATTR(s) # define JEMALLOC_ALIGNED(s) __declspec(align(s)) # define JEMALLOC_ALLOC_SIZE(s) |