Browse Source

made g++ happy on my end

master
despair 2 years ago
parent
commit
00c0679e9f

+ 4
- 0
deps/include/mbedtls/cipher.h View File

@@ -408,7 +408,11 @@ static inline mbedtls_cipher_type_t mbedtls_cipher_get_type( const mbedtls_ciphe
static inline const char *mbedtls_cipher_get_name( const mbedtls_cipher_context_t *ctx )
{
if( NULL == ctx || NULL == ctx->cipher_info )
#ifdef __cplusplus
return nullptr;
#else
return 0;
#endif

return ctx->cipher_info->name;
}

+ 1
- 1
deps/include/mbedtls/ssl_ciphersuites.h View File

@@ -349,7 +349,7 @@ struct mbedtls_ssl_ciphersuite_t
unsigned char flags;
};

const int *mbedtls_ssl_list_ciphersuites( void );
//const int *mbedtls_ssl_list_ciphersuites( void );

const mbedtls_ssl_ciphersuite_t *mbedtls_ssl_ciphersuite_from_string( const char *ciphersuite_name );
const mbedtls_ssl_ciphersuite_t *mbedtls_ssl_ciphersuite_from_id( int ciphersuite_id );

+ 4
- 0
src/networking/HTTPSRequest.h View File

@@ -6,6 +6,10 @@
#include "../URL.h"
#include <functional>
#include <string>
#ifdef NULL
#undef NULL
#define NULL nullptr
#endif
// PolarSSL
#include <mbedtls/net.h>
#include <mbedtls/ssl.h>

Loading…
Cancel
Save