projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random: Fix behavior of kernel option "-rs".
[pintos-anon]
/
src
/
threads
/
malloc.h
diff --git
a/src/threads/malloc.h
b/src/threads/malloc.h
index a2125924f47b63340dea967c94c542a943d0379b..bc55d362b0c7276eb335b8d5d898c508db48675f 100644
(file)
--- a/
src/threads/malloc.h
+++ b/
src/threads/malloc.h
@@
-1,12
+1,13
@@
-#ifndef
HEADER
_MALLOC_H
-#define
HEADER
_MALLOC_H
+#ifndef
THREADS
_MALLOC_H
+#define
THREADS
_MALLOC_H
-#include
"debug.h"
+#include
<debug.h>
#include <stddef.h>
void malloc_init (void);
#include <stddef.h>
void malloc_init (void);
-void *malloc (size_t) ATTRIBUTE ((malloc));
-void *calloc (size_t, size_t) ATTRIBUTE ((malloc));
+void *malloc (size_t) __attribute__ ((malloc));
+void *calloc (size_t, size_t) __attribute__ ((malloc));
+void *realloc (void *, size_t);
void free (void *);
void free (void *);
-#endif /* malloc.h */
+#endif /*
threads/
malloc.h */