diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
| commit | e0ecc86e35475b434efa6cccba44074ca1040b7a (patch) | |
| tree | 13f1622acea6b0af4536eb739af58a351b1fb8bf /erts/emulator/sys/common/erl_mseg.h | |
| parent | e6b5ae09d292ee0251aab875be1d3245f260b493 (diff) | |
| parent | abac2eda110a33d8310c0f9cc152d91de37f731d (diff) | |
| download | otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.gz otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.bz2 otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.zip | |
Merge branch 'maint-r16' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/emulator/sys/common/erl_mseg.h')
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h index a4f250ceab..a1b000f51c 100644 --- a/erts/emulator/sys/common/erl_mseg.h +++ b/erts/emulator/sys/common/erl_mseg.h @@ -32,13 +32,13 @@ #if HAVE_MMAP # define HAVE_ERTS_MSEG 1 -# define HAVE_SUPER_ALIGNED_MB_CARRIERS 1 +# define ERTS_HAVE_MSEG_SUPER_ALIGNED 1 #else # define HAVE_ERTS_MSEG 0 -# define HAVE_SUPER_ALIGNED_MB_CARRIERS 0 +# define ERTS_HAVE_MSEG_SUPER_ALIGNED 0 #endif -#if HAVE_SUPER_ALIGNED_MB_CARRIERS +#if ERTS_HAVE_MSEG_SUPER_ALIGNED # define MSEG_ALIGN_BITS (18) /* Affects hard limits for sbct and lmbcs documented in erts_alloc.xml */ #else |