[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, 4 insertions, 39 deletions

diff --git a/src/H5detect.c b/src/H5detect.c
index 26024b1..44b0486 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -30,41 +30,9 @@ static const char *FileHeader = "\n\
  *-------------------------------------------------------------------------
  */
 #undef NDEBUG
-#include <H5config.h>
-
-/* See H5private.h for how to include files */
-#ifdef STDC_HEADERS
-#   include <assert.h>
-#   include <math.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <string.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
-#endif
-#ifdef _POSIX_VERSION
-#   include <pwd.h>
-#endif
-
-#if defined(TIME_WITH_SYS_TIME)
-#   include <sys/time.h>
-#   include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#   include <sys/time.h>
-#else
-#   include <time.h>
-#endif
+#include <H5private.h>
 
 #define MAXDETECT 16
-
-#ifndef MIN
-#  define MIN(X,Y) ((X)<(Y)?(X):(Y))
-#  define MIN3(X,Y,Z) MIN(X,MIN(Y,Z))
-#endif
-
 /*
  * This structure holds information about a type that
  * was detected.
@@ -976,12 +944,9 @@ main(void)
     DETECT_I(long,		  LONG,	   d[nd]); nd++;
     DETECT_I(unsigned long,	  ULONG,   d[nd]); nd++;
 
-#if SIZEOF_LONG_LONG > SIZEOF_LONG
-    DETECT_I(long long,           LLONG,   d[nd]); nd++;
-    DETECT_I(unsigned long long,  ULLONG,  d[nd]); nd++;
-#elif SIZEOF___INT64 > SIZEOF_LONG
-    DETECT_I(__int64,             LLONG,   d[nd]); nd++;
-    DETECT_I(unsigned __int64,    ULLONG,  d[nd]); nd++;
+#if SIZEOF_LONG_LONG>0
+    DETECT_I(long_long,           LLONG,   d[nd]); nd++;
+    DETECT_I(unsigned long_long,  ULLONG,  d[nd]); nd++;
 #else
     /*
      * This architecture doesn't support an integer type larger than `long'