aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/sys.h
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-09-30 17:02:55 +0200
committerFredrik Gustafsson <[email protected]>2013-09-30 17:02:55 +0200
commite0ecc86e35475b434efa6cccba44074ca1040b7a (patch)
tree13f1622acea6b0af4536eb739af58a351b1fb8bf /erts/emulator/beam/sys.h
parente6b5ae09d292ee0251aab875be1d3245f260b493 (diff)
parentabac2eda110a33d8310c0f9cc152d91de37f731d (diff)
downloadotp-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/beam/sys.h')
-rw-r--r--erts/emulator/beam/sys.h3
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);