HDFFV-10297 merge from develop

2017-10-19 15:15:44 -05:00
parent 2dbd7c685f
commit 6d7133bf01
60 changed files with 4827 additions and 5154 deletions
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -32,7 +32,7 @@ struct diff_mpi_args
 {
    char  name1[256];
    char  name2[256];
-    diff_opt_t  options;
+    diff_opt_t  opts;
    diff_args_t argdata;  /* rest args */
 };