commit d3285dcb5cd45ccea1e9a7cf439f61f771f08274 from: rsc date: Fri Dec 16 18:58:44 2005 UTC avoid dup symbol for os x commit - 693cab16ccae2e3498ab3318c6a42e2a18c2099f commit + d3285dcb5cd45ccea1e9a7cf439f61f771f08274 blob - b72f053daa70f6ff5170c198403c2ca088262384 blob + 6843e341f44c758ac8e935f7622c2eec74077631 --- src/libdiskfs/file.c +++ src/libdiskfs/file.c @@ -2,6 +2,8 @@ #include #include +int nfilereads; + typedef struct DiskFile DiskFile; struct DiskFile { @@ -9,8 +11,6 @@ struct DiskFile int fd; }; -int nfilereads; - static long preadn(int fd, void *vdata, u32int ulen, u64int offset) { blob - ba314388d8ab6a7fb4030b91d87a9ecf6d48e758 blob + 5d8528c292ac41c6f1936f99b4153ff97ecc8f6f --- src/libdiskfs/venti.c +++ src/libdiskfs/venti.c @@ -13,7 +13,7 @@ struct DiskVenti VtCache *c; }; -int nfilereads; +extern int nfilereads; /* * This part is like file.c but doesn't require storing the root block