X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fio-layer%2Fwapi_glob.c;h=88864821be44d394939dd5d19a9c87239eee38f7;hb=b5ec75b2643d3e42a52452841efaeb7a5d1b1581;hp=31c7f6d94111971a913552abda8b601c234446e3;hpb=28f473c41df72b278eaf9784c29c2b8fa2cbe06a;p=mono.git

diff --git a/mono/io-layer/wapi_glob.c b/mono/io-layer/wapi_glob.c
index 31c7f6d9411..88864821be4 100644
--- a/mono/io-layer/wapi_glob.c
+++ b/mono/io-layer/wapi_glob.c
@@ -266,8 +266,9 @@ globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
 	const gchar *p;
 
 	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
-	    malloc(newsize);
+	/* FIXME: Can just use realloc(). */
+	pathv = (char **)(pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
+	    malloc(newsize));
 	if (pathv == NULL) {
 		if (pglob->gl_pathv) {
 			free(pglob->gl_pathv);
@@ -288,7 +289,7 @@ globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
 		;
 	len = (size_t)(p - path);
 	*limitp += len;
-	if ((copy = malloc(len)) != NULL) {
+	if ((copy = (char *)malloc(len)) != NULL) {
 		if (g_Ctoc(path, copy, len)) {
 			free(copy);
 			return(WAPI_GLOB_NOSPACE);