From 60030b5631053ec7c4c9633f58ac9ae90bc2cbdd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 22 Feb 2012 09:03:59 -0500
Subject: [svn-r21967] Checked all %lu references and corrected 2 that should
 have been '%"H5_PRINTF_LL_WIDTH"u' Moved lib variables windows linking
 declarations to proper file location.

Tested: local linux windows
---
 tools/h5ls/h5ls.c         | 4 ++--
 tools/lib/h5tools_utils.h | 6 ++++++
 tools/lib/ph5diff.h       | 6 ------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 55103a1..9668a22 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2261,7 +2261,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
 
         /* Print dimensions */
         for (i=0; i<ndims; i++)
-            h5tools_str_append(buffer, "%s%lu" , i?",":"[", dims[i]);
+            h5tools_str_append(buffer, "%s%"H5_PRINTF_LL_WIDTH"u" , i?",":"[", dims[i]);
         h5tools_str_append(buffer, "]");
 
         free(dims);
@@ -2586,7 +2586,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
                 /* simple dataspace */
                 h5tools_str_append(&buffer, " {");
                 for (i=0; i<ndims; i++) {
-                    h5tools_str_append(&buffer, "%s%lu", i?", ":"", size[i]);
+                    h5tools_str_append(&buffer, "%s%"H5_PRINTF_LL_WIDTH"u", i?", ":"", size[i]);
                     nelmts *= size[i];
                 }
                 h5tools_str_append(&buffer, "}\n");
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 3e628e2..f30974a 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;
+
 /* Maximum size used in a call to malloc for a dataset */
 H5TOOLS_DLLVAR hsize_t H5TOOLS_MALLOCSIZE;
 /* size of hyperslab buffer when a dataset is bigger than H5TOOLS_MALLOCSIZE */
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index b098082..becbd6c 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -30,12 +30,6 @@
 #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;
-
 struct diff_mpi_args
 {
     char  name1[256];
-- 
cgit v0.12