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/erl_bif_binary.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'erts/emulator/beam/erl_bif_binary.c') diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c index 756c7dce05..dcffde5777 100644 --- a/erts/emulator/beam/erl_bif_binary.c +++ b/erts/emulator/beam/erl_bif_binary.c @@ -229,13 +229,6 @@ static void dump_ac_node(ACNode *node, int indent, int ch); MYALIGN(sizeof(ACTrie))) /* Structure */ -#ifndef MAX -#define MAX(A,B) (((A) > (B)) ? (A) : (B)) -#endif - -#ifndef MIN -#define MIN(A,B) (((A) > (B)) ? (B) : (A)) -#endif /* * Callback for the magic binary */ -- cgit v1.2.3