diff options
| author | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
| commit | 21270f86ab03d976ce3137c84d21e43ce6bc404b (patch) | |
| tree | 98843d726d270f8f65fa4371761829117d01239a /erts/emulator/beam/erl_ao_firstfit_alloc.c | |
| parent | fb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (diff) | |
| parent | 356c1e9312a640ac211b6d5d4110372742acfcde (diff) | |
| download | otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.gz otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.bz2 otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c index 4e6c8b317e..396aa88e0b 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.c +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c @@ -85,9 +85,6 @@ #define SET_RED(N) (((AOFF_RBTree_t *) (N))->flags |= RED_FLG) #define SET_BLACK(N) (((AOFF_RBTree_t *) (N))->flags &= ~RED_FLG) -#undef ASSERT -#define ASSERT ASSERT_EXPR - #if 1 #define RBT_ASSERT ASSERT #else |