[svn-r16388] Changed these files up to date. I'll test them after checkin.

2 files changed, 236 insertions, 164 deletions

diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index fd9393e..3991ad3 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -12,16 +12,25 @@
  * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* src/H5config.h.  Generated by configure.  */
+/* src/H5config.h.  Generated from H5config.h.in by configure.  */
 /* src/H5config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if your system generates wrong code for log2 routine. */
+/* #undef H5_BAD_LOG2_CODE_GENERATED */
+
+/* Define if the memory buffers being written to disk should be cleared before
+   writing. */
+#define H5_CLEAR_MEMORY 1
+
 /* Define if your system can handle converting denormalized floating-point
    values. */
 #define H5_CONVERT_DENORMAL_FLOAT 1
 
-/* Define if your system can convert long double to unsigned int values
-   correctly. */
-#define H5_CV_LDOUBLE_TO_UINT_WORKS 1
+/* Define if C++ compiler recognizes offsetof */
+#define H5_CXX_HAVE_OFFSETOF 1
+
+/* Define the default virtual file driver to compile */
+#define H5_DEFAULT_VFD H5FD_SEC2
 
 /* Define if `dev_t' is a scalar */
 #define H5_DEV_T_IS_SCALAR 1
@@ -40,9 +49,13 @@
 /* As FC_FUNC, but for C identifiers containing underscores. */
 /* #undef H5_FC_FUNC_ */
 
-/* Define if your system roundup accurately convert floating-point to unsigned
-   long long values. */
-#define H5_FP_TO_ULLONG_BOTTOM_BIT_WORKS 1
+/* Define if your system can handle overflow converting floating-point to
+   integer values. */
+#define H5_FP_TO_INTEGER_OVERFLOW_WORKS 1
+
+/* Define if your system roundup accurately converting floating-point to
+   unsigned long long values. */
+#define H5_FP_TO_ULLONG_ACCURATE 1
 
 /* Define if your system has right maximum convert floating-point to unsigned
    long long values. */
@@ -51,15 +64,35 @@
 /* Define if gettimeofday() populates the tz pointer passed in */
 #define H5_GETTIMEOFDAY_GIVES_TZ 1
 
+/* Define to 1 if you have the `alarm' function. */
+#define H5_HAVE_ALARM 1
+
 /* Define if the __attribute__(()) extension is present */
-/*#define H5_HAVE_ATTRIBUTE a 1 */
+/* #define H5_HAVE_ATTRIBUTE 1 */
 
 /* Define to 1 if you have the `BSDgettimeofday' function. */
 /* #undef H5_HAVE_BSDGETTIMEOFDAY */
 
+/* Define if the compiler understands C99 designated initialization of structs
+   and unions */
+#define H5_HAVE_C99_DESIGNATED_INITIALIZER 1
+
+/* Define if the compiler understands the __func__ keyword */
+#define H5_HAVE_C99_FUNC 1
+
+/* Define if the function stack tracing code is to be compiled in */
+/* #undef H5_HAVE_CODESTACK */
+
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+/* #undef H5_HAVE_DECL_TZNAME */
+
 /* Define to 1 if you have the `difftime' function. */
 #define H5_HAVE_DIFFTIME 1
 
+/* Define if the direct I/O virtual file driver should be compiled */
+/* #undef H5_HAVE_DIRECT */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define H5_HAVE_DLFCN_H 1
 
@@ -67,7 +100,7 @@
 /* #undef H5_HAVE_DMALLOC_H */
 
 /* Define to 1 if you have the <features.h> header file. */
-/*EIP #define H5_HAVE_FEATURES_H */
+/* #define H5_HAVE_FEATURES_H 1 */
 
 /* Define if support for deflate (zlib) filter is enabled */
 #define H5_HAVE_FILTER_DEFLATE 1
@@ -88,7 +121,7 @@
 /* #undef H5_HAVE_FILTER_SZIP */
 
 /* Define to 1 if you have the `fork' function. */
-/*#undefine H5_HAVE_FORK */
+/* #define H5_HAVE_FORK 1 */
 
 /* Define to 1 if you have the `frexpf' function. */
 #define H5_HAVE_FREXPF 1
@@ -99,18 +132,20 @@
 /* Define to 1 if you have the `fseek64' function. */
 /* #undef H5_HAVE_FSEEK64 */
 
-/* Define if the compiler understands C99 designated initialization of structs
-   and unions */
-#define H5_HAVE_C99_DESIGNATED_INITIALIZER 1
+/* Define to 1 if you have the `fseeko' function. */
+#define H5_HAVE_FSEEKO 1
 
-/* Define if the compiler understands the __func__ keyword */
-#define H5_HAVE_C99_FUNC 1
+/* Define to 1 if you have the `fstat64' function. */
+/* #define H5_HAVE_FSTAT64 1 */
 
-/* Define if the function stack tracing code is to be compiled in */
-/*#define H5_HAVE_CODESTACK 1*/
+/* Define to 1 if you have the `ftello' function. */
+#define H5_HAVE_FTELLO 1
 
-/* Define if the compiler understand the __FUNCTION__ keyword */
-/* EIP #define H5_HAVE_FUNCTION 1*/
+/* Define to 1 if you have the `ftruncate64' function. */
+/* #define H5_HAVE_FTRUNCATE64 1 */
+
+/* Define if the compiler understands the __FUNCTION__ keyword */
+/* #define H5_HAVE_FUNCTION 1 */
 
 /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */
 /* #undef H5_HAVE_GETCONSOLESCREENBUFFERINFO */
@@ -119,10 +154,10 @@
 #define H5_HAVE_GETHOSTNAME 1
 
 /* Define to 1 if you have the `getpwuid' function. */
-/*#define H5_HAVE_GETPWUID 1*/
+/* #define H5_HAVE_GETPWUID 1 */
 
 /* Define to 1 if you have the `getrusage' function. */
-/*EIP #define H5_HAVE_GETRUSAGE 1*/
+/* #define H5_HAVE_GETRUSAGE 1 */
 
 /* Define to 1 if you have the `gettextinfo' function. */
 /* #undef H5_HAVE_GETTEXTINFO */
@@ -167,32 +202,32 @@
 /* Define to 1 if you have the `mpi' library (-lmpi). */
 /* #undef H5_HAVE_LIBMPI */
 
+/* Define to 1 if you have the `mpich' library (-lmpich). */
+/* #undef H5_HAVE_LIBMPICH */
+
 /* Define to 1 if you have the `mpio' library (-lmpio). */
 /* #undef H5_HAVE_LIBMPIO */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef H5_HAVE_LIBNSL */
 
-/* Define to 1 if you have the `pdb' library (-lpdb). */
-/* #undef H5_HAVE_LIBPDB */
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 /* #undef H5_HAVE_LIBPTHREAD */
 
-/* Define to 1 if you have the `silo' library (-lsilo). */
-/* #undef H5_HAVE_LIBSILO */
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef H5_HAVE_LIBSOCKET */
 
 /* Define to 1 if you have the `sz' library (-lsz). */
 /* #undef H5_HAVE_LIBSZ */
 
 /* Define to 1 if you have the `z' library (-lz). */
-/* #undefine H5_HAVE_LIBZ*/
+/* #define H5_HAVE_LIBZ 1 */
 
 /* Define to 1 if you have the `longjmp' function. */
 #define H5_HAVE_LONGJMP 1
 
 /* Define to 1 if you have the `lseek64' function. */
-/*#define H5_HAVE_LSEEK64 1*/
+/* #define H5_HAVE_LSEEK64 1 */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define H5_HAVE_MEMORY_H 1
@@ -203,27 +238,27 @@
 /* Define to 1 if you have the <mpe.h> header file. */
 /* #undef H5_HAVE_MPE_H */
 
+/* Define if MPI_File_get_size works correctly */
+/* #undef H5_HAVE_MPI_GET_SIZE */
+
 /* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */
 /* #undef H5_HAVE_MPI_MULTI_LANG_Comm */
 
 /* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */
 /* #undef H5_HAVE_MPI_MULTI_LANG_Info */
 
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define H5_HAVE_NETINET_TCP_H 1
-
 /* Define if we have parallel support */
 /* #undef H5_HAVE_PARALLEL */
 
-/* Define to 1 if you have the <pdb.h> header file. */
-/* #undef H5_HAVE_PDB_H */
-
 /* Define to 1 if you have the <pthread.h> header file. */
 /* #undef H5_HAVE_PTHREAD_H */
 
 /* Define to 1 if you have the `random' function. */
 #define H5_HAVE_RANDOM 1
 
+/* Define to 1 if you have the `rand_r' function. */
+/* #define H5_HAVE_RAND_R 1 */
+
 /* Define to 1 if you have the <setjmp.h> header file. */
 #define H5_HAVE_SETJMP_H 1
 
@@ -233,26 +268,29 @@
 /* Define to 1 if you have the `sigaction' function. */
 #define H5_HAVE_SIGACTION 1
 
+/* Define to 1 if you have the `siglongjmp' function. */
+#define H5_HAVE_SIGLONGJMP 1
+
 /* Define to 1 if you have the `signal' function. */
 #define H5_HAVE_SIGNAL 1
 
 /* Define to 1 if you have the `snprintf' function. */
 #define H5_HAVE_SNPRINTF 1
 
-/* Define if `socklen_t' is defined */
-#define H5_HAVE_SOCKLEN_T 1
-
 /* Define to 1 if you have the `srandom' function. */
 #define H5_HAVE_SRANDOM 1
 
+/* Define to 1 if you have the `stat64' function. */
+/* #define H5_HAVE_STAT64 1 */
+
 /* Define if `struct stat' has the `st_blocks' field */
-/* #undef H5_HAVE_STAT_ST_BLOCKS */
+/* #define H5_HAVE_STAT_ST_BLOCKS 1 */
 
 /* Define to 1 if you have the <stddef.h> header file. */
 #define H5_HAVE_STDDEF_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-/*EIP #define H5_HAVE_STDINT_H 1 */
+/* #define H5_HAVE_STDINT_H 1 */
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define H5_HAVE_STDLIB_H 1
@@ -260,9 +298,6 @@
 /* Define to 1 if you have the `strdup' function. */
 #define H5_HAVE_STRDUP 1
 
-/* Define if the stream virtual file driver should be compiled */
-/*#define H5_HAVE_STREAM 1*/
-
 /* Define to 1 if you have the <strings.h> header file. */
 #define H5_HAVE_STRINGS_H 1
 
@@ -284,9 +319,6 @@
 /* Define to 1 if you have the `system' function. */
 #define H5_HAVE_SYSTEM 1
 
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef H5_HAVE_SYS_FILIO_H */
-
 /* Define to 1 if you have the <sys/fpu.h> header file. */
 /* #undef H5_HAVE_SYS_FPU_H */
 
@@ -324,14 +356,17 @@
 /* #undef H5_HAVE_THREADSAFE */
 
 /* Define if `timezone' is a global variable */
-/* #undef H5_HAVE_TIMEZONE */
 #define H5_HAVE_TIMEZONE 1
+
 /* Define if the ioctl TIOCGETD is defined */
 #define H5_HAVE_TIOCGETD 1
 
 /* Define if the ioctl TIOGWINSZ is defined */
 #define H5_HAVE_TIOCGWINSZ 1
 
+/* Define to 1 if you have the `tmpfile' function. */
+#define H5_HAVE_TMPFILE 1
+
 /* Define if `tm_gmtoff' is a member of `struct tm' */
 #define H5_HAVE_TM_GMTOFF 1
 
@@ -347,17 +382,20 @@
 #define H5_HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `vasprintf' function. */
-/*#undefine H5_HAVE_VASPRINTF*/
+/* #define H5_HAVE_VASPRINTF 1 */
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define H5_HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `waitpid' function. */
-/*#undefine H5_HAVE_WAITPID */
+#define H5_HAVE_WAITPID 1
 
 /* Define if your system has OpenVMS path name. This macro is added by hand. */
 #define H5_HAVE_VMS_PATH 1
 
+/* Define if your system has window style path name. */
+/* #undef H5_HAVE_WINDOW_PATH */
+
 /* Define to 1 if you have the <winsock.h> header file. */
 /* #undef H5_HAVE_WINSOCK_H */
 
@@ -373,9 +411,45 @@
 /* Define if `__tm_gmtoff' is a member of `struct tm' */
 /* #undef H5_HAVE___TM_GMTOFF */
 
+/* Define if your system can't handle converting floating-point values to long
+   long. */
+/* #define H5_HW_FP_TO_LLONG_NOT_WORKS 1 */
+
+/* Define if HDF5's high-level library headers should be included in hdf5.h */
+#define H5_INCLUDE_HL 1 
+
+/* Define if your system can accurately convert from integers to long double
+   values. */
+#define H5_INTEGER_TO_LDOUBLE_ACCURATE 1
+
+/* Define if your system can convert long double to integers accurately. */
+#define H5_LDOUBLE_TO_INTEGER_ACCURATE 1
+
+/* Define if your system can convert from long double to integer values. */
+#define H5_LDOUBLE_TO_INTEGER_WORKS 1
+
+/* Define if your system can convert long double to (unsigned) long long
+   values correctly. */
+#define H5_LDOUBLE_TO_LLONG_ACCURATE 1
+
+/* Define if your system can convert long double to unsigned int values
+   correctly. */
+#define H5_LDOUBLE_TO_UINT_ACCURATE 1
+
 /* Define if your system can compile long long to floating-point casts. */
 #define H5_LLONG_TO_FP_CAST_WORKS 1
 
+/* Define if your system can convert (unsigned) long long to long double
+   values correctly. */
+#define H5_LLONG_TO_LDOUBLE_CORRECT 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define H5_LT_OBJDIR ".libs/"
+
+/* Define if the metadata trace file code is to be compiled in */
+/* #undef H5_METADATA_TRACE_FILE */
+
 /* Define if your system can handle complicated MPI derived datatype
    correctly. */
 /* #undef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS */
@@ -384,11 +458,17 @@
    2GB. */
 /* #undef H5_MPI_FILE_SET_SIZE_BIG */
 
+/* Define if your system can handle special collective IO properly. */
+/* #undef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */
+
 /* Define if we can violate pointer alignment restrictions */
-/* #undef H5_NO_ALIGNMENT_RESTRICTIONS */
+#define H5_NO_ALIGNMENT_RESTRICTIONS 1
+
+/* Define if deprecated public API symbols are disabled */
+/* #undef H5_NO_DEPRECATED_SYMBOLS */
 
 /* Define if shared writing must be disabled (CodeWarrior only) */
-#define H5_NO_SHARED_WRITING 
+#define H5_NO_SHARED_WRITING 1
 
 /* Name of package */
 #define H5_PACKAGE "hdf5"
@@ -411,135 +491,122 @@
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "ll"
 
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
 #define H5_SIZEOF_CHAR 1
 
-/* The size of a `double', as computed by sizeof. */
+/* The size of `double', as computed by sizeof. */
 #define H5_SIZEOF_DOUBLE 8
 
-/* The size of a `float', as computed by sizeof. */
+/* The size of `float', as computed by sizeof. */
 #define H5_SIZEOF_FLOAT 4
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #define H5_SIZEOF_INT 4
 
-/* The size of a `int16_t', as computed by sizeof. */
+/* The size of `int16_t', as computed by sizeof. */
 #define H5_SIZEOF_INT16_T 2
 
-/* The size of a `int32_t', as computed by sizeof. */
+/* The size of `int32_t', as computed by sizeof. */
 #define H5_SIZEOF_INT32_T 4
 
-/* The size of a `int64_t', as computed by sizeof. */
+/* The size of `int64_t', as computed by sizeof. */
 #define H5_SIZEOF_INT64_T 8
 
-/* The size of a `int8_t', as computed by sizeof. */
+/* The size of `int8_t', as computed by sizeof. */
 #define H5_SIZEOF_INT8_T 1
 
-/* The size of a `int_fast16_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_FAST16_T 4 */
+/* The size of `int_fast16_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_FAST16_T 4 */
 
-/* The size of a `int_fast32_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_FAST32_T 4*/
+/* The size of `int_fast32_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_FAST32_T 4 */
 
-/* The size of a `int_fast64_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_FAST64_T 8*/
+/* The size of `int_fast64_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_FAST64_T 8 */
 
-/* The size of a `int_fast8_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_FAST8_T 1*/
+/* The size of `int_fast8_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_FAST8_T 1 */
 
-/* The size of a `int_least16_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_LEAST16_T 2*/
+/* The size of `int_least16_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_LEAST16_T 2 */
 
-/* The size of a `int_least32_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_LEAST32_T 4*/
+/* The size of `int_least32_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_LEAST32_T 4 */
 
-/* The size of a `int_least64_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_LEAST64_T 8*/
+/* The size of `int_least64_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_LEAST64_T 8 */
 
-/* The size of a `int_least8_t', as computed by sizeof. */
-/*#define H5_SIZEOF_INT_LEAST8_T 1*/
+/* The size of `int_least8_t', as computed by sizeof. */
+/* #define H5_SIZEOF_INT_LEAST8_T 1 */
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #define H5_SIZEOF_LONG 4
 
-/* The size of a `long double', as computed by sizeof. */
+/* The size of `long double', as computed by sizeof. */
 #define H5_SIZEOF_LONG_DOUBLE 16
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #define H5_SIZEOF_LONG_LONG 8
 
-/* The size of a `off_t', as computed by sizeof. */
-#define H5_SIZEOF_OFF_T 4
+/* The size of `off64_t', as computed by sizeof. */
+/* #define H5_SIZEOF_OFF64_T 8 */
+
+/* The size of `off_t', as computed by sizeof. */
+#define H5_SIZEOF_OFF_T 8
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #define H5_SIZEOF_SHORT 2
 
-/* The size of a `size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
 #define H5_SIZEOF_SIZE_T 4
 
-/* The size of a `ssize_t', as computed by sizeof. */
+/* The size of `ssize_t', as computed by sizeof. */
 #define H5_SIZEOF_SSIZE_T 4
 
-/* The size of a `uint16_t', as computed by sizeof. */
+/* The size of `uint16_t', as computed by sizeof. */
 #define H5_SIZEOF_UINT16_T 2
 
-/* The size of a `uint32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT32_T 4 
+/* The size of `uint32_t', as computed by sizeof. */
+#define H5_SIZEOF_UINT32_T 4
 
-/* The size of a `uint64_t', as computed by sizeof. */
+/* The size of `uint64_t', as computed by sizeof. */
 #define H5_SIZEOF_UINT64_T 8
 
-/* The size of a `uint8_t', as computed by sizeof. */
+/* The size of `uint8_t', as computed by sizeof. */
 #define H5_SIZEOF_UINT8_T 1
 
-/* The size of a `uint_fast16_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_FAST16_T 4*/
+/* The size of `uint_fast16_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_FAST16_T 4 */
 
-/* The size of a `uint_fast32_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_FAST32_T 4*/
+/* The size of `uint_fast32_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_FAST32_T 4 */
 
-/* The size of a `uint_fast64_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_FAST64_T 8 */
+/* The size of `uint_fast64_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_FAST64_T 8 */
 
-/* The size of a `uint_fast8_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_FAST8_T 1*/
+/* The size of `uint_fast8_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_FAST8_T 1 */
 
-/* The size of a `uint_least16_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_LEAST16_T 2 */
+/* The size of `uint_least16_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_LEAST16_T 2 */
 
-/* The size of a `uint_least32_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_LEAST32_T 4*/
+/* The size of `uint_least32_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_LEAST32_T 4 */
 
-/* The size of a `uint_least64_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_LEAST64_T 8 */
+/* The size of `uint_least64_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_LEAST64_T 8 */
 
-/* The size of a `uint_least8_t', as computed by sizeof. */
-/*#define H5_SIZEOF_UINT_LEAST8_T 1*/
+/* The size of `uint_least8_t', as computed by sizeof. */
+/* #define H5_SIZEOF_UINT_LEAST8_T 1 */
 
-/* The size of a `__int64', as computed by sizeof. */
+/* The size of `__int64', as computed by sizeof. */
 #define H5_SIZEOF___INT64 0
 
 /* Define to 1 if you have the ANSI C header files. */
 #define H5_STDC_HEADERS 1
 
-/* Define if your system can accurately convert from integers to long double
-   values. */
-#define H5_INTEGER_TO_LDOUBLE_ACCURATE 1
-
-/* Define if your system can convert long double to integers accurately. */
-#define H5_LDOUBLE_TO_INTEGER_ACCURATE 1
-
-/* Define if your system can accurately convert from long double to integer
-   values. */
-#define H5_LDOUBLE_TO_INTEGER_WORKS 1
-
-/* Define if your system can convert long double to unsigned int values
-   correctly. */
-#define H5_LDOUBLE_TO_UINT_ACCURATE 1
-
-/* Define if your system can accurately convert unsigned (long) long values to
-   floating-point values. */
-#define H5_ULONG_TO_FP_BOTTOM_BIT_WORKS 1
+/* Define if strict file format checks are enabled */
+/* #define H5_STRICT_FORMAT_CHECKS 1 */
 
 /* Define if your system supports pthread_attr_setscope(&attribute,
    PTHREAD_SCOPE_SYSTEM) call. */
@@ -559,6 +626,18 @@
    correct precision. */
 #define H5_ULLONG_TO_LDOUBLE_PRECISION 1
 
+/* Define if your system can accurately convert unsigned (long) long values to
+   floating-point values. */
+#define H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1
+
+/* Define using v1.6 public API symbols by default */
+/* #define H5_USE_16_API_DEFAULT 1 */
+
+/* Define if a memory checking tool will be used on the library, to cause
+   library to be very picky about memory operations and also disable the
+   internal free list manager code. */
+/* #undef H5_USING_MEMCHECKER */
+
 /* Version number of package */
 #define H5_VERSION "1.9.29"
 
@@ -566,6 +645,12 @@
    don't fit into size allowed */
 #define H5_VSNPRINTF_WORKS 1
 
+/* Data accuracy is prefered to speed during data conversions */
+#define H5_WANT_DATA_ACCURACY 1
+
+/* Check exception handling functions during data conversions */
+#define H5_WANT_DCONV_EXCEPTION 1
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 /* #undef H5_WORDS_BIGENDIAN */
@@ -579,7 +664,7 @@
 /* #undef H5_inline */
 #endif
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 /* #undef H5_off_t */
 
 /* Define to `unsigned long' if <sys/types.h> does not define. */
@@ -589,6 +674,3 @@
 /* #undef H5_ssize_t */
 #define H5_HAVE_FILE_VERSIONS 1
 #define H5_CANNOT_OPEN_TWICE  1
-#define H5_WANT_DATA_ACCURACY 1
-#define H5_WANT_DCONV_EXCEPTION 1
-#define H5_DEFAULT_VFD H5FD_SEC2
diff --git a/vms/src/make.com b/vms/src/make.com
index abcaf1e..343ab58 100644
--- a/vms/src/make.com
+++ b/vms/src/make.com
@@ -2,11 +2,6 @@ $!#
 $!# Copyright by The HDF Group.
 $!# Copyright by the Board of Trustees of the University of Illinois.
 $!# All rights reserved.
-$!#
-$!# This file is part of HDF5.  The full HDF5 copyright notice, including
-$!# terms governing use, modification, and redistribution, is contained in
-$!# the files COPYING and Copyright.html.  COPYING can be found at the root
-$!# of the source code distribution tree; Copyright.html can be found at the
 $!# root level of an installed copy of the electronic HDF5 document set and
 $!# is linked from the top-level documents page.  It can also be found at
 $!# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
@@ -29,39 +24,34 @@ $ type sys$input
          Creating  HDF5 library
 $!
 $ cobj= "H5, H5checksum, H5dbg, H5system, H5timer, H5trace,"+-
-        "H5A, H5Abtree2, H5Adense, H5Adeprec, H5Aint, H5Atest, H5AC, H5B, H5B2, H5B2cache,"+-
-        "H5Bcache, H5B2dbg, H5B2test, H5B2int, H5B2stat, H5C, H5CS,"+-  
-        "H5D, H5Dcontig, H5Dcompact, H5Ddbg, H5Ddeprec,"+-
-        "H5Defl, H5Dio, H5Dint, H5Distore, H5Dfill, H5Doh, H5Dmpio, H5Dselect, H5Dtest ,"+-
-        "H5E, H5Edeprec, H5Eint, H5F, H5Fdbg, H5Fmount, H5Fsfile, H5Fsuper, H5Ftest, H5FD, H5FDcore,"+-
-        "H5FDfamily, H5FDlog, H5FDmpi, H5FDmpio,"+-
-        "H5FDmpiposix, H5FDmulti, H5FDsec2, H5FDspace, H5FDstdio,"+-
-        "H5FDdirect, H5FL, H5FO, H5Ffake,"+-
-        "H5FS, H5FScache, H5FSdbg, H5FSsection,"+-
-        "H5G, H5Gcompact, H5Gdeprec, H5Gent, H5Gint, H5Glink, H5Gloc, H5Gname, H5Gnode, H5Gstab,"+-
-        "H5Gdense, H5Gbtree2,"+-
-        "H5Gobj, H5Goh, H5Gtest, H5Gtraverse,"+-
-        "H5HF, H5HFbtree2, H5HFcache, H5HFdbg, H5HFman, H5HFtest, H5HFstat,"+-
-        "H5HFdblock, H5HFdtable, H5HFhuge, H5HFhdr, H5HFiblock,"+-
-        "H5HFiter, H5HFsection, H5HFspace, H5HFtiny,"+-
-        "H5HG, H5HGdbg, H5HL, H5HLdbg, H5HP, H5I, H5MF, H5MM,"+-
-        "H5MP, H5MPtest,H5L, H5Lexternal, H5O, H5Oalloc, H5Oainfo, H5Oattr, H5Oattribute,"+-
-        "H5Obogus, H5Obtreek, H5Odrvinfo, H5Ocache,"+-
-        "H5Ocont, H5Ocopy, H5Odbg, H5Odtype, H5Oefl, H5Ofill, H5Oginfo, H5Olayout,"+-
-        "H5Olinfo, H5Olink, H5Omessage, H5Oshmesg, H5Omtime"
-$ cobj1= "H5Oname, H5Onull, H5Opline, H5Orefcount, H5Osdspace, H5Oshared, H5Ostab, H5Otest, H5Ounknown,"+-
-        "H5P, H5Pint, H5Pacpl, H5Pdeprec, H5Pdcpl, H5Pdxpl, H5Pfapl, H5Pfcpl, H5Pfmpl, H5Pgcpl, H5Plapl,"+-
-        "H5Pocpl, H5Pocpypl, H5Ptest, H5Pstrcpl, H5Plcpl,"+-
-        "H5R, H5Rdeprec, H5RC,"+-
-        "H5RS, H5S, H5Sall, H5Sdbg, H5Shyper, H5Smpio, H5Snone, H5Spoint,"+-
-        "H5Sselect, H5Stest,"+-
-        "H5SL, H5SM, H5SMbtree2, H5SMcache, H5SMtest," +-
-        "H5ST, H5T, H5Tarray, H5Tbit, H5Tcommit,"+-
-        "H5Tcompound, H5Tconv, H5Tcset, H5Tdeprec, H5Tenum, H5Tfields, H5Tfixed,"+-
-        "H5Tfloat, H5Tinit, H5Tnative, H5Tdbg, H5Toffset, H5Toh, H5Topaque, H5Torder,"+-
-        "H5Tpad, H5Tprecis, H5Tstrpad, H5Tvisit, H5Tvlen, H5TS, H5V, H5WB, H5Z,"+-
-        "H5Zdeflate, H5Zfletcher32, H5Znbit, H5Zshuffle, H5Zszip,"+-
-        "H5Zscaleoffset, H5Ztrans"
+        "H5Abtree2, H5A, H5AC, H5Adense, H5Adeprec, H5Aint, H5Atest, H5B2, H5B2cache,"+-
+        "H5B2dbg, H5B2int, H5B2stat, H5B2test, H5B, H5Bcache, H5Bdbg, H5C, H5CS,"+-  
+        "H5Dbtree, H5D, H5Dchunk, H5Dcompact, H5Dcontig, H5Ddbg, H5Ddeprec,"+-
+        "H5Defl, H5Dfill, H5Dint, H5Dio, H5Dmpio, H5Doh, H5Dscatgath, H5Dselect, H5Dtest,"+-
+        "H5EA, H5EAcache, H5EAdbg, H5EAdblkpage, H5EAdblock, H5EAhdr, H5EAiblock, H5EAint,"+-
+        "H5EAsblock, H5EAstat, H5EAtest, H5E, H5Edeprec, H5Eint,"+-
+        "H5Faccum, H5F, H5Fdbg, H5FD, H5FDcore, H5FDdirect, H5FDfamily, H5FDint, H5FDlog, H5FDmpi,"+-
+        "H5FDmpio, H5FDmpiposix, H5FDmulti, H5FDsec2, H5FDspace, H5FDstdio, H5FDwindows,"+-
+        "H5Ffake, H5Fio, H5FL, H5Fmount, H5Fmpi, H5FO, H5Fquery, H5FS, H5FScache, H5FSdbg, H5Fsfile,"+-
+        "H5FSsection, H5FSstat, H5FStest, H5Fsuper, H5Ftest,"+-
+        "H5Gbtree2, H5G, H5Gcache, H5Gcompact, H5Gdense, H5Gdeprec, H5Gent, H5Gint, H5Glink, H5Gloc,"+-
+        "H5Gname, H5Gnode, H5Gobj, H5Goh, H5Gstab, H5Gtest, H5Gtraverse,"+-
+        "H5HFbtree2, H5HF, H5HFcache, H5HFdbg, H5HFdblock, H5HFdtable, H5HFhdr, H5HFhuge, H5HFiblock,"+-
+        "H5HFiter, H5HFman, H5HFsection, H5HFspace, H5HFstat, H5HFtest, H5HFtiny,"+-
+        "H5HG, H5HGcache, H5HGdbg, H5HL, H5HLcache, H5HLdbg, H5HP, H5I, H5L, H5Lexternal"
+$ cobj1= "H5MFaggr, H5MF, H5MFdbg, H5MFsection, H5MM,"+-
+        "H5MP, H5MPtest, H5Oainfo, H5Oalloc, H5Oattr, H5Oattribute, H5Obogus, H5Obtreek,"+-
+        "H5O, H5Ocache, H5Ocont, H5Ocopy, H5Odbg, H5Odrvinfo, H5Odtype, H5Oefl, H5Ofill, H5Oginfo,"+-
+        "H5Olayout, H5Olinfo, H5Olink, H5Omessage, H5Omtime, H5Oname, H5Onull, H5Opline, H5Orefcount,"+-
+        "H5Osdspace, H5Oshared, H5Oshmesg, H5Ostab, H5Otest, H5Ounknown,"+-
+        "H5Pacpl, H5P, H5Pdapl, H5Pdcpl, H5Pdeprec, H5Pdxpl, H5Pfapl, H5Pfcpl, H5Pfmpl, H5Pgcpl, H5Pint,"+-
+        "H5Plapl, H5Plcpl, H5Pocpl, H5Pocpypl, H5Pstrcpl, H5Ptest,"+-
+        "H5R, H5RC, H5Rdeprec, H5RS, H5Sall, H5S, H5Sdbg, H5Shyper, H5SL, H5SMbtree2, H5SM, H5SMcache,"+-
+        "H5Smpio, H5SMtest, H5Snone, H5Spoint, H5Sselect, H5ST, H5Stest,"+-
+        "H5Tarray, H5Tbit, H5T, H5Tcommit, H5Tcompound, H5Tconv, H5Tcset, H5Tdbg, H5Tdeprec, H5Tenum,"+-
+        "H5Tfields, H5Tfixed, H5Tfloat, H5Tinit, H5Tnative, H5Toffset, H5Toh, H5Topaque, H5Torder,"+-
+        "H5Tpad, H5Tprecis, H5TS, H5Tstrpad, H5Tvisit, H5Tvlen, H5V, H5WB, H5Z,"+-
+        "H5Zdeflate, H5Zfletcher32, H5Znbit, H5Zscaleoffset, H5Zshuffle, H5Zszip, H5Ztrans"
 $!
 $ ccc 'cobj
 $ ccc 'cobj1