X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/740819ef7b3b96451e16b2fa3891d46cfc73ec64..1db8b61de7fd31b9c7b02918e6c194255979f030:/flist.c 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,