Some compilers (gcc with -pedantic) don't like the ?:
construct. So give an explicit middle term.
Reported-by: Jari Aalto <jari.aalto@cante.net
Signed-off-by: NeilBrown <neilb@suse.de>
if (of)
fputc(c, of);
- start = ftell(of ?: f);
+ start = ftell(of ? of : f);
if (c == EOF)
break;
else
pos = target2;
}
- end = ftell(of ?: f);
+ end = ftell(of ? of : f);
if (pos > target2)
end -= (pos - target2) - 1;
plist = patch_add_file(plist, np,
ci.merger, 0, &p->wiggles);
p->chunks = p->conflicts;
save_merge(fm, fb, fa, ci.merger,
- p->outfile ?: p->file,
+ p->outfile ? p->outfile : p->file,
p->outfile ? 0 : !p->is_merge);
}
if (!just_diff)