diff options
author | Rickard Green <[email protected]> | 2013-09-25 16:26:42 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2013-09-25 16:26:42 +0200 |
commit | 3eff4c3108492366c8bde3e007f648fd99bd04a4 (patch) | |
tree | f6e3501ad0fb687c0a7e7cba377b3e2adc9de1c4 /erts/emulator/sys/win32/erl_win_sys.h | |
parent | 20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff) | |
parent | cabfe2cdc0b8d879431f81233addd2a43ff1f742 (diff) | |
download | otp-3eff4c3108492366c8bde3e007f648fd99bd04a4.tar.gz otp-3eff4c3108492366c8bde3e007f648fd99bd04a4.tar.bz2 otp-3eff4c3108492366c8bde3e007f648fd99bd04a4.zip |
Merge branch 'rickard/aligned-sys_alloc-carriers/OTP-11318' into rickard/aligned-sys_alloc-carriers_maint/OTP-11318
Conflicts:
erts/emulator/beam/erl_alloc.c
erts/emulator/beam/erl_alloc_util.c
erts/emulator/beam/erl_alloc_util.h
Diffstat (limited to 'erts/emulator/sys/win32/erl_win_sys.h')
-rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 5ce1a61303..c44c5d9492 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -95,6 +95,8 @@ # define ERTS_I64_LITERAL(X) X##i64 #endif +#define ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC 1 + /* * Practial Windows specific macros. */ |