From f994843b8de841ba83a808d260630cec5dc1c083 Mon Sep 17 00:00:00 2001 From: Stephen Roderick Date: Wed, 31 Mar 2010 13:20:53 -0400 Subject: [PATCH] tlsf: Move oro_malloc file to correct location for v1 files --- rtt/os/oro_malloc.h | 23 ----------------------- src/os/oro_malloc.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 rtt/os/oro_malloc.h create mode 100644 src/os/oro_malloc.h diff --git a/rtt/os/oro_malloc.h b/rtt/os/oro_malloc.h deleted file mode 100644 index 56fcc1d..0000000 --- a/rtt/os/oro_malloc.h +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * Wraps the oro_rt_ allocator functions to standard C malloc function family - * or TLSF if available. - */ -#ifndef _ORO_MALLOC_H_ -#define _ORO_MALLOC_H_ - - -#include "../rtt-config.h" -#ifdef OS_RT_MALLOC -#include "tlsf/tlsf.h" -#else - -#include -#define oro_rt_malloc malloc -#define oro_rt_free free -#define oro_rt_realloc realloc -#define oro_rt_calloc rt_calloc - -#endif - -#endif diff --git a/src/os/oro_malloc.h b/src/os/oro_malloc.h new file mode 100644 index 0000000..56fcc1d --- /dev/null +++ b/src/os/oro_malloc.h @@ -0,0 +1,23 @@ +/** + * @file + * Wraps the oro_rt_ allocator functions to standard C malloc function family + * or TLSF if available. + */ +#ifndef _ORO_MALLOC_H_ +#define _ORO_MALLOC_H_ + + +#include "../rtt-config.h" +#ifdef OS_RT_MALLOC +#include "tlsf/tlsf.h" +#else + +#include +#define oro_rt_malloc malloc +#define oro_rt_free free +#define oro_rt_realloc realloc +#define oro_rt_calloc rt_calloc + +#endif + +#endif -- 1.7.0.2