X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fmalloc.h;h=4f0d0bf32f370557e0a13a0dfaa1f1f2f50df4cb;hb=dcfc312e3cc930d418f86948ef062eb7e8fd283a;hp=1fb531f42ca0bd4cb9802ec9f08a6ff2ad04ba17;hpb=787ccae300cef13f0dabd4d6b0633b90d783dbc5;p=pintos-anon diff --git a/src/threads/malloc.h b/src/threads/malloc.h index 1fb531f..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 #include void malloc_init (void); 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 */