X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fmalloc.h;h=4f0d0bf32f370557e0a13a0dfaa1f1f2f50df4cb;hb=dcfc312e3cc930d418f86948ef062eb7e8fd283a;hp=231531247b86fc72d015c7595eb8ff3f0ff439c9;hpb=750d21936d284127e265d050ccbce76fca1ece1a;p=pintos-anon

diff --git a/src/threads/malloc.h b/src/threads/malloc.h
index 2315312..4f0d0bf 100644
--- a/src/threads/malloc.h
+++ b/src/threads/malloc.h
@@ -1,12 +1,14 @@
-#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);
-void *malloc (size_t)
-     ATTRIBUTE ((malloc));
+void *malloc (size_t) __attribute__ ((malloc));
+void *xmalloc (size_t) __attribute__ ((malloc));
+void *calloc (size_t, size_t) __attribute__ ((malloc));
+void *xcalloc (size_t, size_t) __attribute__ ((malloc));
 void free (void *);
 
-#endif /* malloc.h */
+#endif /* threads/malloc.h */