X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fthreads%2Fmalloc.h;h=2f191557817347e1f9c8d5c6bf6aacc710d79b79;hb=ce3467cf3112bb05c3e888036019a20db1b6ef9f;hp=231531247b86fc72d015c7595eb8ff3f0ff439c9;hpb=750d21936d284127e265d050ccbce76fca1ece1a;p=pintos-anon diff --git a/src/threads/malloc.h b/src/threads/malloc.h index 2315312..2f19155 100644 --- a/src/threads/malloc.h +++ b/src/threads/malloc.h @@ -1,12 +1,12 @@ -#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 *malloc (size_t) __attribute__ ((malloc)); +void *calloc (size_t, size_t) __attribute__ ((malloc)); void free (void *); -#endif /* malloc.h */ +#endif /* threads/malloc.h */