diff options
| author | Erlang/OTP <[email protected]> | 2013-09-27 17:15:53 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-09-27 17:15:53 +0200 |
| commit | 703102398fb204bbb606a2d08b70a0f15e94a3e6 (patch) | |
| tree | f6e3501ad0fb687c0a7e7cba377b3e2adc9de1c4 /erts/emulator/beam/sys.h | |
| parent | 589a9ed126d205007e79c22053d1b156a383d99f (diff) | |
| parent | 3eff4c3108492366c8bde3e007f648fd99bd04a4 (diff) | |
| download | otp-703102398fb204bbb606a2d08b70a0f15e94a3e6.tar.gz otp-703102398fb204bbb606a2d08b70a0f15e94a3e6.tar.bz2 otp-703102398fb204bbb606a2d08b70a0f15e94a3e6.zip | |
Merge branch 'rickard/aligned-sys_alloc-carriers_maint/OTP-11318' into maint-r16
* rickard/aligned-sys_alloc-carriers_maint/OTP-11318:
Implement platform specific aligned sys_alloc and use when supported
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 05bff430e3..096394b878 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -1012,6 +1012,9 @@ void erl_bin_write(unsigned char *, int, int); #define ERTS_SMALL_ABS(Small) labs(Small) #endif +#ifndef ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC +# define ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC 0 +#endif #ifdef __WIN32__ void call_break_handler(void); |