aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2013-09-25 16:26:42 +0200
committerRickard Green <rickard@erlang.org>2013-09-25 16:26:42 +0200
commit3eff4c3108492366c8bde3e007f648fd99bd04a4 (patch)
treef6e3501ad0fb687c0a7e7cba377b3e2adc9de1c4 /erts/configure.in
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
parentcabfe2cdc0b8d879431f81233addd2a43ff1f742 (diff)
downloadotp-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/configure.in')
-rw-r--r--erts/configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 00c7045ea2..f17f4cb5c8 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1974,8 +1974,8 @@ AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite memmove strerror strerror_r strncasecmp \
- gethrtime localtime_r gmtime_r inet_pton mmap mremap memcpy mallopt \
- sbrk _sbrk __sbrk brk _brk __brk \
+ gethrtime localtime_r gmtime_r inet_pton posix_memalign \
+ mmap mremap memcpy mallopt sbrk _sbrk __sbrk brk _brk __brk \
flockfile fstat strlcpy strlcat setsid posix2time time2posix \
setlocale nl_langinfo poll])