summaryrefslogtreecommitdiff
path: root/src/common/malloc.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-06-01 17:13:08 +0200
committerHaru <haru@dotalux.com>2015-06-19 12:38:06 +0200
commit080980071b952141275526f1745d8d74c10e4deb (patch)
tree724303ad5623d22f23a861a3ca3052724577520c /src/common/malloc.c
parente81d221cdd79da16f5f013ecb45ecbff192971fe (diff)
downloadhercules-080980071b952141275526f1745d8d74c10e4deb.tar.gz
hercules-080980071b952141275526f1745d8d74c10e4deb.tar.bz2
hercules-080980071b952141275526f1745d8d74c10e4deb.tar.xz
hercules-080980071b952141275526f1745d8d74c10e4deb.zip
Removed ".." from include directives
- Include directives are now directory-independent. - This will allow building plugins from other directories in future. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/malloc.c')
-rw-r--r--src/common/malloc.c14
1 files changed, 7 insertions, 7 deletions
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 <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;
////////////// Memory Libraries //////////////////
@@ -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