Merge branch 'ah/fix-http-push'

diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c
index 4a7fae6b8ceabcb5202c615724b73606795aa543..1c2d7afd4cb9b70a324d355c3d69b732b181012b 100644 (file)
--- a/ewah/ewah_io.c
+++ b/ewah/ewah_io.c
@@ -110,9 +110,10 @@ int ewah_serialize(struct ewah_bitmap *self, int fd)
        return ewah_serialize_to(self, write_helper, (void *)(intptr_t)fd);
 }
 
-int ewah_read_mmap(struct ewah_bitmap *self, void *map, size_t len)
+int ewah_read_mmap(struct ewah_bitmap *self, const void *map, size_t len)
 {
-       uint8_t *ptr = map;
+       const uint8_t *ptr = map;
+       size_t i;
 
        self->bit_size = get_be32(ptr);
        ptr += sizeof(uint32_t);
@@ -135,13 +136,8 @@ int ewah_read_mmap(struct ewah_bitmap *self, void *map, size_t len)
        memcpy(self->buffer, ptr, self->buffer_size * sizeof(uint64_t));
        ptr += self->buffer_size * sizeof(uint64_t);
 
-#if __BYTE_ORDER != __BIG_ENDIAN
-       {
-               size_t i;
-               for (i = 0; i < self->buffer_size; ++i)
-                       self->buffer[i] = ntohll(self->buffer[i]);
-       }
-#endif
+       for (i = 0; i < self->buffer_size; ++i)
+               self->buffer[i] = ntohll(self->buffer[i]);
 
        self->rlw = self->buffer + get_be32(ptr);