diff options
| author | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-06-19 12:48:19 +0200 |
| commit | 61f0dcb9a812d057e28c53837327f99bcea4733e (patch) | |
| tree | 76c299f94ef60fa6007321b8c403ebc93d8027c1 /src/common/malloc.c | |
| parent | ec7241c953392938cd3a8740bacb4c869636766f (diff) | |
| parent | f2fbdc16a14d07e0895cc09eeba689bc556481d2 (diff) | |
| download | hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.gz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.bz2 hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.tar.xz hercules-61f0dcb9a812d057e28c53837327f99bcea4733e.zip | |
Merge pull request #532 from MishimaHaruna/includes
Include paths
Diffstat (limited to 'src/common/malloc.c')
| -rw-r--r-- | src/common/malloc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c index c647dc18f..ec0467495 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -6,14 +6,14 @@ #include "malloc.h" +#include "common/cbasetypes.h" +#include "common/core.h" +#include "common/showmsg.h" +#include "common/sysinfo.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <time.h> - -#include "../common/core.h" -#include "../common/showmsg.h" -#include "../common/sysinfo.h" struct malloc_interface iMalloc_s; @@ -22,7 +22,7 @@ struct malloc_interface iMalloc_s; #if defined(MEMWATCH) # include <string.h> -# include "memwatch.h" +# include <memwatch.h> # 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 <string.h> # include <stdlib.h> -# include "dmalloc.h" +# include <dmalloc.h> # 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 <gc.h> # ifdef GC_ADD_CALLER # define RETURN_ADDR 0, # else |