From 1e67f9542a8d1be6c1d31048db19b7abe6f47372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20H=C3=B6gberg?= Date: Thu, 7 Sep 2017 08:18:11 +0200 Subject: Replace ad-hoc MIN/MAX macros with common ones Besides being noisy, they were already defined by a global Unix- specific header, causing the Windows build to fail if one forgot to define them. --- erts/emulator/beam/beam_emu.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'erts/emulator/beam/beam_emu.c') 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) -- cgit v1.2.3