diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-04-03 11:18:36 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-04-03 11:18:36 +0000 |
| commit | a9202424b54d12e432f9020f6da1c9136d21aa1a (patch) | |
| tree | 0ac2f739e24c201d7cd2e18b51793a6603422699 /memory | |
| parent | 312aa60bf11f37e88907b069bda1f1dbf26af7aa (diff) | |
| download | apr-a9202424b54d12e432f9020f6da1c9136d21aa1a.tar.gz | |
Merge r1789947 from trunk:
Follow up to r1788334: apr_allocator_align() should take an allocator as
argument, for better scalability of the API.
Suggested by ivan.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1789951 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory')
| -rw-r--r-- | memory/unix/apr_pools.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 8acc9bd8a..b9cdee761 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -269,8 +269,10 @@ apr_size_t allocator_align(apr_size_t in_size) return size; } -APR_DECLARE(apr_size_t) apr_allocator_align(apr_size_t size) +APR_DECLARE(apr_size_t) apr_allocator_align(apr_allocator_t *allocator, + apr_size_t size) { + (void)allocator; return allocator_align(size); } |