diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 23:50:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 23:50:38 +0200 |
| commit | b0d974d6d94968a367909b2259bde9c6d4729298 (patch) | |
| tree | fd147418ac5fddd7c8838fe988fb4c8590b7d8f5 /cache.h | |
| parent | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' (diff) | |
| parent | read-cache: use fixed width integer types (diff) | |
| download | git-b0d974d6d94968a367909b2259bde9c6d4729298.tar.xz git-b0d974d6d94968a367909b2259bde9c6d4729298.zip | |
Merge branch 'tg/index-struct-sizes'
The code that reads from a region that mmaps an on-disk index
assumed that "int"/"short" are always 32/16 bits.
* tg/index-struct-sizes:
read-cache: use fixed width integer types
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long); #define CACHE_SIGNATURE 0x44495243 /* "DIRC" */ struct cache_header { - unsigned int hdr_signature; - unsigned int hdr_version; - unsigned int hdr_entries; + uint32_t hdr_signature; + uint32_t hdr_version; + uint32_t hdr_entries; }; #define INDEX_FORMAT_LB 2 @@ -115,8 +115,8 @@ struct cache_header { * check it for equality in the 32 bits we save. */ struct cache_time { - unsigned int sec; - unsigned int nsec; + uint32_t sec; + uint32_t nsec; }; struct stat_data { |