aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/sys.h
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-09-30 17:03:15 +0200
committerFredrik Gustafsson <[email protected]>2013-09-30 17:03:15 +0200
commit036727ce61cfbd51ece3d20a07d33c10c035ecec (patch)
tree783765a9157270e59469e33755f0c31564c52f90 /erts/emulator/beam/sys.h
parent157c52840b3a83da5f753d932acae3480bf4bfd2 (diff)
parente0ecc86e35475b434efa6cccba44074ca1040b7a (diff)
downloadotp-036727ce61cfbd51ece3d20a07d33c10c035ecec.tar.gz
otp-036727ce61cfbd51ece3d20a07d33c10c035ecec.tar.bz2
otp-036727ce61cfbd51ece3d20a07d33c10c035ecec.zip
Merge branch 'maint'
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);