[svn-r955] Made debug print statements portable.

2 files changed, 14 insertions, 16 deletions

diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c
index 27d0871..b12072b 100644
--- a/src/H5Fmpio.c
+++ b/src/H5Fmpio.c
@@ -520,8 +520,8 @@ H5F_mpio_read(H5F_low_t *lf, H5F_access_t *access_parms,
 
 #ifdef H5Fmpio_DEBUG
     if (H5F_mpio_Debug[(int)'r'])
-        fprintf(stdout, "in H5F_mpio_read  mpi_off=%lld  size_i=%d\n",
-                mpi_off, size_i );
+        HDfprintf(stdout, "in H5F_mpio_read  mpi_off=%Hd  size_i=%d\n",
+                (hssize_t)mpi_off, size_i );
 #endif
 
     /* Set up for a fancy xfer using complex types, or single byte block.
@@ -772,8 +772,8 @@ H5F_mpio_write(H5F_low_t *lf, H5F_access_t *access_parms,
 
 #ifdef H5Fmpio_DEBUG
     if (H5F_mpio_Debug[(int)'w'])
-        fprintf(stdout, "in H5F_mpio_write  mpi_off=%lld  size_i=%d\n",
-                mpi_off, size_i );
+        HDfprintf(stdout, "in H5F_mpio_write  mpi_off=%Hd  size_i=%d\n",
+                (hssize_t)mpi_off, size_i );
 #endif
 
     /* Only p0 will do the actual write if all procs in comm write same data */
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 7cf93a6..19be4f7 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -103,8 +103,7 @@ H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size,
     *is_derived_type = 0;
 
 #ifdef H5Smpi_DEBUG
-    fprintf(stdout, "Leave %s total_bytes=%lld\n",
-	    FUNC, (long_long)total_bytes );
+    fprintf(stdout, "Leave %s total_bytes=%Hu\n", FUNC, total_bytes );
 #endif
     FUNC_LEAVE (SUCCEED);
 } /* H5S_mpio_all_type() */
@@ -167,10 +166,9 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
 	d[i].count = diminfo[i].count;
 	d[i].xtent = space->extent.u.simple.size[i];
 #ifdef H5Smpi_DEBUG
-	fprintf(stdout, "hyper_type: start=%lld  stride=%lld  count=%lld  "
-		"block=%lld  xtent=%lld", (long_long)d[i].start,
-		(long_long)d[i].strid, (long_long)d[i].count,
-		(long_long)d[i].block, (long_long)d[i].xtent );
+	fprintf(stdout, "hyper_type: start=%Hd  stride=%Hu  count=%Hu  "
+		"block=%Hu  xtent=%Hu",
+		d[i].start, d[i].strid, d[i].count, d[i].block, d[i].xtent );
 	if (i==0) fprintf(stdout, "  rank=%d\n", rank );
 	else	  fprintf(stdout, "\n" );
 #endif
@@ -253,9 +251,9 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
     /* construct the type by walking the hyperslab dims from the inside out */
     for ( i=new_rank-1; i>=0; --i) {
 #ifdef H5Smpi_DEBUG
-	fprintf(stdout, "hyper_type: i=%d Making vector type\n count=%lld "
-		"block=%lld stride=%lld\n", i, (long_long)d[i].count,
-		(long_long)d[i].block, (long_long)d[i].strid );
+	fprintf(stdout, "hyper_type: i=%d Making vector type\n"
+		"count=%Hu block=%Hu stride=%Hu\n",
+		i, d[i].count, d[i].block, d[i].strid );
 #endif
 	err = MPI_Type_vector(	(int)(d[i].count),	/* count */
 				(int)(d[i].block),	/* blocklength */
@@ -315,8 +313,8 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
 	     * The struct's first "field" is the displacement,
 	     * and its second "field" is the just-created vector type */
 #ifdef H5Smpi_DEBUG
-	    fprintf(stdout, "hyper_type: i=%d Making struct type\n "
-		    "b[1]=%d d[1]=%lld\n", i, b[1], (long_long)s[1] );
+	    fprintf(stdout, "hyper_type: i=%d Making struct type\n"
+		    "b[1]=%d d[1]=%Hu\n", i, b[1], (hsize_t)s[1] );
 #endif
 	    err = MPI_Type_struct( 2, b, s, t, &inner_type/*becomes outer*/ );
 	    MPI_Type_free( &outer_type );	/* no longer needed */
@@ -513,7 +511,7 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
     H5F_addr_add( &disp, &(layout->addr) );
     f->shared->access_parms->u.mpio.disp = disp;
 #ifdef H5Smpi_DEBUG
-    fprintf(stdout, "spaces_xfer: disp=%lld\n", (long_long)disp.offset );
+    fprintf(stdout, "spaces_xfer: disp=%Hu\n", disp.offset );
 #endif
 
     /* Effective address determined by base addr and the MPI file type */