Redo makefiles.

[pintos-anon] / src / filesys / file.h

diff --git a/src/filesys/file.h b/src/filesys/file.h
index b29ce33a5a488bb15c513a25f998a8e323535988..afa1990102ac84db4dd929ff2eaa16a72dac6d1d 100644 (file)
--- a/src/filesys/file.h
+++ b/src/filesys/file.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "disk.h"
+#include "devices/disk.h"
 #include "off_t.h"
 
 struct file 
@@ -14,7 +14,7 @@ struct file
     off_t pos;
   };
 
-bool file_open (struct file *, disk_sector_no);
+bool file_open (struct file *, disk_sector_t);
 void file_close (struct file *);
 off_t file_read (struct file *, void *, off_t);
 off_t file_read_at (struct file *, void *, off_t size, off_t start);