diff options
| author | Lukas Larsson <[email protected]> | 2015-07-14 16:37:41 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2015-07-14 16:37:41 +0200 |
| commit | 6cf4260ae1604cdb20ad7782d8a491edcc3310e7 (patch) | |
| tree | 226ccae99a48f4dd4d27a014b62798cefe501947 /erts/emulator/sys/common/erl_poll.h | |
| parent | 31623a16629dee45e3d3e6f33ffb0865b157301a (diff) | |
| parent | d2a0690865339a2d37badc4b79025f97b34e3d46 (diff) | |
| download | otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.gz otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.bz2 otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.zip | |
Merge branch 'lukas/ose/remove/OTP-12573'
* lukas/ose/remove/OTP-12573:
Remove OSE from erl_interface
ose: Remove all code related to the OSE port
Diffstat (limited to 'erts/emulator/sys/common/erl_poll.h')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h index 19ce582154..6d8aef822e 100644 --- a/erts/emulator/sys/common/erl_poll.h +++ b/erts/emulator/sys/common/erl_poll.h @@ -93,7 +93,7 @@ # if defined(ERTS_USE_POLL) # undef ERTS_POLL_USE_POLL # define ERTS_POLL_USE_POLL 1 -# elif !defined(__WIN32__) && !defined(__OSE__) +# elif !defined(__WIN32__) # undef ERTS_POLL_USE_SELECT # define ERTS_POLL_USE_SELECT 1 # endif @@ -104,31 +104,13 @@ typedef Uint32 ErtsPollEvents; #undef ERTS_POLL_EV_E2N -#if defined(__WIN32__) || defined(__OSE__) /* --- win32 or ose -------- */ +#if defined(__WIN32__) /* --- win32 --------------------------------------- */ #define ERTS_POLL_EV_IN 1 #define ERTS_POLL_EV_OUT 2 #define ERTS_POLL_EV_ERR 4 #define ERTS_POLL_EV_NVAL 8 -#ifdef __OSE__ - -typedef struct ErtsPollOseMsgList_ { - struct ErtsPollOseMsgList_ *next; - union SIGNAL *data; -} ErtsPollOseMsgList; - -struct erts_sys_fd_type { - SIGSELECT signo; - ErlDrvOseEventId id; - ErtsPollOseMsgList *msgs; - ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig); - ethr_mutex mtx; - void *extra; -}; - -#endif - #elif ERTS_POLL_USE_EPOLL /* --- epoll ------------------------------- */ #include <sys/epoll.h> |