diff options
| author | John Högberg <[email protected]> | 2017-09-11 10:09:15 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-11 10:09:15 +0200 |
| commit | 01455c2e5397702a887cf194c1fa12f2461e6dda (patch) | |
| tree | 53b5743d7d49c4d0fad9b2e41c8dfef0523bb245 /erts/emulator/beam/erl_alloc_util.h | |
| parent | 8893ad1594b9ea918ede8a791407f9cae8285278 (diff) | |
| parent | a1601976d5a3eb8027a7f292b0071dd28688c51f (diff) | |
| download | otp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.gz otp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.bz2 otp-01455c2e5397702a887cf194c1fa12f2461e6dda.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 30d7baf769..faeb5ef368 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -230,10 +230,6 @@ void erts_lcnt_update_allocator_locks(int enable); # endif #endif -#undef MIN -#undef MAX -#define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) -#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) #define FLOOR(X, I) (((X)/(I))*(I)) #define CEILING(X, I) ((((X) - 1)/(I) + 1)*(I)) |