[svn-r928] Changes since 19981118

----------------------

./src/H5.c
./src/H5Smpio.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpublic.h
./src/H5detect.c
./src/H5private.h
./src/H5public.h
./test/big.c
	The `long long' type isn't quite as prevalent as we had hoped;
	there is at least one system that defines `__int64' but not
	`long long'.  Therefore, I've temporarily changed all
	occurrences of `long long' to `long_long' and then #define
	that in H5private.h based on the existence of `long long' or
	`__int64'. This gets rid of some #ifdef's in other parts of the code.
	The semantics of the hdf5 types are:

	   *int8_t	 Exactly one byte
	   *int16_t	 At least two bytes. We favor 32-bit integers over
			 16-bit integers if the 16-bit integer is 4-bytes wide
			 (Cray)
	   *int32_t	 At least four bytes.
	   *int64_t	 At least eight bytes
	   long_long	 The widest integral integer type

	The H5Smpio.c contains debugging code which is non-portable.

./tools/h5ls.c
	Changed the order native types are detected so we favor the name `int'
	over `short' or `long' if two of them are the same.

./config/conclude.in
	Added a rule to make test programs depend on the hdf5 library. This
	fixes a minor bug where changing H5detect.c and then running `make
	test' caused H5Tinit.c to not be recompiled and therefore the test
	files are not relinked.

1 files changed, 12 insertions, 7 deletions

diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index fdfa569..e49916e 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -103,7 +103,8 @@ 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=%lld\n",
+	    FUNC, (long_long)total_bytes );
 #endif
     FUNC_LEAVE (SUCCEED);
 } /* H5S_mpio_all_type() */
@@ -166,9 +167,10 @@ 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=%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 );
 	if (i==0) fprintf(stdout, "  rank=%d\n", rank );
 	else	  fprintf(stdout, "\n" );
 #endif
@@ -251,7 +253,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=%lld "
+		"block=%lld stride=%lld\n", i, (long_long)d[i].count,
+		(long_long)d[i].block, (long_long)d[i].strid );
 #endif
 	err = MPI_Type_vector(	(int)(d[i].count),	/* count */
 				(int)(d[i].block),	/* blocklength */
@@ -311,7 +315,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]=%lld\n", i, b[1], (long_long)s[1] );
 #endif
 	    err = MPI_Type_struct( 2, b, s, t, &inner_type/*becomes outer*/ );
 	    MPI_Type_free( &outer_type );	/* no longer needed */
@@ -508,7 +513,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=%lld\n", (long_long)disp.offset );
 #endif
 
     /* Effective address determined by base addr and the MPI file type */