diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-17 21:02:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-17 21:02:12 +0200 |
| commit | 82ccabbf205a88b1c5dd9f0a0f19c138968f879f (patch) | |
| tree | 01e58e8c24b2bac40a51f4c2fe2745b38de7c748 /drivers/unix/net_socket_posix.cpp | |
| parent | f3b2c4877bd17b74a8eecf808919603336cb9316 (diff) | |
| parent | 84e24017b03ab2e4675281610e22f549e9991f79 (diff) | |
| download | redot-engine-82ccabbf205a88b1c5dd9f0a0f19c138968f879f.tar.gz | |
Merge pull request #97098 from pafuent/picking_right_type_for_get_available_bytes
Add a macro on `NetSocketPosix` to pick the right type for `FIONREAD` `len` parameter
Diffstat (limited to 'drivers/unix/net_socket_posix.cpp')
| -rw-r--r-- | drivers/unix/net_socket_posix.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp index 1e52b39be1..5caa33100e 100644 --- a/drivers/unix/net_socket_posix.cpp +++ b/drivers/unix/net_socket_posix.cpp @@ -67,6 +67,7 @@ #define SOCK_BUF(x) x #define SOCK_CBUF(x) x #define SOCK_IOCTL ioctl +#define SOCK_FIONREAD_LEN_TYPE int #define SOCK_CLOSE ::close #define SOCK_CONNECT(p_sock, p_addr, p_addr_len) ::connect(p_sock, p_addr, p_addr_len) @@ -81,6 +82,7 @@ #define SOCK_BUF(x) (char *)(x) #define SOCK_CBUF(x) (const char *)(x) #define SOCK_IOCTL ioctlsocket +#define SOCK_FIONREAD_LEN_TYPE unsigned long #define SOCK_CLOSE closesocket // connect is broken on windows under certain conditions, reasons unknown: // See https://github.com/godotengine/webrtc-native/issues/6 @@ -742,7 +744,7 @@ bool NetSocketPosix::is_open() const { int NetSocketPosix::get_available_bytes() const { ERR_FAIL_COND_V(!is_open(), -1); - unsigned long len; + SOCK_FIONREAD_LEN_TYPE len; int ret = SOCK_IOCTL(_sock, FIONREAD, &len); if (ret == -1) { _get_socket_error(); |