diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2020-05-03 21:59:11 +0200 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2020-05-03 21:59:11 +0200 |
| commit | 1dd716db81d4c7af19ac429239776e8457435ac5 (patch) | |
| tree | cbd20f06dabc5f44101fc5be3df97ec9a3b3b9f7 /erts/emulator | |
| parent | 4c6d0914b97bdb74be22310ba286f2cd9c97281e (diff) | |
| parent | 1c389dfc4c45dba088c799ce21252dcb81d0bb03 (diff) | |
| download | erlang-1dd716db81d4c7af19ac429239776e8457435ac5.tar.gz | |
Merge branch 'sverker/win-compile-warnings-master/OTP-15800'
* sverker/win-compile-warnings-master/OTP-15800:
erts: Change type ErlDrvEvent from long to SWord for sys-drivers
erl_interface: Fix Windows C compiler warnings
erts: Fix Windows C compiler warnings
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_bif_persistent.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_sys_driver.h | 2 | ||||
| -rw-r--r-- | erts/emulator/nifs/common/prim_socket_nif.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_bif_persistent.c b/erts/emulator/beam/erl_bif_persistent.c index efdffb39fb..91cc03fe57 100644 --- a/erts/emulator/beam/erl_bif_persistent.c +++ b/erts/emulator/beam/erl_bif_persistent.c @@ -1101,7 +1101,7 @@ static OldLiteral* alloc_old_literal(void) static void free_old_literal(OldLiteral* olp) { - return erts_free(ERTS_ALC_T_RELEASE_LAREA, olp); + erts_free(ERTS_ALC_T_RELEASE_LAREA, olp); } static void diff --git a/erts/emulator/beam/erl_sys_driver.h b/erts/emulator/beam/erl_sys_driver.h index a58f11036c..85c2d6c4ca 100644 --- a/erts/emulator/beam/erl_sys_driver.h +++ b/erts/emulator/beam/erl_sys_driver.h @@ -31,7 +31,7 @@ #define ERL_SYS_DRV -typedef long ErlDrvEvent; /* An event to be selected on. */ +typedef SWord ErlDrvEvent; /* An event to be selected on. */ typedef struct _SysDriverOpts SysDriverOpts; diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c index a79601e156..3ecc2a6b54 100644 --- a/erts/emulator/nifs/common/prim_socket_nif.c +++ b/erts/emulator/nifs/common/prim_socket_nif.c @@ -2793,7 +2793,7 @@ static size_t my_strnlen(const char *s, size_t maxlen); static void esock_dtor(ErlNifEnv* env, void* obj); static void esock_stop(ErlNifEnv* env, void* obj, - int fd, + ErlNifEvent fd, int is_direct_call); static void esock_down(ErlNifEnv* env, void* obj, @@ -21362,7 +21362,7 @@ void esock_dtor(ErlNifEnv* env, void* obj) * */ static -void esock_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call) +void esock_stop(ErlNifEnv* env, void* obj, ErlNifEvent fd, int is_direct_call) { #if !defined(__WIN32__) ESockDescriptor* descP = (ESockDescriptor*) obj; |