summaryrefslogtreecommitdiff
path: root/include/apr_mmap.h
diff options
context:
space:
mode:
authorsussman <sussman@13f79535-47bb-0310-9956-ffa450edef68>2002-01-25 20:50:32 +0000
committersussman <sussman@13f79535-47bb-0310-9956-ffa450edef68>2002-01-25 20:50:32 +0000
commit33f9b9034eb20cc724c440c9e8b959ca5b98d0fb (patch)
tree7211627b77264119d17220f104c1041daaa11db7 /include/apr_mmap.h
parent0d1f920e4c4f182bcfdd269e40fc50702b509e46 (diff)
downloadlibapr-33f9b9034eb20cc724c440c9e8b959ca5b98d0fb.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: http://svn.apache.org/repos/asf/apr/apr/trunk@62832 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_mmap.h')
-rw-r--r--include/apr_mmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/apr_mmap.h b/include/apr_mmap.h
index d4113c8dd..83bba6a47 100644
--- a/include/apr_mmap.h
+++ b/include/apr_mmap.h
@@ -177,7 +177,7 @@ APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
* Remove a mmap'ed.
* @param mmap The mmap'ed file.
*/
-APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mmap);
+APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm);
/**
* Move the pointer into the mmap'ed file to the specified offset.
@@ -185,7 +185,7 @@ APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mmap);
* @param mmap The mmap'ed file.
* @param offset The offset to move to.
*/
-APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mmap,
+APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mm,
apr_off_t offset);
#endif /* APR_HAS_MMAP */