From 33f9b9034eb20cc724c440c9e8b959ca5b98d0fb Mon Sep 17 00:00:00 2001 From: sussman Date: Fri, 25 Jan 2002 20:50:32 +0000 Subject: 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: http://svn.apache.org/repos/asf/apr/apr/trunk@62832 13f79535-47bb-0310-9956-ffa450edef68 --- mmap/unix/mmap.c | 8 ++++---- mmap/win32/mmap.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mmap') 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; diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c index 1e944cbae..a410390b7 100644 --- a/mmap/win32/mmap.c +++ b/mmap/win32/mmap.c @@ -195,12 +195,12 @@ 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 ((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; -- cgit v1.2.1