mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'es/osx-header-pollutes-mask-macro'

Browse Source 
* es/osx-header-pollutes-mask-macro:
  ewah: use less generic macro name
  ewah/bitmap: silence warning about MASK macro redefinition
This commit is contained in:
Junio C Hamano
2015-06-24 12:21:44 -07:00
parent 3c84c38dac 34b935c01f
commit 6da9f888da
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pack-bitmap.c
View File

@ -622,7 +622,7 @@ static void show_objects_for_type(
while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
eword_t word = objects->words[i] & filter;
for (offset = 0; offset < BITS_IN_WORD; ++offset) {
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
const unsigned char *sha1;
struct revindex_entry *entry;
uint32_t hash = 0;
@ -644,7 +644,7 @@ static void show_objects_for_type(
show_reach(sha1, object_type, 0, hash, bitmap_git.pack, entry->offset);
}
pos += BITS_IN_WORD;
pos += BITS_IN_EWORD;
i++;
}
}
@ -776,7 +776,7 @@ int reuse_partial_packfile_from_bitmap(struct packed_git **packfile,
break;
}
reuse_objects += BITS_IN_WORD;
reuse_objects += BITS_IN_EWORD;
}
#ifdef GIT_BITMAP_DEBUG
@ -1001,7 +1001,7 @@ static int rebuild_bitmap(uint32_t *reposition,
while (ewah_iterator_next(&word, &it)) {
uint32_t offset, bit_pos;
for (offset = 0; offset < BITS_IN_WORD; ++offset) {
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
if ((word >> offset) == 0)
break;
@ -1014,7 +1014,7 @@ static int rebuild_bitmap(uint32_t *reposition,
return -1;
}
pos += BITS_IN_WORD;
pos += BITS_IN_EWORD;
}
return 0;
}