diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:46 +0100 |
| commit | 3b1a0fc7079b06761580d3b47ddc5e5b1065dfb1 (patch) | |
| tree | 7f3b05c68c7ab6afd80ff49076f6ea04ffd946ef /include | |
| parent | 17b6909dd1b1e222764728e62124726a2581c6aa (diff) | |
| parent | 7d9ffc2d54d09c47794aea2f0f54e823e8f1edc9 (diff) | |
| download | barebox-3b1a0fc7079b06761580d3b47ddc5e5b1065dfb1.tar.gz barebox-3b1a0fc7079b06761580d3b47ddc5e5b1065dfb1.tar.xz | |
Merge branch 'for-next/digest'
Diffstat (limited to 'include')
| -rw-r--r-- | include/digest.h | 2 | ||||
| -rw-r--r-- | include/fs.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/digest.h b/include/digest.h index a1cdbb2d7a..a87e29bd28 100644 --- a/include/digest.h +++ b/include/digest.h @@ -100,7 +100,7 @@ void digest_free(struct digest *d); int digest_file_window(struct digest *d, const char *filename, unsigned char *hash, const unsigned char *sig, - ulong start, ulong size); + loff_t start, loff_t size); int digest_file(struct digest *d, const char *filename, unsigned char *hash, const unsigned char *sig); diff --git a/include/fs.h b/include/fs.h index 181318f404..f1514afa92 100644 --- a/include/fs.h +++ b/include/fs.h @@ -130,6 +130,8 @@ int protect(int fd, size_t count, loff_t offset, int prot); int protect_file(const char *file, int prot); void *memmap(int fd, int flags); +#define MAP_FAILED ((void *)-1) + #define FILESIZE_MAX ((loff_t)-1) #define PROT_READ 1 |