diff options
| author | Micael Karlberg <[email protected]> | 2019-03-13 12:34:04 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-03-13 12:34:04 +0100 |
| commit | 3e5ef9fcf66e180899828fad24da67ede9ed4450 (patch) | |
| tree | 005dd7536e5935aacaf698db206f25f5cc4c1f43 | |
| parent | 18974565f81655a3ceb04c0aaf6decb51f2a22c9 (diff) | |
| parent | 37e4f15b1eec4c0f39f08d9fb5478507397888c1 (diff) | |
| download | otp-3e5ef9fcf66e180899828fad24da67ede9ed4450.tar.gz otp-3e5ef9fcf66e180899828fad24da67ede9ed4450.tar.bz2 otp-3e5ef9fcf66e180899828fad24da67ede9ed4450.zip | |
Merge branch 'bmk/20190306/win32_fixes'
| -rw-r--r-- | erts/emulator/nifs/common/socket_nif.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c index cbfe587e6a..bb3df85ea4 100644 --- a/erts/emulator/nifs/common/socket_nif.c +++ b/erts/emulator/nifs/common/socket_nif.c @@ -962,6 +962,7 @@ ESOCK_NIF_FUNCS #undef ESOCK_NIF_FUNC_DEF +#if !defined(__WIN32__) /* And here comes the functions that does the actual work (for the most part) */ static ERL_NIF_TERM nsupports(ErlNifEnv* env, int key); static ERL_NIF_TERM nsupports_options(ErlNifEnv* env); @@ -2373,6 +2374,7 @@ static int esock_demonitor(const char* slogan, ESockMonitor* monP); static void esock_monitor_init(ESockMonitor* mon); +#endif // if defined(__WIN32__) /* #if defined(HAVE_SYS_UN_H) || defined(SO_BINDTODEVICE) @@ -2389,6 +2391,9 @@ static void socket_down(ErlNifEnv* env, void* obj, const ErlNifPid* pid, const ErlNifMonitor* mon); + +#if !defined(__WIN32__) + static void socket_down_acceptor(ErlNifEnv* env, SocketDescriptor* descP, ERL_NIF_TERM sockRef, @@ -2443,6 +2448,8 @@ static BOOLEAN_T extract_debug(ErlNifEnv* env, static BOOLEAN_T extract_iow(ErlNifEnv* env, ERL_NIF_TERM map); +#endif // if defined(__WIN32__) + static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info); |