Commit 8c174cb9 authored Jun 15, 2005 by Bradley Nicholes

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

parent febbbaa1

modules/cache/mod_disk_cache.c

+1 −1

Changes for modules/cache/mod_disk_cache.c: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -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;

modules/cache/mod_mem_cache.c

+2 −2

Changes for modules/cache/mod_mem_cache.c: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -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));