[svn-r859] Changes since 19981030

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

./MANIFEST
	Added new Pablo files HDF5record_RT.h and ProcIDs.h

./acconfig.h
./configure		[REGENERATED]
./configure.in
./src/H5.c
./src/H5Vprivate.h
./src/H5config.h.in	[REGENERATED]
./src/H5private.h
./src/H5public.h
./test/big.c
	Added more configuration stuff for the Win32 environment. Removed all
	the #ifdef WIN32 from the source and replaced them with OS-independent
	stuff.  Specifics follow:

	Check for non-Posix.1 `st_blocks' field in `struct stat' which is used
	by the big file test to decide if the file system supports holes.  If
	the st_blocks field isn't present then we just skip the test.

	Configure checks for <io.h> <sys/resource.h> <sys/time.h> and
	<winsock.h> and defines HAVE_IO_H, HAVE_SYS_RESOURCE_H,
	HAVE_SYS_TIME_H and HAVE_WINSOCK_H when they're found.

	Configure checks whether both <sys/time.h> and <time.h> can be
	included and defines SYS_TIME_WITH_TIME if so.  Otherwise include only
	<sys/time.h> or <time.h> even if both exist.

	Configure checks sizeof(__int64) and defines SIZEOF___INT64 to the
	result or to zero if __int64 isn't defined.  The source uses `long
	long' in preference to `__int64'.

	Removed null WIN32 definition for `inline' since such a definition
	already exists in H5config.h

	Protected gettimeofday() calls in debugging code with
	HAVE_GETTIMEOFDAY instead of WIN32.

./src/H5F.c
./src/H5Flow.c
./src/H5Fmpio.c
./src/H5Fsec2.c
./src/H5Fstdio.h
./src/H5P.c
./src/H5Tconv.c
./src/H5private.h
	Removed #include of system files from library source files and
	consolodated them into H5private.h where they're protected by various
	configuration macros (most of them were duplicated there already
	anyway).

./test/big.c
./test/chunk.c
./test/cmpd_dset.c
./test/dsets.c
./test/dtypes.c
./test/extend.c
./test/external.c
./test/fillval.c
./test/flush1.c
./test/flush2.c
./test/iopipe.c
./test/links.c
./test/mount.c
./test/mtime.c
./test/overhead.c
./test/ragged.c
./test/shtype.c
./test/unlink.c
	Protected system #include's with #ifdef's from H5config.h.

	Undefined NDEBUG since some of the tests rely on assert() to check
	return values.

	Removed WIN32 definitions for __unused__ since this can be controlled
	by the definition of HAVE_ATTRIBUTE in H5config.h

./test/testhdf5.h
	Removed the CLEAN_CMD definition because we no longer use it.
	Albert's cleanup() functions replaced it.

./test/fillval.c
	Initialized auto hid_t variables to fix warnings in error recovery
	code when data flow analysis is turned on in compilers.

./test/h5tools.c
	Initialized an auto variable to fix a compiler warning.

./test/chunk.c
./test/ragged.c
	The WIN32 had some unsigned variables changed to signed because the
	compiler generates warnings when coercing unsigned to double(?).  I
	changed them back to unsigned because they really are unsigned
	quantities. If this the change was just to shut up extraneous warnings
	then perhaps a compiler flag can do the same; otherwise if the
	compiler generates bad code then we should supply a patch file instead
	messing up source code with bug work-arounds.

./src/H5detect.c
	Protected system #include's with #ifdef's from H5config.h thereby
	removing a WIN32.

	If getpwuid() doesn't exist (HAVE_GETPWUID) then we assume that
	`struct passwd' doesn't exist either (we don't really need it in that
	case).

	The H5T_NATIVE_LLONG and H5T_NATIVE_ULLONG are defined in terms of
	`long long' or else `__int64' or else `long' depending on what's
	available.

./src/H5Flow.c
./src/H5Ofill.c
	Added __unused__ to some function arguments that aren't used when
	assertions are turned off.

./src/H5V.c
	Changed an auto variable name in some hand-inlined code to get rid of
	a warning about the variable shadowing a previous auto.

1 files changed, 17 insertions, 39 deletions

diff --git a/src/H5.c b/src/H5.c
index 0f58941..02fd278 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -35,18 +35,6 @@ static char             RcsId[] = "@(#)$Revision$";
    H5_init_interface    -- initialize the H5 interface
    + */
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#if defined(WIN32)
-#include <time.h>
-#else
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-/* We need this on Irix64 even though we've included stdio.h as documented */
-FILE *fdopen(int fd, const char *mode);
 
 /* private headers */
 #include <H5private.h>          /*library                 		*/
@@ -61,6 +49,9 @@ FILE *fdopen(int fd, const char *mode);
 #include <H5Tprivate.h>         /*data types                      	*/
 #include <H5Zprivate.h>		/*filters				*/
 
+/* We need this on Irix64 even though we've included stdio.h as documented */
+FILE *fdopen(int fd, const char *mode);
+
 #define PABLO_MASK      H5_mask
 
 hbool_t                 library_initialize_g = FALSE;
@@ -653,27 +644,21 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    if (HDstrchr ("ZHhlq", *s)) {
 		switch (*s) {
 		case 'H':
-		    if (sizeof(hsize_t)==sizeof(long)) {
+		    if (sizeof(hsize_t)<sizeof(long)) {
+			modifier[0] = '\0';
+		    } else if (sizeof(hsize_t)==sizeof(long)) {
 			HDstrcpy (modifier, "l");
-#if defined(WIN32)
-			} else if (sizeof(hsize_t)==sizeof(__int64)) {
-#else
-		    } else if (sizeof(hsize_t)==sizeof(long long)) {
-#endif
+		    } else {
 			HDstrcpy (modifier, PRINTF_LL_WIDTH);
 		    }
 		    break;
 		case 'Z':
-		    if (sizeof(size_t)==sizeof(long)) {
+		    if (sizeof(size_t)<sizeof(long)) {
+			modifier[0] = '\0';
+		    } else if (sizeof(size_t)==sizeof(long)) {
 			HDstrcpy (modifier, "l");
-#if defined(WIN32)
-			} else if (sizeof(size_t)==sizeof(__int64)) {
-#else
-		    } else if (sizeof(size_t)==sizeof(long long)) {
-#endif
+		    } else {
 			HDstrcpy (modifier, PRINTF_LL_WIDTH);
-		    } else if (sizeof(size_t)==sizeof(int)) {
-			modifier[0] = '\0';
 		    }
 		    break;
 		    
@@ -718,11 +703,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 		    long x = va_arg (ap, long);
 		    n = fprintf (stream, template, x);
 		} else {
-#if defined(WIN32)
-			__int64 x = va_arg(ap, __int64);
-#else
-		    long long x = va_arg (ap, long long);
-#endif
+		    int64 x = va_arg(ap, int64);
 		    n = fprintf (stream, template, x);
 		}
 		break;
@@ -741,12 +722,8 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 		    unsigned long x = va_arg (ap, unsigned long);
 		    n = fprintf (stream, template, x);
 		} else {
-#if defined(WIN32)
-			unsigned __int64 x = va_arg (ap, unsigned __int64);
-#else
-		    unsigned long long x = va_arg (ap, unsigned long long);
-#endif
-			n = fprintf (stream, template, x);
+		    uint64 x = va_arg(ap, uint64);
+		    n = fprintf (stream, template, x);
 		}
 		break;
 
@@ -794,6 +771,9 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 			} else if (sizeof(x->offset)==SIZEOF_LONG_LONG) {
 			    HDstrcat(template, PRINTF_LL_WIDTH);
 			    HDstrcat(template, "d");
+			} else if (sizeof(x->offset)==SIZEOF___INT64) {
+			    HDstrcat(template, PRINTF_LL_WIDTH);
+			    HDstrcat(template, "d");
 			}
 			n = fprintf(stream, template, x->offset);
 		    } else {
@@ -1003,7 +983,6 @@ H5_timer_reset (H5_timer_t *timer)
 void
 H5_timer_begin (H5_timer_t *timer)
 {
-#if !defined(WIN32)
 #ifdef HAVE_GETRUSAGE
     struct rusage	rusage;
 #endif
@@ -1024,7 +1003,6 @@ H5_timer_begin (H5_timer_t *timer)
 
     gettimeofday (&etime, NULL);
     timer->etime = (double)etime.tv_sec + (double)etime.tv_usec/1e6;
-#endif
 }