Merge changes from other branches

This commit is contained in:
Allen Byrne
2020-02-29 14:03:20 -06:00
parent 3f4c3bd5ed
commit 2804716f64
151 changed files with 7606 additions and 7413 deletions

View File

@@ -166,7 +166,7 @@ ph5diff_worker(int nID)
{
struct diff_mpi_args args;
struct diffs_found diffs;
int i;
unsigned i;
/* Make certain we've received the filenames and opened the files already */
if(file1_id < 0 || file2_id < 0)