[svn-r21337] Synchronize cmake files with tested commits from trunk, windows parallel diff

3 files changed, 37 insertions, 37 deletions

diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 66c5188..1ff4402 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -82,6 +82,13 @@ H5TOOLS_DLL hsize_t  h5diff(const char *fname1,
                 const char *objname2,
                 diff_opt_t *options);
 
+H5TOOLS_DLL hsize_t diff( hid_t      file1_id,
+              const char *path1,
+              hid_t      file2_id,
+              const char *path2,
+              diff_opt_t *options,
+              diff_args_t *argdata);
+
 #ifdef H5_HAVE_PARALLEL
 H5TOOLS_DLL void phdiff_dismiss_workers(void);
 H5TOOLS_DLL void print_manager_output(void);
@@ -111,13 +118,6 @@ hsize_t diff_datasetid( hid_t dset1_id,
                         const char *obj2_name,
                         diff_opt_t *options);
 
-hsize_t diff( hid_t      file1_id,
-              const char *path1,
-              hid_t      file2_id,
-              const char *path2,
-              diff_opt_t *options,
-              diff_args_t *argdata);
-
 hsize_t diff_compare( hid_t file1_id,
                       const char *file1_name,
                       const char *obj1_name,
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 7cebd15..4d356c7 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -29,8 +29,14 @@ extern "C" {
 #endif
 
 /* ``parallel_print'' information */
-#define PRINT_DATA_MAX_SIZE 	512
-#define OUTBUFF_SIZE 		(PRINT_DATA_MAX_SIZE*4)
+#define PRINT_DATA_MAX_SIZE   512
+#define OUTBUFF_SIZE     (PRINT_DATA_MAX_SIZE*4)
+
+H5TOOLS_DLLVAR int  g_nTasks;
+H5TOOLS_DLLVAR unsigned char g_Parallel;
+H5TOOLS_DLLVAR char    outBuff[];
+H5TOOLS_DLLVAR int  outBuffOffset;
+H5TOOLS_DLLVAR FILE *   overflow_file;
 
 /*
  * begin get_option section
@@ -41,7 +47,7 @@ H5TOOLS_DLLVAR const char *opt_arg;     /* flag argument (or value)
 
 enum {
     no_arg = 0,         /* doesn't take an argument     */
-    require_arg,        /* requires an argument	        */
+    require_arg,        /* requires an argument          */
     optional_arg        /* argument is optional         */
 };
 
@@ -52,23 +58,23 @@ enum {
  * the option. The long options are specified in the following way:
  *
  * struct long_options foo[] = {
- * 	{ "filename", require_arg, 'f' },
- * 	{ "append", no_arg, 'a' },
- * 	{ "width", require_arg, 'w' },
- * 	{ NULL, 0, 0 }
+ *   { "filename", require_arg, 'f' },
+ *   { "append", no_arg, 'a' },
+ *   { "width", require_arg, 'w' },
+ *   { NULL, 0, 0 }
  * };
  *
  * Long named options can have arguments specified as either:
  *
- * 	``--param=arg'' or ``--param arg''
+ *   ``--param=arg'' or ``--param arg''
  *
  * Short named options can have arguments specified as either:
  *
- * 	``-w80'' or ``-w 80''
+ *   ``-w80'' or ``-w 80''
  *
  * and can have more than one short named option specified at one time:
  *
- * 	-aw80
+ *   -aw80
  *
  * in which case those options which expect an argument need to come at the
  * end.
@@ -126,7 +132,7 @@ H5TOOLS_DLL herr_t init_objs(hid_t fid, find_objs_t *info, table_t **group_table
     table_t **dset_table, table_t **type_table);
 H5TOOLS_DLL obj_t   *search_obj(table_t *temp, haddr_t objno);
 #ifndef H5_HAVE_TMPFILE
-H5TOOLS_DLL FILE *	tmpfile(void);
+H5TOOLS_DLL FILE *  tmpfile(void);
 #endif
 
 /*************************************************************
@@ -168,4 +174,4 @@ H5TOOLS_DLL void     h5tools_setstatus(int d_status);
 }
 #endif
 
-#endif	/* H5TOOLS_UTILS_H__ */
+#endif  /* H5TOOLS_UTILS_H__ */
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index 9476a71..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
-
-H5TOOLS_DLLVAR int	g_nTasks;
-H5TOOLS_DLLVAR unsigned char g_Parallel;
-H5TOOLS_DLLVAR char    outBuff[];
-H5TOOLS_DLLVAR int	outBuffOffset;
-H5TOOLS_DLLVAR FILE *	overflow_file;
+#define MPI_TAG_END    7
+#define MPI_TAG_PARALLEL  8
 
 struct diff_mpi_args
 {
-    char	name1[256];
-    char	name2[256];
-    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