aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_hash.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_db_hash.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_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 ae9322dfd3..cf928a9035 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -288,9 +288,6 @@ static ERTS_INLINE Sint next_slot_w(DbTableHash* tb, Uint ix,
#endif
}
-#ifndef MIN
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#endif
/*
* Some special binary flags