You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2005/06/15 23:37:10 UTC
svn commit: r190819 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c
/httpd/httpd/trunk/modules/cache/mod_mem_cache.c
Author: bnicholes
Date: Wed Jun 15 14:37:10 2005
New Revision: 190819
URL: http://svn.apache.org/viewcvs?rev=190819&view=rev
Log:
Fix up some type mismatches that are causing compiler errors in Metrowerks on NetWare
Modified:
httpd/httpd/trunk/modules/cache/mod_disk_cache.c
httpd/httpd/trunk/modules/cache/mod_mem_cache.c
Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=190819&r1=190818&r2=190819&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Wed Jun 15 14:37:10 2005
@@ -811,7 +811,7 @@
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;
Modified: httpd/httpd/trunk/modules/cache/mod_mem_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_mem_cache.c?rev=190819&r1=190818&r2=190819&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_mem_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_mem_cache.c Wed Jun 15 14:37:10 2005
@@ -218,7 +218,7 @@
/* Cleanup the cache_object_t */
if (obj->key) {
- free(obj->key);
+ free((void*)obj->key);
}
free(obj);
@@ -381,7 +381,7 @@
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));