aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_binary.h
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-05-18 14:33:52 +0200
committerSverker Eriksson <[email protected]>2018-05-18 14:33:52 +0200
commit6024dea0b587518aa222fa198f007d7e069a89b1 (patch)
tree44720659fa2061061095ad17956fda651af12a9d /erts/emulator/beam/erl_binary.h
parenta01ffa40c55380a9749c17458d0156443e415b5e (diff)
parente7579f608a1bdb52271c57e9ad69a7752ea1371b (diff)
downloadotp-6024dea0b587518aa222fa198f007d7e069a89b1.tar.gz
otp-6024dea0b587518aa222fa198f007d7e069a89b1.tar.bz2
otp-6024dea0b587518aa222fa198f007d7e069a89b1.zip
Merge branch 'sverker/ets-delete_all_objects-trap/OTP-15078'
* sverker/ets-delete_all_objects-trap/OTP-15078: erts: Rename untrapping db_free_*empty*_table erts: Make ets:delete_all_objects yield on fixed table erts: Optimize ets delete all in fixed table erts: Refactor ets select iteration code erts: Cleanup ets code erts: Optimize ets hash object deallocactions erts: Refactor pseudo deleted ets objects erts: Make atomic ets:delete_all_objects yield erts: Fix reduction bump for ets:delete/1
Diffstat (limited to 'erts/emulator/beam/erl_binary.h')
-rw-r--r--erts/emulator/beam/erl_binary.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h
index 46653a8580..7dfd0c273a 100644
--- a/erts/emulator/beam/erl_binary.h
+++ b/erts/emulator/beam/erl_binary.h
@@ -146,9 +146,7 @@ typedef union {
/* A "magic" binary flag */
#define BIN_FLAG_MAGIC 1
-#define BIN_FLAG_USR1 2 /* Reserved for use by different modules too mark */
-#define BIN_FLAG_USR2 4 /* certain binaries as special (used by ets) */
-#define BIN_FLAG_DRV 8
+#define BIN_FLAG_DRV 2
#endif /* ERL_BINARY_H__TYPES__ */