[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 14 insertions, 20 deletions

diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index 0e454c8..becbd6c 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -17,37 +17,31 @@
 #define _PH5DIFF_H__
 
 /* Send from manager to workers */
-#define MPI_TAG_ARGS		1
-#define MPI_TAG_PRINT_TOK	2
+#define MPI_TAG_ARGS    1
+#define MPI_TAG_PRINT_TOK  2
 
 /*Sent from workers to manager */
-#define MPI_TAG_TOK_REQUEST	3
-#define MPI_TAG_DONE		4
-#define MPI_TAG_TOK_RETURN	5
-#define MPI_TAG_PRINT_DATA	6
+#define MPI_TAG_TOK_REQUEST  3
+#define MPI_TAG_DONE    4
+#define MPI_TAG_TOK_RETURN  5
+#define MPI_TAG_PRINT_DATA  6
 
 /* Operational tags used to init and complete diff */
-#define MPI_TAG_END		7
-#define MPI_TAG_PARALLEL	8
+#define MPI_TAG_END    7
+#define MPI_TAG_PARALLEL  8
 
-extern int	g_nTasks;
-extern unsigned char g_Parallel;
-extern char    outBuff[];
-extern int	outBuffOffset;
-extern FILE *	overflow_file;
-
-struct diff_args
+struct diff_mpi_args
 {
-    char	name1[256];
-    char	name2[256];
-    h5trav_type_t   type;
-    diff_opt_t	options;
+    char  name1[256];
+    char  name2[256];
+    diff_opt_t  options;
+    diff_args_t argdata;  /* rest args */
 };
 
 struct diffs_found
 {
     hsize_t nfound;
-    int	    not_cmp;
+    int      not_cmp;
 };
 
 #ifdef H5_HAVE_PARALLEL