diff options
| author | Rickard Green <[email protected]> | 2014-01-28 14:29:13 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-01-28 14:29:13 +0100 |
| commit | 566a2ef07e3635bfa65d371505c61b43be82f617 (patch) | |
| tree | 725c62f19c62a3011a0d3218db8c5ca4a5326363 /erts/emulator/sys | |
| parent | e0001b1311dc3182793e21f598dabf15053aead7 (diff) | |
| parent | 8ff33cff02d01b2b4f20769cbd77c5ef23b01631 (diff) | |
| download | otp-566a2ef07e3635bfa65d371505c61b43be82f617.tar.gz otp-566a2ef07e3635bfa65d371505c61b43be82f617.tar.bz2 otp-566a2ef07e3635bfa65d371505c61b43be82f617.zip | |
Merge branch 'vinoski/rm-drv-async-cancel'
OTP-11628
* vinoski/rm-drv-async-cancel:
remove deprecated driver_async_cancel function
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_dyn_driver.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/sys/win32/erl_win_dyn_driver.h b/erts/emulator/sys/win32/erl_win_dyn_driver.h index b9a9838a36..4010d939e5 100644 --- a/erts/emulator/sys/win32/erl_win_dyn_driver.h +++ b/erts/emulator/sys/win32/erl_win_dyn_driver.h @@ -82,7 +82,6 @@ WDD_TYPEDEF(int, erl_drv_send_term, (ErlDrvTermData, ErlDrvTermData, ErlDrvTermD WDD_TYPEDEF(int, driver_send_term, (ErlDrvPort, ErlDrvTermData, ErlDrvTermData*, int)); WDD_TYPEDEF(unsigned int, driver_async_port_key, (ErlDrvPort)); WDD_TYPEDEF(long, driver_async, (ErlDrvPort,unsigned int*,void (*)(void*),void*,void (*)(void*))); -WDD_TYPEDEF(int, driver_async_cancel, (unsigned int)); WDD_TYPEDEF(int, driver_lock_driver, (ErlDrvPort)); WDD_TYPEDEF(void *, driver_dl_open, (char *)); WDD_TYPEDEF(void *, driver_dl_sym, (void *, char *)); @@ -200,7 +199,6 @@ typedef struct { WDD_FTYPE(driver_send_term) *driver_send_term; WDD_FTYPE(driver_async_port_key) *driver_async_port_key; WDD_FTYPE(driver_async) *driver_async; - WDD_FTYPE(driver_async_cancel) *driver_async_cancel; WDD_FTYPE(driver_lock_driver) *driver_lock_driver; WDD_FTYPE(driver_dl_open) *driver_dl_open; WDD_FTYPE(driver_dl_sym) *driver_dl_sym; @@ -312,7 +310,6 @@ extern TWinDynDriverCallbacks WinDynDriverCallbacks; #define driver_send_term (WinDynDriverCallbacks.driver_send_term) #define driver_async_port_key (WinDynDriverCallbacks.driver_async_port_key) #define driver_async (WinDynDriverCallbacks.driver_async) -#define driver_async_cancel (WinDynDriverCallbacks.driver_async_cancel) #define driver_lock_driver (WinDynDriverCallbacks.driver_lock_driver) #define driver_dl_open (WinDynDriverCallbacks.driver_dl_open) #define driver_dl_sym (WinDynDriverCallbacks.driver_dl_sym) @@ -448,7 +445,6 @@ do { \ ((W).driver_send_term) = driver_send_term; \ ((W).driver_async_port_key) = driver_async_port_key; \ ((W).driver_async) = driver_async; \ -((W).driver_async_cancel) = driver_async_cancel; \ ((W).driver_lock_driver) = driver_lock_driver; \ ((W).driver_dl_open) = driver_dl_open; \ ((W).driver_dl_sym) = driver_dl_sym; \ |