Merge remote-tracking branch 'public/pr/1681' into development

This commit is contained in:
Simon Butcher 2018-06-17 17:35:54 +01:00
commit 1f91575546
2 changed files with 16 additions and 6 deletions

View file

@ -121,8 +121,8 @@ extern "C" {
#else
/* For size_t */
#include <stddef.h>
extern void * (*mbedtls_calloc)( size_t n, size_t size );
extern void (*mbedtls_free)( void *ptr );
extern void *mbedtls_calloc( size_t n, size_t size );
extern void mbedtls_free( void *ptr );
/**
* \brief This function dynamically sets the memory-management