summaryrefslogtreecommitdiff
path: root/modules/cache
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2005-06-15 21:37:10 +0000
committerBradley Nicholes <bnicholes@apache.org>2005-06-15 21:37:10 +0000
commita5930f73ee79615eb959c41bde2c145b49ebb3cd (patch)
tree96dfc04855b6ae3883d162b1a2f7c2f3829afc0c /modules/cache
parent05b8e8b41e50ef896e80fcc6dd5579a56705f2a3 (diff)
downloadhttpd-a5930f73ee79615eb959c41bde2c145b49ebb3cd.tar.gz
Fix up some type mismatches that are causing compiler errors in Metrowerks on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190819 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
-rw-r--r--modules/cache/mod_disk_cache.c2
-rw-r--r--modules/cache/mod_mem_cache.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index 52960a6a64..d13c440c92 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -811,7 +811,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
disk_info.name_len = strlen(dobj->name);
- iov[0].iov_base = &disk_info;
+ iov[0].iov_base = (caddr_t)&disk_info;
iov[0].iov_len = sizeof(disk_cache_info_t);
iov[1].iov_base = (void*)dobj->name;
iov[1].iov_len = disk_info.name_len;
diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
index b5ddead953..f1be48d471 100644
--- a/modules/cache/mod_mem_cache.c
+++ b/modules/cache/mod_mem_cache.c
@@ -218,7 +218,7 @@ static void cleanup_cache_object(cache_object_t *obj)
/* Cleanup the cache_object_t */
if (obj->key) {
- free(obj->key);
+ free((void*)obj->key);
}
free(obj);
@@ -381,7 +381,7 @@ static int create_entity(cache_handle_t *h, cache_type_e type_e,
cleanup_cache_object(obj);
return DECLINED;
}
- memcpy(obj->key, key, key_len);
+ memcpy((void*)obj->key, key, key_len);
/* Allocate and init mem_cache_object_t */
mobj = calloc(1, sizeof(*mobj));