diff options
| author | Rickard Green <[email protected]> | 2015-11-12 16:15:05 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-11-12 16:15:05 +0100 |
| commit | 4f815fab536a3ec1839c2590b8f4f169a27fccac (patch) | |
| tree | 49d1539f21954ffcdcb2523de1319d2d3efbf0ef /erts/configure.in | |
| parent | ef72a791f4dc9a1816ac8ff95a612409b86de818 (diff) | |
| parent | 3ac08f9b668613a4292436979eacc61863c2ab94 (diff) | |
| download | otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.tar.gz otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.tar.bz2 otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.zip | |
Merge branch 'rickard/ohmq/OTP-13047'
* rickard/ohmq/OTP-13047:
Fragmented young heap generation and off_heap_message_queue option
Refactor GC
Introduce literal tag
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_gc.c
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index a4700fc308..2419925c33 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3711,7 +3711,7 @@ dnl crypto # #-------------------------------------------------------------------- -DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE" +DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE -I${ERL_TOP}/erts/emulator/sys/common" if test "X$ETHR_DEFS" = "X"; then DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT" |