diff options
| author | Evan Huus <eapache@gmail.com> | 2013-02-08 02:15:03 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-02-08 02:15:03 +0000 |
| commit | ebc2067e3035fccfa9de423c102f20d235725371 (patch) | |
| tree | 7433ecfd26e7ab463547177b34c857c9e95f366d /epan/wmem | |
| parent | 9fcb518818d6e90dcc28dbf3ba0a1663b1ad9cc4 (diff) | |
Add explicit casts to pacify MSVC buildbot.
svn path=/trunk/; revision=47551
Diffstat (limited to 'epan/wmem')
| -rw-r--r-- | epan/wmem/wmem_allocator_block.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/wmem/wmem_allocator_block.c b/epan/wmem/wmem_allocator_block.c index 68b1b18685..f0bc9d9b19 100644 --- a/epan/wmem/wmem_allocator_block.c +++ b/epan/wmem/wmem_allocator_block.c @@ -358,7 +358,7 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator, available = chunk->len; /* set new values for chunk */ - chunk->len = aligned_size + sizeof(wmem_block_chunk_t); + chunk->len = (guint32) (aligned_size + sizeof(wmem_block_chunk_t)); chunk->last = FALSE; /* with chunk's values set, we can use the standard macro to calculate @@ -410,9 +410,9 @@ wmem_block_split_free_chunk(wmem_block_allocator_t *allocator, /* Now that we've copied over the free-list stuff (which may have overlapped * with our new chunk header) we can safely write our new chunk header. */ - extra->len = available; + extra->len = (guint32) available; extra->last = last; - extra->prev = aligned_size + sizeof(wmem_block_chunk_t); + extra->prev = (guint32) (aligned_size + sizeof(wmem_block_chunk_t)); extra->used = FALSE; } @@ -448,7 +448,7 @@ wmem_block_split_used_chunk(wmem_block_allocator_t *allocator, available = chunk->len; /* set new values for chunk */ - chunk->len = aligned_size + sizeof(wmem_block_chunk_t); + chunk->len = (guint32) (aligned_size + sizeof(wmem_block_chunk_t)); chunk->last = FALSE; /* with chunk's values set, we can use the standard macro to calculate @@ -457,9 +457,9 @@ wmem_block_split_used_chunk(wmem_block_allocator_t *allocator, available -= (aligned_size + sizeof(wmem_block_chunk_t)); /* set the new values for the chunk */ - extra->len = available; + extra->len = (guint32) available; extra->last = last; - extra->prev = aligned_size + sizeof(wmem_block_chunk_t); + extra->prev = (guint32) (aligned_size + sizeof(wmem_block_chunk_t)); extra->used = FALSE; /* add it to the free list */ |