diff options
| author | John Högberg <[email protected]> | 2017-09-11 10:08:47 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-11 10:08:47 +0200 |
| commit | a1601976d5a3eb8027a7f292b0071dd28688c51f (patch) | |
| tree | d76877f1acf1eb931eb91980ea73806cc173abeb /erts/emulator/beam/beam_emu.c | |
| parent | 6890d375ab3347e337eb1cecf22215e57232b5eb (diff) | |
| parent | 1e67f9542a8d1be6c1d31048db19b7abe6f47372 (diff) | |
| download | otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.tar.gz otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.tar.bz2 otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.zip | |
Merge branch 'john/erts/hoist-min-max-macros' into 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 bc83699951..b4e6c35579 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -113,10 +113,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) |