diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-04-30 09:16:51 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-04-30 09:16:51 +0000 |
| commit | 24555786a7c2d3cf96fb8cfdf63dd981c2744cea (patch) | |
| tree | 6ee98e56de1827c8b468964fa5b1d3d1a9bf1e18 /memory | |
| parent | 53fa8c368e9949dde4ee418a64886649eb5665d9 (diff) | |
| download | apr-24555786a7c2d3cf96fb8cfdf63dd981c2744cea.tar.gz | |
Merge r1856873 from trunk:
Address some warnings raised by MSVC-32/64.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1877195 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/unix/apr_pools.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 82c7c5041..bd4de9868 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -419,7 +419,7 @@ apr_memnode_t *allocator_alloc(apr_allocator_t *allocator, apr_size_t in_size) return NULL; } #endif - node->index = index; + node->index = (apr_uint32_t)index; node->endp = (char *)node + size; have_node: @@ -876,7 +876,7 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t in_size) free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = free_index; + active->free_index = (apr_uint32_t)free_index; node = active->next; if (free_index >= node->free_index) goto have_mem; @@ -1292,7 +1292,7 @@ static int psprintf_flush(apr_vformatter_buff_t *vbuff) free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = free_index; + active->free_index = (apr_uint32_t)free_index; node = active->next; if (free_index < node->free_index) { do { @@ -1448,7 +1448,7 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) free_index = (APR_ALIGN(active->endp - active->first_avail + 1, BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX; - active->free_index = free_index; + active->free_index = (apr_uint32_t)free_index; node = active->next; if (free_index >= node->free_index) { |