mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-22 19:15:36 +00:00
Fix compile errors with NO_STD_FUNCTIONS
This commit is contained in:
parent
b752715893
commit
dccb80b7e5
|
@ -35,6 +35,7 @@ Features
|
|||
errors on use of deprecated functions.
|
||||
|
||||
Bugfix
|
||||
* Fix compile errors with PLATFORM_NO_STD_FUNCTIONS.
|
||||
* Fix compile error with PLATFORM_EXIT_ALT (thanks to Rafał Przywara).
|
||||
* Fix bug in entropy.c when THREADING_C is also enabled that caused
|
||||
entropy_free() to crash (thanks to Rafał Przywara).
|
||||
|
|
|
@ -85,6 +85,8 @@ extern "C" {
|
|||
#define polarssl_free POLARSSL_PLATFORM_FREE_MACRO
|
||||
#define polarssl_malloc POLARSSL_PLATFORM_MALLOC_MACRO
|
||||
#else
|
||||
/* For size_t */
|
||||
#include <stddef.h>
|
||||
extern void * (*polarssl_malloc)( size_t len );
|
||||
extern void (*polarssl_free)( void *ptr );
|
||||
|
||||
|
@ -108,6 +110,8 @@ int platform_set_malloc_free( void * (*malloc_func)( size_t ),
|
|||
* The function pointers for fprintf
|
||||
*/
|
||||
#if defined(POLARSSL_PLATFORM_FPRINTF_ALT)
|
||||
/* We need FILE * */
|
||||
#include <stdio.h>
|
||||
extern int (*polarssl_fprintf)( FILE *stream, const char *format, ... );
|
||||
|
||||
/**
|
||||
|
|
|
@ -72,7 +72,7 @@ static int platform_snprintf_uninit( char * s, size_t n,
|
|||
{
|
||||
((void) s);
|
||||
((void) n);
|
||||
((void) format)
|
||||
((void) format);
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,6 @@ int platform_set_fprintf( int (*fprintf_func)( FILE *, const char *, ... ) )
|
|||
static void platform_exit_uninit( int status )
|
||||
{
|
||||
((void) status);
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
#define POLARSSL_PLATFORM_STD_EXIT platform_exit_uninit
|
||||
|
|
|
@ -146,6 +146,14 @@ scripts/config.pl unset POLARSSL_MEMORY_BUFFER_ALLOC_C
|
|||
scripts/config.pl unset POLARSSL_FS_IO
|
||||
CC=gcc CFLAGS='-Werror -O0' make
|
||||
|
||||
# catch compile bugs in _uninit functions
|
||||
msg "build: full config with NO_STD_FUNCTION, make, gcc" # ~ 30s
|
||||
cleanup
|
||||
cp "$CONFIG_H" "$CONFIG_BAK"
|
||||
scripts/config.pl full
|
||||
scripts/config.pl set POLARSSL_PLATFORM_NO_STD_FUNCTIONS
|
||||
CC=gcc CFLAGS='-Werror -O0' make
|
||||
|
||||
if uname -a | grep -F x86_64 >/dev/null; then
|
||||
msg "build: i386, make, gcc" # ~ 30s
|
||||
cleanup
|
||||
|
|
Loading…
Reference in a new issue