From 080980071b952141275526f1745d8d74c10e4deb Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 1 Jun 2015 17:13:08 +0200 Subject: Removed ".." from include directives - Include directives are now directory-independent. - This will allow building plugins from other directories in future. Signed-off-by: Haru --- src/common/malloc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/common/malloc.c') diff --git a/src/common/malloc.c b/src/common/malloc.c index c647dc18f..008fd0930 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -6,15 +6,15 @@ #include "malloc.h" +#include "common/core.h" +#include "common/showmsg.h" +#include "common/sysinfo.h" + #include #include #include #include -#include "../common/core.h" -#include "../common/showmsg.h" -#include "../common/sysinfo.h" - struct malloc_interface iMalloc_s; ////////////// Memory Libraries ////////////////// @@ -22,7 +22,7 @@ struct malloc_interface iMalloc_s; #if defined(MEMWATCH) # include -# include "memwatch.h" +# include # define MALLOC(n,file,line,func) mwMalloc((n),(file),(line)) # define CALLOC(m,n,file,line,func) mwCalloc((m),(n),(file),(line)) # define REALLOC(p,n,file,line,func) mwRealloc((p),(n),(file),(line)) @@ -36,7 +36,7 @@ struct malloc_interface iMalloc_s; # include # include -# include "dmalloc.h" +# include # define MALLOC(n,file,line,func) dmalloc_malloc((file),(line),(n),DMALLOC_FUNC_MALLOC,0,0) # define CALLOC(m,n,file,line,func) dmalloc_malloc((file),(line),(m)*(n),DMALLOC_FUNC_CALLOC,0,0) # define REALLOC(p,n,file,line,func) dmalloc_realloc((file),(line),(p),(n),DMALLOC_FUNC_REALLOC,0) @@ -48,7 +48,7 @@ struct malloc_interface iMalloc_s; #elif defined(GCOLLECT) -# include "gc.h" +# include # ifdef GC_ADD_CALLER # define RETURN_ADDR 0, # else -- cgit v1.2.3-60-g2f50