From 6916b246f3be8c72d6e77fd98c4a1447fd2c1de7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 6 Sep 2004 05:38:45 +0000 Subject: [PATCH] Fix up header guards. --- src/devices/16550a.h | 6 +++--- src/devices/disk.h | 6 +++--- src/devices/kbd.h | 6 +++--- src/devices/serial.h | 6 +++--- src/devices/timer.h | 6 +++--- src/devices/vga.h | 6 +++--- src/filesys/directory.h | 6 +++--- src/filesys/file.h | 6 +++--- src/filesys/filehdr.h | 6 +++--- src/filesys/filesys.h | 6 +++--- src/filesys/fsutil.h | 6 +++--- src/filesys/off_t.h | 6 +++--- src/lib/ctype.h | 4 ++-- src/lib/debug.h | 6 +++--- src/lib/inttypes.h | 4 ++-- src/lib/kernel/bitmap.h | 6 +++--- src/lib/kernel/hash.h | 6 +++--- src/lib/kernel/list.h | 6 +++--- src/lib/limits.h | 4 ++-- src/lib/random.h | 6 +++--- src/lib/round.h | 4 ++-- src/lib/stdarg.h | 4 ++-- src/lib/stdbool.h | 4 ++-- src/lib/stddef.h | 4 ++-- src/lib/stdint.h | 4 ++-- src/lib/stdio.h | 4 ++-- src/lib/stdlib.h | 4 ++-- src/lib/string.h | 4 ++-- src/lib/syscall-nr.h | 4 ++-- src/lib/user/syscall-stub.h | 4 ++-- src/lib/user/syscall.h | 4 ++-- src/lib/user/user.h | 6 +++--- src/threads/init.h | 6 +++--- src/threads/interrupt.h | 6 +++--- src/threads/intr-stubs.h | 6 +++--- src/threads/io.h | 6 +++--- src/threads/loader.h | 6 +++--- src/threads/malloc.h | 6 +++--- src/threads/mmu.h | 6 +++--- src/threads/paging.h | 6 +++--- src/threads/palloc.h | 6 +++--- src/threads/switch.h | 6 +++--- src/threads/synch.h | 6 +++--- src/threads/thread.h | 6 +++--- src/userprog/addrspace.h | 6 +++--- src/userprog/exception.h | 6 +++--- src/userprog/gdt.h | 6 +++--- src/userprog/syscall.h | 6 +++--- src/userprog/tss.h | 6 +++--- 49 files changed, 133 insertions(+), 133 deletions(-) diff --git a/src/devices/16550a.h b/src/devices/16550a.h index b3cb37a..99b7e57 100644 --- a/src/devices/16550a.h +++ b/src/devices/16550a.h @@ -1,5 +1,5 @@ -#ifndef HEADER_16550A_H -#define HEADER_16550A_H 1 +#ifndef DEVICES_16550A_H +#define DEVICES_16550A_H #include #include @@ -120,4 +120,4 @@ make_lcr (int bits, enum parity_type parity, int stop, bool send_break, #define MSR_RI 0x40 /* Ring Indicator. */ #define MSR_DCD 0x80 /* Data Carrier Detect. */ -#endif /* 16550a.h */ +#endif /* devices/16550a.h */ diff --git a/src/devices/disk.h b/src/devices/disk.h index 9e785e5..539c4b0 100644 --- a/src/devices/disk.h +++ b/src/devices/disk.h @@ -1,5 +1,5 @@ -#ifndef HEADER_DISK_H -#define HEADER_DISK_H 1 +#ifndef DEVICES_DISK_H +#define DEVICES_DISK_H #include #include @@ -21,4 +21,4 @@ disk_sector_t disk_size (struct disk *); void disk_read (struct disk *, disk_sector_t, void *); void disk_write (struct disk *, disk_sector_t, const void *); -#endif /* disk.h */ +#endif /* devices/disk.h */ diff --git a/src/devices/kbd.h b/src/devices/kbd.h index f08ef74..b32b631 100644 --- a/src/devices/kbd.h +++ b/src/devices/kbd.h @@ -1,6 +1,6 @@ -#ifndef HEADER_KBD_H -#define HEADER_KBD_H 1 +#ifndef DEVICES_KBD_H +#define DEVICES_KBD_H void kbd_init (void); -#endif /* kbd.h */ +#endif /* devices/kbd.h */ diff --git a/src/devices/serial.h b/src/devices/serial.h index 2b63800..672f8de 100644 --- a/src/devices/serial.h +++ b/src/devices/serial.h @@ -1,9 +1,9 @@ -#ifndef HEADER_SERIAL_H -#define HEADER_SERIAL_H 1 +#ifndef DEVICES_SERIAL_H +#define DEVICES_SERIAL_H #include void serial_init (void); void serial_outb (uint8_t); -#endif /* serial.h */ +#endif /* devices/serial.h */ diff --git a/src/devices/timer.h b/src/devices/timer.h index 33fdaec..ba736d2 100644 --- a/src/devices/timer.h +++ b/src/devices/timer.h @@ -1,5 +1,5 @@ -#ifndef HEADER_TIMER_H -#define HEADER_TIMER_H 1 +#ifndef DEVICES_TIMER_H +#define DEVICES_TIMER_H #include @@ -13,4 +13,4 @@ void timer_msleep (int64_t ms); void timer_usleep (int64_t us); void timer_nsleep (int64_t ns); -#endif /* timer.h */ +#endif /* devices/timer.h */ diff --git a/src/devices/vga.h b/src/devices/vga.h index 2221034..190cf21 100644 --- a/src/devices/vga.h +++ b/src/devices/vga.h @@ -1,7 +1,7 @@ -#ifndef HEADER_VGA_H -#define HEADER_VGA_H 1 +#ifndef DEVICES_VGA_H +#define DEVICES_VGA_H void vga_init (void); void vga_putc (int); -#endif /* vga.h */ +#endif /* devices/vga.h */ diff --git a/src/filesys/directory.h b/src/filesys/directory.h index a3364ae..4464d46 100644 --- a/src/filesys/directory.h +++ b/src/filesys/directory.h @@ -1,5 +1,5 @@ -#ifndef HEADER_DIRECTORY_H -#define HEADER_DIRECTORY_H 1 +#ifndef FILESYS_DIRECTORY_H +#define FILESYS_DIRECTORY_H #include #include @@ -36,4 +36,4 @@ bool dir_remove (struct dir *, const char *name); void dir_list (const struct dir *); void dir_dump (const struct dir *); -#endif /* directory.h */ +#endif /* filesys/directory.h */ diff --git a/src/filesys/file.h b/src/filesys/file.h index 28495c2..ea716aa 100644 --- a/src/filesys/file.h +++ b/src/filesys/file.h @@ -1,5 +1,5 @@ -#ifndef HEADER_FILE_H -#define HEADER_FILE_H 1 +#ifndef FILESYS_FILE_H +#define FILESYS_FILE_H #include #include @@ -24,4 +24,4 @@ off_t file_length (struct file *); void file_seek (struct file *, off_t); off_t file_tell (struct file *); -#endif /* file.h */ +#endif /* filesys/file.h */ diff --git a/src/filesys/filehdr.h b/src/filesys/filehdr.h index 7c9f37f..60bca96 100644 --- a/src/filesys/filehdr.h +++ b/src/filesys/filehdr.h @@ -1,5 +1,5 @@ -#ifndef HEADER_FILEHDR_H -#define HEADER_FILEHDR_H 1 +#ifndef FILESYS_FILEHDR_H +#define FILESYS_FILEHDR_H #include #include @@ -29,4 +29,4 @@ disk_sector_t filehdr_byte_to_sector (const struct filehdr *, off_t); off_t filehdr_length (const struct filehdr *); void filehdr_print (const struct filehdr *); -#endif /* filehdr.h */ +#endif /* filesys/filehdr.h */ diff --git a/src/filesys/filesys.h b/src/filesys/filesys.h index 6e6c136..44c89f4 100644 --- a/src/filesys/filesys.h +++ b/src/filesys/filesys.h @@ -1,5 +1,5 @@ -#ifndef HEADER_FILESYS_H -#define HEADER_FILESYS_H 1 +#ifndef FILESYS_FILESYS_H +#define FILESYS_FILESYS_H #include #include @@ -18,4 +18,4 @@ bool filesys_dump (void); void filesys_self_test (void); -#endif /* filesys.h */ +#endif /* filesys/filesys.h */ diff --git a/src/filesys/fsutil.h b/src/filesys/fsutil.h index b37c5b6..8962a8a 100644 --- a/src/filesys/fsutil.h +++ b/src/filesys/fsutil.h @@ -1,5 +1,5 @@ -#ifndef HEADER_FSUTIL_H -#define HEADER_FSUTIL_H 1 +#ifndef FILESYS_FSUTIL_H +#define FILESYS_FSUTIL_H #include @@ -12,4 +12,4 @@ extern bool fsutil_dump_filesys; void fsutil_run (void); void fsutil_print (const char *filename); -#endif /* fsutil.h */ +#endif /* filesys/fsutil.h */ diff --git a/src/filesys/off_t.h b/src/filesys/off_t.h index 84475e1..55ff174 100644 --- a/src/filesys/off_t.h +++ b/src/filesys/off_t.h @@ -1,5 +1,5 @@ -#ifndef HEADER_OFF_T_H -#define HEADER_OFF_T_H 1 +#ifndef FILESYS_OFF_T_H +#define FILESYS_OFF_T_H #include @@ -8,4 +8,4 @@ definition but not any others. */ typedef int32_t off_t; -#endif /* off_t.h */ +#endif /* filesys/off_t.h */ diff --git a/src/lib/ctype.h b/src/lib/ctype.h index fafa51f..d0baf4f 100644 --- a/src/lib/ctype.h +++ b/src/lib/ctype.h @@ -1,5 +1,5 @@ -#ifndef LIB_CTYPE_H -#define LIB_CTYPE_H 1 +#ifndef __LIB_CTYPE_H +#define __LIB_CTYPE_H static inline int islower (int c) { return c >= 'a' && c <= 'z'; } static inline int isupper (int c) { return c >= 'A' && c <= 'Z'; } diff --git a/src/lib/debug.h b/src/lib/debug.h index 2af8ba4..947dff2 100644 --- a/src/lib/debug.h +++ b/src/lib/debug.h @@ -1,5 +1,5 @@ -#ifndef HEADER_DEBUG_H -#define HEADER_DEBUG_H 1 +#ifndef __LIB_DEBUG_H +#define __LIB_DEBUG_H /* GCC lets us add "attributes" to functions, function parameters, etc. to indicate their properties. @@ -45,4 +45,4 @@ void debug_backtrace (void); #else #define ASSERT(CONDITION) ((void) 0) #define NOT_REACHED() for (;;) -#endif +#endif /* lib/debug.h */ diff --git a/src/lib/inttypes.h b/src/lib/inttypes.h index 70bb898..08ee8fe 100644 --- a/src/lib/inttypes.h +++ b/src/lib/inttypes.h @@ -1,5 +1,5 @@ -#ifndef LIB_INTTYPES_H -#define LIB_INTTYPES_H +#ifndef __LIB_INTTYPES_H +#define __LIB_INTTYPES_H #define PRId8 "hhd" #define PRId16 "hd" diff --git a/src/lib/kernel/bitmap.h b/src/lib/kernel/bitmap.h index ada1354..f70688b 100644 --- a/src/lib/kernel/bitmap.h +++ b/src/lib/kernel/bitmap.h @@ -1,5 +1,5 @@ -#ifndef HEADER_BITMAP_H -#define HEADER_BITMAP_H 1 +#ifndef __LIB_KERNEL_BITMAP_H +#define __LIB_KERNEL_BITMAP_H #include #include @@ -60,4 +60,4 @@ void bitmap_write (const struct bitmap *, struct file *); void bitmap_dump (const struct bitmap *); -#endif /* bitmap.h */ +#endif /* lib/kernel/bitmap.h */ diff --git a/src/lib/kernel/hash.h b/src/lib/kernel/hash.h index e37592b..b7eadd3 100644 --- a/src/lib/kernel/hash.h +++ b/src/lib/kernel/hash.h @@ -1,5 +1,5 @@ -#ifndef HEADER_HASH_H -#define HEADER_HASH_H 1 +#ifndef __LIB_KERNEL_HASH_H +#define __LIB_KERNEL_HASH_H /* Hash table. @@ -88,4 +88,4 @@ unsigned hash_bytes (const void *, size_t); unsigned hash_string (const char *); unsigned hash_int (int); -#endif /* hash.h */ +#endif /* lib/kernel/hash.h */ diff --git a/src/lib/kernel/list.h b/src/lib/kernel/list.h index 1bf6631..88ed595 100644 --- a/src/lib/kernel/list.h +++ b/src/lib/kernel/list.h @@ -1,5 +1,5 @@ -#ifndef HEADER_LIST_H -#define HEADER_LIST_H 1 +#ifndef __LIB_KERNEL_LIST_H +#define __LIB_KERNEL_LIST_H /* Doubly linked list. @@ -162,4 +162,4 @@ void list_insert_ordered (struct list *, list_elem *, void list_unique (struct list *, struct list *duplicates, list_less_func *, void *aux); -#endif /* list.h */ +#endif /* lib/kernel/list.h */ diff --git a/src/lib/limits.h b/src/lib/limits.h index 930a97b..c957ec4 100644 --- a/src/lib/limits.h +++ b/src/lib/limits.h @@ -1,5 +1,5 @@ -#ifndef LIB_LIMITS_H -#define LIB_LIMITS_H +#ifndef __LIB_LIMITS_H +#define __LIB_LIMITS_H #define CHAR_BIT 8 diff --git a/src/lib/random.h b/src/lib/random.h index cc6eed4..0950ae2 100644 --- a/src/lib/random.h +++ b/src/lib/random.h @@ -1,5 +1,5 @@ -#ifndef HEADER_RANDOM_H -#define HEADER_RANDOM_H 1 +#ifndef __LIB_RANDOM_H +#define __LIB_RANDOM_H #include @@ -7,4 +7,4 @@ void random_init (unsigned seed); void random_bytes (void *, size_t); unsigned long random_ulong (void); -#endif /* random.h */ +#endif /* lib/random.h */ diff --git a/src/lib/round.h b/src/lib/round.h index df0fb4a..3aa6642 100644 --- a/src/lib/round.h +++ b/src/lib/round.h @@ -1,5 +1,5 @@ -#ifndef LIB_ROUND_H -#define LIB_ROUND_H +#ifndef __LIB_ROUND_H +#define __LIB_ROUND_H /* Yields X rounded up to the nearest multiple of STEP. For X >= 0, STEP >= 1 only. */ diff --git a/src/lib/stdarg.h b/src/lib/stdarg.h index 690bb28..32622b5 100644 --- a/src/lib/stdarg.h +++ b/src/lib/stdarg.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDARG_H -#define LIB_STDARG_H +#ifndef __LIB_STDARG_H +#define __LIB_STDARG_H /* GCC has functionality as built-ins, so all we need is to use it. */ diff --git a/src/lib/stdbool.h b/src/lib/stdbool.h index 45fc515..f173a91 100644 --- a/src/lib/stdbool.h +++ b/src/lib/stdbool.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDBOOL_H -#define LIB_STDBOOL_H +#ifndef __LIB_STDBOOL_H +#define __LIB_STDBOOL_H #define bool _Bool #define true 1 diff --git a/src/lib/stddef.h b/src/lib/stddef.h index 836b8f2..2a05bc9 100644 --- a/src/lib/stddef.h +++ b/src/lib/stddef.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDDEF_H -#define LIB_STDDEF_H +#ifndef __LIB_STDDEF_H +#define __LIB_STDDEF_H #define NULL ((void *) 0) #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) diff --git a/src/lib/stdint.h b/src/lib/stdint.h index 2f0218f..c7b7839 100644 --- a/src/lib/stdint.h +++ b/src/lib/stdint.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDINT_H -#define LIB_STDINT_H +#ifndef __LIB_STDINT_H +#define __LIB_STDINT_H typedef signed char int8_t; #define INT8_MAX 127 diff --git a/src/lib/stdio.h b/src/lib/stdio.h index 7141387..4609fb3 100644 --- a/src/lib/stdio.h +++ b/src/lib/stdio.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDIO_H -#define LIB_STDIO_H +#ifndef __LIB_STDIO_H +#define __LIB_STDIO_H #include #include diff --git a/src/lib/stdlib.h b/src/lib/stdlib.h index 0a8abcb..d2f9bba 100644 --- a/src/lib/stdlib.h +++ b/src/lib/stdlib.h @@ -1,5 +1,5 @@ -#ifndef LIB_STDLIB_H -#define LIB_STDLIB_H +#ifndef __LIB_STDLIB_H +#define __LIB_STDLIB_H #include "stddef.h" diff --git a/src/lib/string.h b/src/lib/string.h index 03ba7a0..05b957f 100644 --- a/src/lib/string.h +++ b/src/lib/string.h @@ -1,5 +1,5 @@ -#ifndef LIB_STRING_H -#define LIB_STRING_H 1 +#ifndef __LIB_STRING_H +#define __LIB_STRING_H #include "stddef.h" diff --git a/src/lib/syscall-nr.h b/src/lib/syscall-nr.h index fa9bde9..cf93449 100644 --- a/src/lib/syscall-nr.h +++ b/src/lib/syscall-nr.h @@ -1,5 +1,5 @@ -#ifndef LIB_SYSCALL_NR_H -#define LIB_SYSCALL_NR_H 1 +#ifndef __LIB_SYSCALL-NR_H +#define __LIB_SYSCALL-NR_H /* System call numbers. */ #define SYS_halt 0 /* Halts the operating system. */ diff --git a/src/lib/user/syscall-stub.h b/src/lib/user/syscall-stub.h index 7d5d2e8..80274bb 100644 --- a/src/lib/user/syscall-stub.h +++ b/src/lib/user/syscall-stub.h @@ -1,5 +1,5 @@ -#ifndef LIB_USER_SYSCALL_STUB_H -#define LIB_USER_SYSCALL_STUB_H 1 +#ifndef __LIB_USER_SYSCALL-STUB_H +#define __LIB_USER_SYSCALL-STUB_H int syscall (int nr, ...); diff --git a/src/lib/user/syscall.h b/src/lib/user/syscall.h index 8dd88fb..e10d39e 100644 --- a/src/lib/user/syscall.h +++ b/src/lib/user/syscall.h @@ -1,5 +1,5 @@ -#ifndef LIB_USER_SYSCALL_H -#define LIB_USER_SYSCALL_H 1 +#ifndef __LIB_USER_SYSCALL_H +#define __LIB_USER_SYSCALL_H #include #include diff --git a/src/lib/user/user.h b/src/lib/user/user.h index e9aebd2..6bebf6d 100644 --- a/src/lib/user/user.h +++ b/src/lib/user/user.h @@ -1,5 +1,5 @@ -#ifndef LIB_USER_H -#define LIB_USER_H 1 +#ifndef __LIB_USER_USER_H +#define __LIB_USER_USER_H #ifdef KERNEL #error This header is user-only. @@ -11,4 +11,4 @@ void exit (int); void abort (void); -#endif /* lib/user.h */ +#endif /* lib/user/user.h */ diff --git a/src/threads/init.h b/src/threads/init.h index fed649b..fafb492 100644 --- a/src/threads/init.h +++ b/src/threads/init.h @@ -1,9 +1,9 @@ -#ifndef HEADER_INIT_H -#define HEADER_INIT_H 1 +#ifndef THREADS_INIT_H +#define THREADS_INIT_H #include /* Physical memory size, in 4 kB pages. */ size_t ram_pages; -#endif /* init.h */ +#endif /* threads/init.h */ diff --git a/src/threads/interrupt.h b/src/threads/interrupt.h index 40d7b6e..5060b9d 100644 --- a/src/threads/interrupt.h +++ b/src/threads/interrupt.h @@ -1,5 +1,5 @@ -#ifndef HEADER_INTERRUPT_H -#define HEADER_INTERRUPT_H 1 +#ifndef THREADS_INTERRUPT_H +#define THREADS_INTERRUPT_H #include #include @@ -59,4 +59,4 @@ void intr_yield_on_return (void); void intr_dump_frame (const struct intr_frame *); const char *intr_name (uint8_t vec); -#endif /* interrupt.h */ +#endif /* threads/interrupt.h */ diff --git a/src/threads/intr-stubs.h b/src/threads/intr-stubs.h index 3f2db7e..debeaab 100644 --- a/src/threads/intr-stubs.h +++ b/src/threads/intr-stubs.h @@ -1,5 +1,5 @@ -#ifndef HEADER_INTR_STUBS_H -#define HEADER_INTR_STUBS_H +#ifndef THREADS_INTR-STUBS_H +#define THREADS_INTR-STUBS_H /* Interrupt stubs. @@ -17,4 +17,4 @@ extern intr_stub_func *intr_stubs[256]; /* Interrupt return path. */ void intr_exit (void); -#endif /* intr-stubs.h */ +#endif /* threads/intr-stubs.h */ diff --git a/src/threads/io.h b/src/threads/io.h index b6d1e4b..a3889c2 100644 --- a/src/threads/io.h +++ b/src/threads/io.h @@ -38,8 +38,8 @@ * the copyright notices, if any, listed below. */ -#ifndef HEADER_IO_H -#define HEADER_IO_H 1 +#ifndef THREADS_IO_H +#define THREADS_IO_H #include #include @@ -158,4 +158,4 @@ outsl (uint16_t port, const void *addr, size_t cnt) : "cc"); } -#endif /* io.h */ +#endif /* threads/io.h */ diff --git a/src/threads/loader.h b/src/threads/loader.h index f5d7a9b..b412af3 100644 --- a/src/threads/loader.h +++ b/src/threads/loader.h @@ -1,5 +1,5 @@ -#ifndef HEADER_LOADER_H -#define HEADER_LOADER_H +#ifndef THREADS_LOADER_H +#define THREADS_LOADER_H /* Constants fixed by the PC BIOS. */ #define LOADER_BASE 0x7c00 /* Physical address of loader's base. */ @@ -30,4 +30,4 @@ #define SEL_KCSEG 0x08 /* Kernel code selector. */ #define SEL_KDSEG 0x10 /* Kernel data selector. */ -#endif /* loader.h */ +#endif /* threads/loader.h */ diff --git a/src/threads/malloc.h b/src/threads/malloc.h index 8509f6f..2f19155 100644 --- a/src/threads/malloc.h +++ b/src/threads/malloc.h @@ -1,5 +1,5 @@ -#ifndef HEADER_MALLOC_H -#define HEADER_MALLOC_H +#ifndef THREADS_MALLOC_H +#define THREADS_MALLOC_H #include #include @@ -9,4 +9,4 @@ void *malloc (size_t) __attribute__ ((malloc)); void *calloc (size_t, size_t) __attribute__ ((malloc)); void free (void *); -#endif /* malloc.h */ +#endif /* threads/malloc.h */ diff --git a/src/threads/mmu.h b/src/threads/mmu.h index c66ff18..4e9340a 100644 --- a/src/threads/mmu.h +++ b/src/threads/mmu.h @@ -1,5 +1,5 @@ -#ifndef HEADER_MMU_H -#define HEADER_MMU_H 1 +#ifndef THREADS_MMU_H +#define THREADS_MMU_H #ifndef __ASSEMBLER__ #include @@ -85,4 +85,4 @@ vtop (void *vaddr) #define FLAG_MBS 0x00000002 /* Must be set. */ #define FLAG_IF 0x00000200 /* Interrupt Flag. */ -#endif /* mmu.h */ +#endif /* threads/mmu.h */ diff --git a/src/threads/paging.h b/src/threads/paging.h index 02fa3ca..8481b17 100644 --- a/src/threads/paging.h +++ b/src/threads/paging.h @@ -1,5 +1,5 @@ -#ifndef HEADER_PAGING_H -#define HEADER_PAGING_H 1 +#ifndef THREADS_PAGING_H +#define THREADS_PAGING_H #include #include @@ -18,4 +18,4 @@ void *pagedir_next (uint32_t *pagedir, void **upage); void pagedir_activate (uint32_t *pagedir); -#endif /* paging.h */ +#endif /* threads/paging.h */ diff --git a/src/threads/palloc.h b/src/threads/palloc.h index 7250e98..ca7824e 100644 --- a/src/threads/palloc.h +++ b/src/threads/palloc.h @@ -1,5 +1,5 @@ -#ifndef HEADER_PALLOC_H -#define HEADER_PALLOC_H 1 +#ifndef THREADS_PALLOC_H +#define THREADS_PALLOC_H #include @@ -13,4 +13,4 @@ void palloc_init (void); void *palloc_get (enum palloc_flags); void palloc_free (void *); -#endif /* palloc.h */ +#endif /* threads/palloc.h */ diff --git a/src/threads/switch.h b/src/threads/switch.h index 8a2974f..07b805e 100644 --- a/src/threads/switch.h +++ b/src/threads/switch.h @@ -1,5 +1,5 @@ -#ifndef HEADER_SWITCH_H -#define HEADER_SWITCH_H 1 +#ifndef THREADS_SWITCH_H +#define THREADS_SWITCH_H #ifndef __ASSEMBLER__ /* switch_thread()'s stack frame. */ @@ -35,4 +35,4 @@ void switch_thunk (void); #define SWITCH_CUR 20 #define SWITCH_NEXT 24 -#endif /* switch.h */ +#endif /* threads/switch.h */ diff --git a/src/threads/synch.h b/src/threads/synch.h index c8ac2f4..244479f 100644 --- a/src/threads/synch.h +++ b/src/threads/synch.h @@ -1,5 +1,5 @@ -#ifndef HEADER_SYNCH_H -#define HEADER_SYNCH_H 1 +#ifndef THREADS_SYNCH_H +#define THREADS_SYNCH_H #include #include @@ -45,4 +45,4 @@ void cond_signal (struct condition *, struct lock *); void cond_broadcast (struct condition *, struct lock *); const char *cond_name (const struct condition *); -#endif /* synch.h */ +#endif /* threads/synch.h */ diff --git a/src/threads/thread.h b/src/threads/thread.h index d6a3990..95173ff 100644 --- a/src/threads/thread.h +++ b/src/threads/thread.h @@ -1,5 +1,5 @@ -#ifndef HEADER_THREAD_H -#define HEADER_THREAD_H 1 +#ifndef THREADS_THREAD_H +#define THREADS_THREAD_H #include #include @@ -108,4 +108,4 @@ void thread_exit (void) NO_RETURN; void thread_yield (void); void thread_block (void); -#endif /* thread.h */ +#endif /* threads/thread.h */ diff --git a/src/userprog/addrspace.h b/src/userprog/addrspace.h index cf68189..0ab70b8 100644 --- a/src/userprog/addrspace.h +++ b/src/userprog/addrspace.h @@ -1,5 +1,5 @@ -#ifndef HEADER_ADDRSPACE_H -#define HEADER_ADDRSPACE_H 1 +#ifndef USERPROG_ADDRSPACE_H +#define USERPROG_ADDRSPACE_H #include @@ -8,4 +8,4 @@ bool addrspace_load (struct thread *, const char *, void (**start) (void)); void addrspace_destroy (struct thread *); void addrspace_activate (struct thread *); -#endif /* addrspace.h */ +#endif /* userprog/addrspace.h */ diff --git a/src/userprog/exception.h b/src/userprog/exception.h index 37b6142..e378410 100644 --- a/src/userprog/exception.h +++ b/src/userprog/exception.h @@ -1,6 +1,6 @@ -#ifndef HEADER_EXCEPTION_H -#define HEADER_EXCEPTION_H 1 +#ifndef USERPROG_EXCEPTION_H +#define USERPROG_EXCEPTION_H void exception_init (void); -#endif /* exception.h */ +#endif /* userprog/exception.h */ diff --git a/src/userprog/gdt.h b/src/userprog/gdt.h index 599e40e..81fe50c 100644 --- a/src/userprog/gdt.h +++ b/src/userprog/gdt.h @@ -1,5 +1,5 @@ -#ifndef HEADER_GDT_H -#define HEADER_GDT_H 1 +#ifndef USERPROG_GDT_H +#define USERPROG_GDT_H #include "threads/loader.h" @@ -12,4 +12,4 @@ void gdt_init (void); -#endif /* gdt.h */ +#endif /* userprog/gdt.h */ diff --git a/src/userprog/syscall.h b/src/userprog/syscall.h index f57676c..9059096 100644 --- a/src/userprog/syscall.h +++ b/src/userprog/syscall.h @@ -1,6 +1,6 @@ -#ifndef HEADER_SYSCALL_H -#define HEADER_SYSCALL_H 1 +#ifndef USERPROG_SYSCALL_H +#define USERPROG_SYSCALL_H void syscall_init (void); -#endif /* syscall.h */ +#endif /* userprog/syscall.h */ diff --git a/src/userprog/tss.h b/src/userprog/tss.h index a5476c7..fa8d47b 100644 --- a/src/userprog/tss.h +++ b/src/userprog/tss.h @@ -1,5 +1,5 @@ -#ifndef HEADER_TSS_H -#define HEADER_TSS_H +#ifndef USERPROG_TSS_H +#define USERPROG_TSS_H #include @@ -8,4 +8,4 @@ void tss_init (void); struct tss *tss_get (void); void tss_set_esp0 (uint8_t *); -#endif /* tss.h */ +#endif /* userprog/tss.h */ -- 2.30.2