From: Martin Pool <mbp@samba.org>
Date: Wed, 5 Dec 2001 13:48:41 +0000 (+0000)
Subject: IRIX cc cares that the operands to the ternary have the same type.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/87a819edee4d3d7484b6ef312dcd4c6f1aa07023

IRIX cc cares that the operands to the ternary have the same type.
---

diff --git a/flist.c b/flist.c
index d9b0da7a..0b0fd233 100644
--- a/flist.c
+++ b/flist.c
@@ -464,7 +464,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT *st)
 }
 
 #define STRDUP(ap, p)	(ap ? string_area_strdup(ap, p) : strdup(p))
-#define MALLOC(ap, i)	(ap ? string_area_malloc(ap, i) : malloc(i))
+/* IRIX cc cares that the operands to the ternary have the same type. */
+#define MALLOC(ap, i)	(ap ? (void*) string_area_malloc(ap, i) : malloc(i))
 
 /* create a file_struct for a named file */
 struct file_struct *make_file(int f, char *fname, struct string_area **ap,