diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-28 15:40:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 15:40:40 +0200 |
| commit | 04ec0bf5e1714131d31421f59083578236274ff7 (patch) | |
| tree | a2169e7883b981521a9900b76f7cbd9af1df1fac /thirdparty/mbedtls/library/net_sockets.c | |
| parent | bdbc63c4eeeb43176d48b40fb713e793c40a1f3d (diff) | |
| parent | d8e1cd7a109bc832826f21d6df1faf401be8dcc9 (diff) | |
| download | redot-engine-04ec0bf5e1714131d31421f59083578236274ff7.tar.gz | |
Merge pull request #20539 from akien-mga/mbedtls-2.12.0
mbedtls: Update to upstream version 2.12.0
Diffstat (limited to 'thirdparty/mbedtls/library/net_sockets.c')
| -rw-r--r-- | thirdparty/mbedtls/library/net_sockets.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/thirdparty/mbedtls/library/net_sockets.c b/thirdparty/mbedtls/library/net_sockets.c index 9b0a375fb7..816b1303df 100644 --- a/thirdparty/mbedtls/library/net_sockets.c +++ b/thirdparty/mbedtls/library/net_sockets.c @@ -19,6 +19,11 @@ * This file is part of mbed TLS (https://tls.mbed.org) */ +/* Enable definition of getaddrinfo() even when compiling with -std=c99. Must + * be set before config.h, which pulls in glibc's features.h indirectly. + * Harmless on other platforms. */ +#define _POSIX_C_SOURCE 200112L + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" #else @@ -28,7 +33,8 @@ #if defined(MBEDTLS_NET_C) #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ - !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) + !defined(__APPLE__) && !defined(_WIN32) && !defined(__QNXNTO__) && \ + !defined(__HAIKU__) #error "This module only works on Unix and Windows, see MBEDTLS_NET_C in config.h" #endif @@ -47,13 +53,11 @@ #define IS_EINTR( ret ) ( ( ret ) == WSAEINTR ) -/* GODOT ADDITION */ #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) #undef _WIN32_WINNT /* Enables getaddrinfo() & Co */ #define _WIN32_WINNT 0x0501 #endif -/* END GODOT ADDITION */ #include <ws2tcpip.h> |