From f1ed3cefc4d349aa31067c1e4a41033ea32b5f48 Mon Sep 17 00:00:00 2001
From: toddouska <todd@yassl.com>
Date: Mon, 20 Aug 2012 16:38:43 -0700
Subject: [PATCH] SafeRTOS memory macros

---
 cyassl/ctaocrypt/settings.h | 5 +++++
 cyassl/ctaocrypt/types.h    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h
index 678d03294..7b92f6224 100644
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@@ -170,6 +170,11 @@
     #ifndef SINGLE_THREADED
         #include "SafeRTOS/semphr.h"
     #endif
+
+    #include "SafeRTOS/heap.h"
+    #define XMALLOC(s, h, type)  pvPortMalloc((s))
+    #define XFREE(p, h, type)    vPortFree((p)) 
+    #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
 #endif
 
 #ifdef MICRIUM
diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
index 210c8bcb8..0c9bff635 100644
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@@ -148,7 +148,7 @@ enum {
     extern void *XMALLOC(size_t n, void* heap, int type);
     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)
+#elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) && !defined(CYASSL_SAFERTOS)
     /* default C runtime, can install different routines at runtime */
     #include <cyassl/ctaocrypt/memory.h>
     #define XMALLOC(s, h, t)     CyaSSL_Malloc((s))