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/beam_emu.c | |
| 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/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 3dce16aedd..55990362ff 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -107,10 +107,6 @@ do { \ # define CHECK_ARGS(T) #endif -#ifndef MAX -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) -#endif - #define GET_BIF_MODULE(p) (p->info.mfa.module) #define GET_BIF_FUNCTION(p) (p->info.mfa.function) #define GET_BIF_ARITY(p) (p->info.mfa.arity) |