From f23013b8a7dd0073a32b14591832bb4502ccd5cc Mon Sep 17 00:00:00 2001 From: toddouska Date: Fri, 30 Nov 2012 15:41:01 -0800 Subject: [PATCH] remove runtime memory callback use for leanpsk --- cyassl/ctaocrypt/settings.h | 12 +++++++++++- cyassl/ctaocrypt/types.h | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h index d38956be9..ccdcd8eb7 100644 --- a/cyassl/ctaocrypt/settings.h +++ b/cyassl/ctaocrypt/settings.h @@ -99,6 +99,15 @@ #define USE_WINDOWS_API #endif + +#ifdef CYASSL_LEANPSK + #include + #define XMALLOC(s, h, type) malloc((s)) + #define XFREE(p, h, type) free((p)) + #define XREALLOC(p, n, h, t) realloc((p), (n)) +#endif + + #ifdef FREERTOS #define NO_WRITEV #define NO_SHA512 @@ -413,7 +422,8 @@ #endif /* MICRIUM */ -#if !defined(XMALLOC_USER) && !defined(MICRIUM_MALLOC) +#if !defined(XMALLOC_USER) && !defined(MICRIUM_MALLOC) && \ + !defined(CYASSL_LEANPSK) #define USE_CYASSL_MEMORY #endif diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h index 72f633da4..286280abb 100644 --- a/cyassl/ctaocrypt/types.h +++ b/cyassl/ctaocrypt/types.h @@ -151,7 +151,8 @@ enum { extern void *XREALLOC(void *p, size_t n, void* heap, int type); extern void XFREE(void *p, void* heap, int type); #elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \ - && !defined(CYASSL_SAFERTOS) && !defined(FREESCALE_MQX) + && !defined(CYASSL_SAFERTOS) && !defined(FREESCALE_MQX) \ + && !defined(CYASSL_LEANPSK) /* default C runtime, can install different routines at runtime */ #include #define XMALLOC(s, h, t) ((void)h, (void)t, CyaSSL_Malloc((s)))