diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2014-03-20 13:38:08 -0700 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-03-20 13:38:08 -0700 |
| commit | a1aa5961dc606dc08c460e76e44901fc4920844e (patch) | |
| tree | 9f3e0ba381a74f4cb7600d7b3baa7ebb5fd69268 /bcache.h | |
| parent | fc10e61267e43ea022959041d6f60c83995630da (diff) | |
| parent | 89f11b135d1d57a5dbdc3548bfb9bfa0113075c4 (diff) | |
Merge remote-tracking branch 'remotes/angband/master'
Conflicts:
make-bcache.c
Diffstat (limited to 'bcache.h')
| -rw-r--r-- | bcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -115,7 +115,7 @@ BITMASK(BDEV_STATE, struct cache_sb, flags, 61, 2); #define BDEV_STATE_DIRTY 2U #define BDEV_STATE_STALE 3U -inline uint64_t crc64(const void *_data, size_t len); +uint64_t crc64(const void *_data, size_t len); #define node(i, j) ((void *) ((i)->d + (j))) #define end(i) node(i, (i)->keys) |