[svn-r21195] Correct windows exports for h5diff.

4 files changed, 26 insertions, 26 deletions

diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 123eafc..1e8afa1 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -68,7 +68,7 @@ IF (APPLE)
     IF (HDF5_BUILD_WITH_INSTALL_NAME)
       SET_TARGET_PROPERTIES(${HDF5_TOOLS_LIB_TARGET} PROPERTIES
       LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}"
-      INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/tools"
+      INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
       BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME}
       )
     ENDIF (HDF5_BUILD_WITH_INSTALL_NAME)
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 88ab7ea..a7d06f7 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -32,6 +32,12 @@ extern "C" {
 #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
  */
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