Merge branch 'sverker/enif_select/OTP-13684'

* sverker/enif_select: (31 commits)
  Remove debug printout and comment
  Fix nif_SUITE:select for old linux
  Add docs for enif_compare_monitors and ErlNifMonitor
  Fix ErlNifMonitor handling
  Remove faulty debug ASSERT
  erts: Skip nif_SUITE:select on windows
  Fix enif_select for windows
  Fix whitebox monitor tests
  Fix erl_nif doc
  Expand nif_SUITE:monitor_frenzy to verify dtor calls
  Expand nif_SUITE:monitor_frenzy with binary_to_term
  erts: Avoid revival of dying resource by dec_term
  erts: Add enif_compare_monitors
  erts: Try fix enif_select for windows
  erts: Change return value for enif_select
  erts: Add pid argument to enif_select
  erts: Beautify enif_select
  erts: Fix bad_fd_in_pollset error case for enif_select
  erts: Add enif_monitor_process and enif_demonitor_process
  erts: Rename ErlNifResource as ErtsResource
  ...

1 files changed, 4 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 97a69140c3..b386b68cff 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -76,11 +76,10 @@ typedef struct {
 #  endif
 #endif
 
-/* Values for mode arg to driver_select() */
-#define ERL_DRV_READ  (1 << 0)
-#define ERL_DRV_WRITE (1 << 1)
-#define ERL_DRV_USE   (1 << 2)
-#define ERL_DRV_USE_NO_CALLBACK (ERL_DRV_USE | (1 << 3))
+#define ERL_DRV_READ  ((int)ERL_NIF_SELECT_READ)
+#define ERL_DRV_WRITE ((int)ERL_NIF_SELECT_WRITE)
+#define ERL_DRV_USE   ((int)ERL_NIF_SELECT_STOP)
+#define ERL_DRV_USE_NO_CALLBACK (ERL_DRV_USE | (ERL_DRV_USE  << 1))
 
 /* Old deprecated */
 #define DO_READ  ERL_DRV_READ
@@ -176,13 +175,6 @@ struct erl_drv_event_data {
 #endif
 typedef struct erl_drv_event_data *ErlDrvEventData; /* Event data */
 
-/*
- * A driver monitor
- */
-typedef struct {
-    unsigned char data[sizeof(void *)*4];
-} ErlDrvMonitor;
-
 typedef struct {
     unsigned long megasecs;
     unsigned long secs;