diff options
author | Micael Karlberg <[email protected]> | 2019-01-31 11:34:03 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2019-02-01 17:35:53 +0100 |
commit | 875825874d4a8d52ec5cc593f5024afc696c29df (patch) | |
tree | 630ae902108597454cb9bb1670f4c14351932c5f /erts/emulator/nifs/common/socket_tarray.h | |
parent | 060338c0a6904cc4aaf5226dc7fb321ad3d23862 (diff) | |
download | otp-875825874d4a8d52ec5cc593f5024afc696c29df.tar.gz otp-875825874d4a8d52ec5cc593f5024afc696c29df.tar.bz2 otp-875825874d4a8d52ec5cc593f5024afc696c29df.zip |
[socket-nif] nosup expection of win32 and type(s) replacements
The nif callback functions (nif_open) now instead cause an
'nosup' exception if called (instead of badarg).
The basic type uint16_t, uint32_t and int32_t (C99) replaced
"own" (that is, defined by "us") types Uint16, Uint32 and
Sint32.
The point of this is that our Windows build system seems to
be a bit lacking when it comes to types...
Removed "some stuff" that was if-defed. Different solution
when win32 support for sockets has been improved.
Make sure the socket_*.c util modules are not included
in the building for windows.
OTP-15526
Diffstat (limited to 'erts/emulator/nifs/common/socket_tarray.h')
-rw-r--r-- | erts/emulator/nifs/common/socket_tarray.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/nifs/common/socket_tarray.h b/erts/emulator/nifs/common/socket_tarray.h index 4d78d2ccb7..4f1152fb9e 100644 --- a/erts/emulator/nifs/common/socket_tarray.h +++ b/erts/emulator/nifs/common/socket_tarray.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2018-2018. All Rights Reserved. + * Copyright Ericsson AB 2018-2019. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +29,9 @@ typedef void* SocketTArray; -extern SocketTArray esock_tarray_create(uint32_t sz); +extern SocketTArray esock_tarray_create(Uint32 sz); extern void esock_tarray_delete(SocketTArray ta); -extern uint32_t esock_tarray_sz(SocketTArray ta); +extern Uint32 esock_tarray_sz(SocketTArray ta); extern void esock_tarray_add(SocketTArray ta, ERL_NIF_TERM t); extern void esock_tarray_tolist(SocketTArray ta, ErlNifEnv* env, |