aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_bif_binary.c
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-09-11 10:08:47 +0200
committerJohn Högberg <[email protected]>2017-09-11 10:08:47 +0200
commita1601976d5a3eb8027a7f292b0071dd28688c51f (patch)
treed76877f1acf1eb931eb91980ea73806cc173abeb /erts/emulator/beam/erl_bif_binary.c
parent6890d375ab3347e337eb1cecf22215e57232b5eb (diff)
parent1e67f9542a8d1be6c1d31048db19b7abe6f47372 (diff)
downloadotp-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/erl_bif_binary.c')
-rw-r--r--erts/emulator/beam/erl_bif_binary.c7
1 files changed, 0 insertions, 7 deletions
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
*/