aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_hash.c
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-09-11 10:09:15 +0200
committerJohn Högberg <[email protected]>2017-09-11 10:09:15 +0200
commit01455c2e5397702a887cf194c1fa12f2461e6dda (patch)
tree53b5743d7d49c4d0fad9b2e41c8dfef0523bb245 /erts/emulator/beam/erl_db_hash.c
parent8893ad1594b9ea918ede8a791407f9cae8285278 (diff)
parenta1601976d5a3eb8027a7f292b0071dd28688c51f (diff)
downloadotp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.gz
otp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.bz2
otp-01455c2e5397702a887cf194c1fa12f2461e6dda.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_db_hash.c')
-rw-r--r--erts/emulator/beam/erl_db_hash.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 25072ede97..5d49b2ea14 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -269,9 +269,6 @@ static ERTS_INLINE Sint next_slot_w(DbTableHash* tb, Uint ix,
return ix;
}
-#ifndef MIN
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#endif
/*
* Some special binary flags