diff options
| author | Ben Collins-Sussman <sussman@apache.org> | 2002-01-25 20:50:32 +0000 |
|---|---|---|
| committer | Ben Collins-Sussman <sussman@apache.org> | 2002-01-25 20:50:32 +0000 |
| commit | b7c364298121a448fefb16c6e3191dcc3afccc21 (patch) | |
| tree | 7211627b77264119d17220f104c1041daaa11db7 /mmap/unix | |
| parent | 4b1ea2d35e6272596dcca8363931462cd5c9831e (diff) | |
| download | apr-b7c364298121a448fefb16c6e3191dcc3afccc21.tar.gz | |
I've been getting compile warnings on FreeBSD 4.4/4.5 for months:
"warning: declaration of `mmap' shadows global declaration"
This should fix the problem.
* apr_mmap.h (apr_mmap_delete, apr_mmap_offset): rename argument to 'mm'.
* mmap/unix/mmap/mmap.c (apr_mmap_delete): same.
* mmap/unix/mmap/common.c (apr_mmap_offset): same.
* mmap/win32/mmap/mmap.c (apr_mmap_delete): same.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@62832 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'mmap/unix')
| -rw-r--r-- | mmap/unix/mmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 147317cc6..99aae562b 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -199,15 +199,15 @@ APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mmap) +APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm) { apr_status_t rv; - if (mmap->mm == (void *)-1) + if (mm->mm == (void *)-1) return APR_ENOENT; - if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) { - apr_pool_cleanup_kill(mmap->cntxt, mmap, mmap_cleanup); + if ((rv = mmap_cleanup(mm)) == APR_SUCCESS) { + apr_pool_cleanup_kill(mm->cntxt, mm, mmap_cleanup); return APR_SUCCESS; } return rv; |