aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-03-12 21:03:10 +0100
committerSverker Eriksson <[email protected]>2015-03-12 21:03:10 +0100
commitb398819d59863db76fc2ce2f0c1584254e38f3bb (patch)
tree66c2bbee43dc1433ab28aa189c8f59b91fd0bff1 /erts
parent2ae925af364d1d1a0e1f4a2693a7030e58a26018 (diff)
downloadotp-b398819d59863db76fc2ce2f0c1584254e38f3bb.tar.gz
otp-b398819d59863db76fc2ce2f0c1584254e38f3bb.tar.bz2
otp-b398819d59863db76fc2ce2f0c1584254e38f3bb.zip
erts: Fix windows bug in hashmap_info
undefined symbol 'MAX'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_map.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c
index 00ed968295..b7f07fa6c4 100644
--- a/erts/emulator/beam/erl_map.c
+++ b/erts/emulator/beam/erl_map.c
@@ -2670,7 +2670,8 @@ static Eterm hashmap_info(Process *p, Eterm node) {
do {
node = ESTACK_POP(stack);
clvl = ESTACK_POP(stack);
- lvl = MAX(lvl,clvl);
+ if (lvl < clvl)
+ lvl = clvl;
switch(primary_tag(node)) {
case TAG_PRIMARY_LIST:
nleaf++;