[svn-r16113] Updated the makefiles (make.com) and check.com and src/h5pubconf.h (generated on kagiso).

Not tested yet.
 

17 files changed, 671 insertions, 496 deletions

diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 37ee782..e8c9f98 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -21,57 +21,60 @@ $
 $ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
 $!
-$ cxxobj= "create.cxx, readdata.cxx, writedata.cxx, compound.cxx,"+-
-          "extend_ds.cxx, chunks.cxx, h5group.cxx"
+$ cxxobj= "chunks.cxx, compound.cxx, create.cxx, extend_ds.cxx, h5group.cxx, "+-
+          "readdata.cxx, writedata.cxx"
 $! 
 $!                              
 $ ccc 'cxxobj
 $ type sys$input
 
-       Creating create 
-$ cxxlink  create, -
+       Creating chunks 
+$ cxxlink  chunks, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
 $ type sys$input
 
-       Creating readdata  
-$ cxxlink  readdata, -
+       Creating compound 
+$ cxxlink  compound, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating writedata  
-$ cxxlink  writedata, -
+       Creating create 
+$ cxxlink  create, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$ !                              
+$!
 $ type sys$input
 
-       Creating compound 
-$ cxxlink  compound, -
+       Creating extend_ds  
+$ cxxlink  extend_ds, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating extend_ds  
-$ cxxlink  extend_ds, -
+       Creating h5group 
+$ cxxlink  h5group, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating chunks 
-$ cxxlink  chunks, -
+       Creating readdata  
+$ cxxlink  readdata, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
-       Creating h5group 
-$ cxxlink  h5group, -
+       Creating writedata  
+$ cxxlink  writedata, -
            [-.-.lib]hdf5_cplus.olb/lib, -
            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!                              
+$ type sys$input
 $!
 $ exit
diff --git a/vms/c++/src/make.com b/vms/c++/src/make.com
index f407caf..6bccde8 100644
--- a/vms/c++/src/make.com
+++ b/vms/c++/src/make.com
@@ -16,67 +16,68 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library
 $!
-$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $ ccc := cxx 'cxxopt /include=([-.-.src])
 $!
 $! type sys$input
 $!	Creating  HDF5 C++ library
 $!
 $ lib/create/object hdf5_cplus.olb
-$ ccc H5Exception.cxx
-$ lib/insert/object hdf5_cplus H5Exception
-$ ccc H5IdComponent.cxx
-$ lib/insert/object hdf5_cplus H5IdComponent
-$ ccc H5Library.cxx
-$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5AbstractDs.cxx
+$ lib/insert/object hdf5_cplus H5AbstractDs
+$ ccc H5Alltypes.cxx
+$ lib/insert/object hdf5_cplus H5Alltypes
+$ ccc H5ArrayType.cxx
+$ lib/insert/object hdf5_cplus H5ArrayType
+$ ccc H5AtomType.cxx
+$ lib/insert/object hdf5_cplus H5AtomType
 $ ccc H5Attribute.cxx
 $ lib/insert/object hdf5_cplus H5Attribute
-$ ccc H5Object.cxx
-$ lib/insert/object hdf5_cplus H5Object
-$ ccc H5PropList.cxx 
-$ lib/insert/object hdf5_cplus H5PropList
-$ ccc H5FaccProp.cxx
-$ lib/insert/object hdf5_cplus H5FaccProp
-$ ccc H5FcreatProp.cxx
-$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5CommonFG.cxx
+$ lib/insert/object hdf5_cplus H5CommonFG
+$ ccc H5CompType.cxx
+$ lib/insert/object hdf5_cplus H5CompType
+$ ccc H5DataSet.cxx
+$ lib/insert/object hdf5_cplus H5DataSet
+$ ccc H5DataSpace.cxx
+$ lib/insert/object hdf5_cplus H5DataSpace
+$ ccc H5DataType.cxx
+$ lib/insert/object hdf5_cplus H5DataType
 $ ccc H5DcreatProp.cxx
 $ lib/insert/object hdf5_cplus H5DcreatProp
 $ ccc H5DxferProp.cxx 
 $ lib/insert/object hdf5_cplus H5DxferProp
-$ ccc H5DataType.cxx
-$ lib/insert/object hdf5_cplus H5DataType
-$ ccc H5DataSpace.cxx
-$ lib/insert/object hdf5_cplus H5DataSpace
-$ ccc H5AbstractDs.cxx
-$ lib/insert/object hdf5_cplus H5AbstractDs
-$ ccc H5AtomType.cxx
-$ lib/insert/object hdf5_cplus H5AtomType
-$ ccc H5PredType.cxx
-$ lib/insert/object hdf5_cplus H5PredType
 $ ccc H5EnumType.cxx
 $ lib/insert/object hdf5_cplus H5EnumType
-$ ccc H5IntType.cxx
-$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Exception.cxx
+$ lib/insert/object hdf5_cplus H5Exception
+$ ccc H5FaccProp.cxx
+$ lib/insert/object hdf5_cplus H5FaccProp
+$ ccc H5FcreatProp.cxx
+$ lib/insert/object hdf5_cplus H5FcreatProp
+$ ccc H5File.cxx
+$ lib/insert/object hdf5_cplus H5File
 $ ccc H5FloatType.cxx
 $ lib/insert/object hdf5_cplus H5FloatType
+$ ccc H5Group.cxx
+$ lib/insert/object hdf5_cplus H5Group
+$ ccc H5IdComponent.cxx
+$ lib/insert/object hdf5_cplus H5IdComponent
+$ ccc H5IntType.cxx
+$ lib/insert/object hdf5_cplus H5IntType
+$ ccc H5Library.cxx
+$ lib/insert/object hdf5_cplus H5Library
+$ ccc H5Object.cxx
+$ lib/insert/object hdf5_cplus H5Object
+$ ccc H5PredType.cxx
+$ lib/insert/object hdf5_cplus H5PredType
+$ ccc H5PropList.cxx 
+$ lib/insert/object hdf5_cplus H5PropList
 $ ccc H5StrType.cxx
 $ lib/insert/object hdf5_cplus H5StrType
-$ ccc H5ArrayType.cxx
-$ lib/insert/object hdf5_cplus H5ArrayType
 $ ccc H5VarLenType.cxx
 $ lib/insert/object hdf5_cplus H5VarLenType
-$ ccc H5CompType.cxx
-$ lib/insert/object hdf5_cplus H5CompType
-$ ccc H5DataSet.cxx
-$ lib/insert/object hdf5_cplus H5DataSet
-$ ccc H5CommonFG.cxx
-$ lib/insert/object hdf5_cplus H5CommonFG
-$ ccc H5Group.cxx
-$ lib/insert/object hdf5_cplus H5Group
-$ ccc H5File.cxx
-$ lib/insert/object hdf5_cplus H5File
 $!
 $ type sys$input
 	Done
 $ exit
- 
diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com
index bcf26ce..ab4dc03 100644
--- a/vms/c++/test/make.com
+++ b/vms/c++/test/make.com
@@ -16,30 +16,30 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C++ library tests
 $!
-$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
 $
 $ ccc := cxx 'cxxopt /include=([-.-.src], [-.-.test], [-.src])
 $! 
 $!
 $!                               
+$ ccc h5cpputil
 $ ccc tattr
-$ ccc tfile
 $ ccc tcompound
+$ ccc testhdf5 
+$ ccc tfile
 $ ccc tfilter
+$ ccc th5s
 $ ccc trefer
 $ ccc ttypes
 $ ccc tvlstr
-$ ccc th5s
-$ ccc h5cpputil
-$ ccc testhdf5 
 $ type sys$input
        Creating testhdf5
-$ cxxlink  testhdf5,tattr,tfile, th5s, -
-           tcompound, tfilter, trefer, tvlstr, ttypes, h5cpputil, -
+$ cxxlink  testhdf5, h5cpputil, tattr, tcompound, tfile, tfilter, th5s, -
+           trefer, ttypes, tvlstr, -
            [-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
-$ !                              
+$!
 $ ccc dsets
 $ type sys$input
         Creating dsets
diff --git a/vms/examples/make.com b/vms/examples/make.com
index 0df772a..94223d6 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -16,65 +16,108 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 C examples
 $!
-$! ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
+$ ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
 $
 $ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
 $ ccc := cc 'ccopt /include=([-.-.include])
 $ type sys$input
  	Compiling  C examples
 $!
-$ cobj= "h5_write.c, h5_read.c, h5_extend_write.c, h5_chunk_read.c, "+-
-        "h5_compound.c, h5_group.c, h5_select.c, h5_attribute.c,  "+- 
-        "h5_mount.c, h5_ref2reg.c, h5_reference.c, h5_drivers.c "
+$ cobj= "h5_attribute.c, h5_chunk_read.c, h5_compound.c, h5_drivers.c, h5_dtransform.c,"+-
+        "h5_elink_unix2win.c, h5_extend_write.c, h5_extlink.c, h5_group.c,"+-
+        "h5_interm_group.c, h5_mount.c, h5_read.c, h5_ref2reg.c, h5_reference.c,"+-
+        "h5_select.c, h5_shared_mesg.c, h5_write.c"
 $!                               
 $ ccc 'cobj 
 $
 $ type sys$input
-       Creating h5_write 
-$ link     h5_write, -
+       Creating h5_attribute 
+$ link     h5_attribute, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_read 
-$ link     h5_read, -
+       Creating h5_chunk_read 
+$ link     h5_chunk_read, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_compound 
+$ link     h5_compound, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_drivers
+$ link     h5_drivers, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_dtransform 
+$ link     h5_dtransform, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_elink_unix2win 
+$ link     h5_elink_unix2win, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
        Creating h5_extend_write
 $ link     h5_extend_write, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_chunk_read 
-$ link     h5_chunk_read, -
+       Creating h5_extend_write 
+$ link     h5_extend_write, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_compound 
-$ link     h5_compound, -
+       Creating h5_extlink 
+$ link     h5_extlink, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
        Creating h5_group 
 $ link     h5_group, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_select 
-$ link     h5_select, -
-            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$ type sys$input
-       Creating h5_attribute 
-$ link     h5_attribute, -
+       Creating h5_interm_group 
+$ link     h5_interm_group, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
        Creating h5_mount 
 $ link     h5_mount, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_reference 
-$ link     h5_reference, -
+       Creating h5_read 
+$ link     h5_read, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
        Creating h5_ref2reg
 $ link     h5_ref2reg, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ type sys$input
-       Creating h5_drivers
-$ link     h5_drivers, -
+       Creating h5_reference 
+$ link     h5_reference, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_select 
+$ link     h5_select, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_shared_mesg 
+$ link     h5_shared_mesg, -
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
+$ type sys$input
+       Creating h5_write 
+$ link     h5_write, -
             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
+
 $ exit
diff --git a/vms/make.com b/vms/make.com
index 224e095..ee105f3 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -59,10 +59,11 @@ $ hdf5tools_lib        = hdf5top_dir + "TOOLS.LIB]"
 $ hdf5tools_h5copy     = hdf5top_dir + "TOOLS.H5COPY]"
 $ hdf5tools_h5diff     = hdf5top_dir + "TOOLS.H5DIFF]"
 $ hdf5tools_h5dump     = hdf5top_dir + "TOOLS.H5DUMP]"
+$ hdf5tools_h5import   = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5jam      = hdf5top_dir + "TOOLS.H5JAM]"
 $ hdf5tools_h5ls       = hdf5top_dir + "TOOLS.H5LS]"
 $ hdf5tools_h5repack   = hdf5top_dir + "TOOLS.H5REPACK]"
-$ hdf5tools_h5jam      = hdf5top_dir + "TOOLS.H5JAM]"
-$ hdf5tools_h5import   = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5tools_h5stat     = hdf5top_dir + "TOOLS.H5STAT]"
 $ hdf5fortran_examples = hdf5top_dir + "FORTRAN.EXAMPLES]"
 $ hdf5fortran_src      = hdf5top_dir + "FORTRAN.SRC]"
 $ hdf5fortran_test     = hdf5top_dir + "FORTRAN.TEST]"
@@ -95,20 +96,24 @@ $ write sys$output "Building h5dump"
 $ set def 'hdf5tools_h5dump'
 $ @make.com
 $!
-$ write sys$output "Building h5repack"
-$ set def 'hdf5tools_h5repack'
+$ write sys$output "Building h5import"
+$ set def 'hdf5tools_h5import'
+$ @make.com
+$!
+$ write sys$output "Building h5jam"
+$ set def 'hdf5tools_h5jam'
 $ @make.com
 $!
 $ write sys$output "Building h5ls"
 $ set def 'hdf5tools_h5ls'
 $ @make.com
 $!
-$ write sys$output "Building h5jam"
-$ set def 'hdf5tools_h5jam'
+$ write sys$output "Building h5repack"
+$ set def 'hdf5tools_h5repack'
 $ @make.com
 $!
-$ write sys$output "Building h5import"
-$ set def 'hdf5tools_h5import'
+$ write sys$output "Building h5stat"
+$ set def 'hdf5tools_h5stat'
 $ @make.com
 $!
 $ write sys$output "Building Fortran library"
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 8c7d502..fc0bad4 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -1,28 +1,22 @@
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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          *
- * 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
@@ -36,31 +30,48 @@
 
 /* Define to a macro mangling the given C identifier (in lower and upper
    case), which must not contain underscores, for linking with Fortran. */
-/* #undef H5_FC_FUNC */
+#define H5_FC_FUNC(name,NAME) name ## _
 
 /* As FC_FUNC, but for C identifiers containing underscores. */
-/* #undef H5_FC_FUNC_ */
+#define H5_FC_FUNC_(name,NAME) name ## __
 
-/* 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. */
-#define H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1
+/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM */
 
 /* 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 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
 
@@ -68,7 +79,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
@@ -89,7 +100,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
@@ -100,11 +111,20 @@
 /* Define to 1 if you have the `fseek64' function. */
 /* #undef H5_HAVE_FSEEK64 */
 
-/* Define if the function stack tracing code is to be compiled in */
-/*#define H5_HAVE_CODESTACK 1*/
+/* Define to 1 if you have the `fseeko' function. */
+#define H5_HAVE_FSEEKO 1
+
+/* Define to 1 if you have the `fstat64' function. */
+#define H5_HAVE_FSTAT64 1
+
+/* Define to 1 if you have the `ftello' function. */
+#define H5_HAVE_FTELLO 1
+
+/* Define to 1 if you have the `ftruncate64' function. */
+#define H5_HAVE_FTRUNCATE64 1
 
 /* Define if the compiler understand the __FUNCTION__ keyword */
-/* EIP #define H5_HAVE_FUNCTION 1*/
+#define H5_HAVE_FUNCTION 1
 
 /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */
 /* #undef H5_HAVE_GETCONSOLESCREENBUFFERINFO */
@@ -113,10 +133,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 */
@@ -135,7 +155,7 @@
 
 /* Define if library will contain instrumentation to detect correct
    optimization operation */
-#define H5_HAVE_INSTRUMENTED_LIBRARY 1
+/* #undef H5_HAVE_INSTRUMENTED_LIBRARY */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define H5_HAVE_INTTYPES_H 1
@@ -161,32 +181,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
@@ -197,27 +217,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
 
@@ -227,26 +247,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
@@ -254,9 +277,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
 
@@ -278,9 +298,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 */
 
@@ -319,13 +336,16 @@
 
 /* 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
 
@@ -341,13 +361,16 @@
 #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 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 */
@@ -364,9 +387,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. */
+/* #undef H5_HW_FP_TO_LLONG_NOT_WORKS */
+
+/* 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 */
@@ -375,11 +434,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 
+/* #undef H5_NO_SHARED_WRITING */
 
 /* Name of package */
 #define H5_PACKAGE "hdf5"
@@ -402,135 +467,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. */
-#define H5_SIZEOF_LONG_DOUBLE 16
+/* The size of `long double', as computed by sizeof. */
+#define H5_SIZEOF_LONG_DOUBLE 12
 
-/* 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 a `short', as computed by sizeof. */
+/* The size of `off_t', as computed by sizeof. */
+#define H5_SIZEOF_OFF_T 8
+
+/* 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 */
+/* #undef H5_STRICT_FORMAT_CHECKS */
 
 /* Define if your system supports pthread_attr_setscope(&attribute,
    PTHREAD_SCOPE_SYSTEM) call. */
@@ -550,6 +602,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 */
+/* #undef H5_USE_16_API_DEFAULT */
+
+/* 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.8.2-post0"
 
@@ -557,6 +621,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 */
@@ -570,7 +640,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. */
@@ -578,8 +648,3 @@
 
 /* Define to `long' if <sys/types.h> does not define. */
 /* #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..d4fb406 100644
--- a/vms/src/make.com
+++ b/vms/src/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 library
 $!
-$! ccopt = "/float=ieee_float/define=H5_VMS"
+$ ccopt = "/float=ieee_float/define=H5_VMS"
 $ ccc := cc 'ccopt 
 $ ccc h5detect.c
 $ link h5detect
@@ -29,39 +29,39 @@ $ 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,"+-
+        "H5Abtree2, H5A, H5AC, H5Adense, H5Adeprec, H5Aint, H5Atest,"+-
+        "H5B2, H5B2cache, H5B2dbg, H5B2int, H5B2stat, H5B2test, H5B, H5Bcache,"+-
+        "H5C, H5CS,"+-
+        "H5D, H5Dchunk, H5Dcompact, H5Dcontig, H5Ddbg, H5Ddeprec, H5Defl,"+-
+        "H5Dfill, H5Dint, H5Dio, H5Distore, H5Dmpio, H5Doh, H5Dscatgath, H5Dselect, H5Dtest,"+-
+        "H5E, H5Edeprec, H5Eint,"+-
+        "H5Faccum, H5F, H5Fdbg, H5FD, H5FDcore,"+-
+        "H5FDdirect, H5FDfamily, H5FDint, 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"
+        "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, H5HLdbg, H5HP, H5I, H5L, H5Lexternal,"+-
+        "H5MFaggr.c, H5MF.c, H5MFdbg.c, H5MFsection.c, H5MM, H5MP, H5MPtest,"+-
+        "H5Oainfo, H5Oalloc, H5Oattr, H5Oattribute,"+-
+        "H5Obogus, H5Obtreek, H5O, H5Ocache, H5Ocont, H5Ocopy, H5Odbg, H5Odrvinfo,"+-
+        "H5Odtype, H5Oefl, H5Ofill, H5Oginfo, H5Olayout,"+-
+        "H5Olinfo, H5Olink, H5Omessage, H5Omtime"
+$ cobj1= "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, H5SMcache, H5SMtest,"+-
+        "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 
diff --git a/vms/test/check.com b/vms/test/check.com
index 888cb41..5bdb8fd 100644
--- a/vms/test/check.com
+++ b/vms/test/check.com
@@ -24,195 +24,201 @@ $ type sys$input
 -------			Running testhdf5 	-------
 $ run  testhdf5
 $ type sys$input
- 
-$ type sys$input
--------			Running lheap    	-------
-$ run  lheap
-$ type sys$input
- 
-$! type sys$input
-$!-------			Running fheap    	-------
-$! run  fheap
-$! type sys$input
 
 $ type sys$input
--------			Running ohdr    	-------
-$ run  ohdr 
+-------			Running app_ref    	-------
+$ run  app_ref 
 $ type sys$input
- 
+
 $ type sys$input
--------			Running stab    	-------
-$ run  stab
+-------			Running big     	-------
+$ run  big
 $ type sys$input
- 
+
 $ type sys$input
--------			Running gheap    	-------
-$ run  gheap
+-------			Running bittest    	-------
+$ run  bittests
 $ type sys$input
- 
+
 $ type sys$input
 -------			Running btree2    	-------
 $ run  btree2
 $ type sys$input
- 
-$ type sys$input
--------			Running cache    	-------
-$ run  cache
-$ type sys$input
- 
+
 $ type sys$input
 -------			Running cache_api   	-------
 $ run  cache_api
 $ type sys$input
- 
+
 $ type sys$input
--------			Running pool    	-------
-$ run  pool
+-------			Running cache   	-------
+$ run  cache
 $ type sys$input
- 
+
 $ type sys$input
--------			Running hyperslab    	-------
-$ run  hyperslab
+-------			Running cmpd_dset    	-------
+$ run  cmpd_dset
 $ type sys$input
- 
+
 $ type sys$input
--------			Running istore    	-------
-$ run  istore
+-------			Running cross_read     	-------
+$ run  cross_read
 $ type sys$input
- 
+
 $ type sys$input
--------			Running bittest    	-------
-$ run  bittests
+-------			Running dangle     	-------
+$ run  dangle
 $ type sys$input
- 
+
+$ type sys$input
+-------			Running dsets   	-------
+$ run  dsets
+$ type sys$input
+
 $ type sys$input
 -------			Running dt_arith    	-------
 $ run  dt_arith
 $ type sys$input
- 
+
 $ type sys$input
--------			Running dtypes    	-------
-$ run  dtypes
+-------			Running dtransform     	-------
+$ run  dtransform
 $ type sys$input
- 
+
 $ type sys$input
--------			Running dsets   	-------
-$ run  dsets
+-------			Running dtypes    	-------
+$ run  dtypes
 $ type sys$input
- 
+
 $ type sys$input
--------			Running cmpd_dset    	-------
-$ run  cmpd_dset
+-------			Running enum     	-------
+$ run  enum
 $ type sys$input
- 
+
 $ type sys$input
 -------			Running extend    	-------
 $ run  extend
 $ type sys$input
- 
+
 $ type sys$input
 -------			Running external    	-------
 $ run  external
 $ type sys$input
- 
+
 $ type sys$input
--------			Running objcopy    	-------
-$ run  objcopy 
+-------			Running fheap    	-------
+$ run  fheap
 $ type sys$input
- 
+
 $ type sys$input
--------			Running links    	-------
-$ run  links
+-------			Running fillval     	-------
+$ run  fillval
 $ type sys$input
- 
+
 $ type sys$input
--------			Running unlink    	-------
-$ run  unlink
+-------			Running flush1     	-------
+$ run  flush1
 $ type sys$input
- 
+
 $ type sys$input
--------			Running big     	-------
-$ run  big
+-------			Running flush2     	-------
+$ run  flush2
 $ type sys$input
- 
-$! type sys$input
-!-------			Running mtime    	-------
-$! run  mtime 
-$! type sys$input
- 
+
 $ type sys$input
--------			Running fillval     	-------
-$ run  fillval
+-------			Running freespace     	-------
+$ run  freespace
 $ type sys$input
- 
+
 $ type sys$input
--------			Running fillval     	-------
-$ run  fillval
+-------			Running getname     	-------
+$ run  getname
 $ type sys$input
- 
+
 $ type sys$input
--------			Running mount     	-------
-$ run  mount
+-------			Running gheap    	-------
+$ run  gheap
 $ type sys$input
- 
+
 $ type sys$input
--------			Running flush1     	-------
-$ run  flush1
+-------			Running hyperslab    	-------
+$ run  hyperslab
 $ type sys$input
- 
+
 $ type sys$input
--------			Running flush2     	-------
-$ run  flush2
+-------			Running istore    	-------
+$ run  istore
 $ type sys$input
- 
+
 $ type sys$input
--------			Running enum     	-------
-$ run  enum
+-------			Running lheap    	-------
+$ run  lheap
 $ type sys$input
- 
+
 $ type sys$input
--------			Running set_extent     	-------
-$ run  set_extent
+-------			Running links    	-------
+$ run  links
 $ type sys$input
- 
+
 $ type sys$input
--------			Running ttsafe     	-------
-$ run  ttsafe
+-------			Running mf    	-------
+$ run  mf
 $ type sys$input
- 
+
 $ type sys$input
--------			Running getname     	-------
-$ run  getname
+-------			Running mount     	-------
+$ run  mount
 $ type sys$input
- 
+
 $ type sys$input
--------			Running vfd     	-------
-$ run  vfd
+-------			Running mtime    	-------
+$ run  mtime 
 $ type sys$input
- 
+
 $ type sys$input
 -------			Running ntypes     	-------
 $ run  ntypes
 $ type sys$input
- 
+
 $ type sys$input
--------			Running dangle     	-------
-$ run  dangle
+-------			Running objcopy    	-------
+$ run  objcopy 
 $ type sys$input
- 
+
 $ type sys$input
--------			Running dtransform     	-------
-$ run  dtransform
+-------			Running ohdr    	-------
+$ run  ohdr 
+$ type sys$input
+
 $ type sys$input
- 
+-------			Running pool    	-------
+$ run  pool
+$ type sys$input
+
 $ type sys$input
 -------			Running reserved     	-------
 $ run  reserved
 $ type sys$input
- 
+
+$ type sys$input
+-------			Running set_extent     	-------
+$ run  set_extent
 $ type sys$input
--------			Running cross_read     	-------
-$ run  cross_read
+
+$ type sys$input
+-------			Running stab    	-------
+$ run  stab
+$ type sys$input
+
+$ type sys$input
+-------			Running unlink    	-------
+$ run  unlink
+$ type sys$input
+
 $ type sys$input
+-------			Running vfd     	-------
+$ run  vfd
+$ type sys$input
+
 -------			Testing completed       -------
 $ exit 
diff --git a/vms/test/make.com b/vms/test/make.com
index 4a55f1e..2f896ac 100644
--- a/vms/test/make.com
+++ b/vms/test/make.com
@@ -16,62 +16,43 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 library tests
 $!
-$! ccopt = "/float=ieee_float/define=H5_VMS"
+$ ccopt = "/float=ieee_float/define=H5_VMS"
 $
 $ ccc := cc 'ccopt /include=([-.src])
 $ type sys$input
  	Creating  testhdf5
 $
-$ cobj= "h5test.c, testframe.c, testhdf5.c, tarray.c, tattr.c, tconfig.c, "+-
-        "tchecksum.c,"+- 
-        "tfile.c, tgenprop.c, th5o.c, th5s.c, tcoords.c, theap.c, tid.c, titerate.c,"+- 
-        "tmeta.c, tmisc.c, ttime.c, trefer.c, trefstr.c,"+-
-        "tselect.c, tsohm.c, tskiplist.c, ttst.c, tunicode.c, tvltypes.c,"+-
-        "tvlstr.c, cache_common.c"
+$ cobj= "h5test.c, testframe.c, testhdf5.c, tarray.c, tattr.c, tchecksum.c, tconfig.c,"+-
+        "tcoords.c, tfile.c, tgenprop.c, th5o.c, th5s.c, theap.c, tid.c,"+- 
+        "titerate.c, tmeta.c, tmisc.c, trefer.c, trefstr.c, tselect.c, tskiplist.c,"+- 
+        "tsohm.c, ttime.c, ttst.c, tunicode.c, tvlstr.c, tvltypes.c, cache_common.c"+-
 $!                              
 $ ccc 'cobj 
 $ library/create/replace []libh5test h5test, testframe, cache_common
 $ type sys$input
        Creating libh5test
 $ link     testhdf5,tarray,tattr,tchecksum,tconfig, -
-           tfile,tgenprop,th5o,th5s,tcoords,theap,tid,titerate, -
-           tmeta,tmisc,ttime,trefer,trefstr, -
-           tselect,tsohm,tskiplist,ttst,tunicode,tvltypes, -
-           tvlstr, -
+           tcoords,tfile,tgenprop,th5o,th5s,theap,tid,titerate, -
+           tmeta,tmisc,trefer,trefstr, -
+           tselect,tskiplist,tsohm,ttime,ttst,tunicode,tvlstr,tvltypes, -
            libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $
-$!
-$ type sys$input
-       Creating lheap test
-$
-$ ccc  lheap
-$ link lheap, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$!
-$ type sys$input
-       Creating fheap test
-$
-$ ccc  fheap
-$ link fheap, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
-$!
 $ type sys$input
-       Creating ohdr test
-$ ccc  ohdr
-
-$ link ohdr, -
+       Creating app_ref test
+$ ccc  app_ref
+$ link app_ref, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating stab test
-$ ccc  stab
-$ link stab, -
+       Creating big test
+$ ccc  big
+$ link big, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating gheap test
-$ ccc  gheap
-$ link gheap, -
+       Creating bittests test
+$ ccc  bittests
+$ link bittests, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
@@ -79,13 +60,6 @@ $ type sys$input
 $ ccc  btree2
 $ link btree2, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
- 
-$!
-$ type sys$input
-       Creating cache test
-$ ccc  cache
-$ link cache, -
-       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
        Creating cache_api test
@@ -94,27 +68,33 @@ $ link cache_api, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating pool test
-$ ccc  pool 
-$ link pool, -
+       Creating cache test
+$ ccc  cache
+$ link cache, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating hyperslab test
-$ ccc  hyperslab
-$ link hyperslab, -
+       Creating cmpd_dset test
+$ ccc  cmpd_dset
+$ link cmpd_dset, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating istore test
-$ ccc  istore 
-$ link istore, -
+       Creating cross_read test
+$ ccc  cross_read
+$ link cross_read, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating bittests test
-$ ccc  bittests
-$ link bittests, -
+       Creating dangle test
+$ ccc  dangle 
+$ link dangle, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating dsets tests
+$ ccc  dsets 
+$ link dsets, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
@@ -124,21 +104,33 @@ $ link dt_arith, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
+       Creating dtransform test
+$ ccc  dtransform
+$ link dtransform, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
        Creating dtypes test
 $ ccc  dtypes 
 $ link dtypes, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating dsets tests
-$ ccc  dsets 
-$ link dsets, -
+       Creating enum test
+$ ccc  enum
+$ link enum, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating cmpd_dset test
-$ ccc  cmpd_dset
-$ link cmpd_dset, -
+       Creating err_compat test
+$ ccc  err_compat 
+$ link err_compat, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating error_test test
+$ ccc  error_test 
+$ link error_test, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
@@ -154,87 +146,87 @@ $ link external, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating objcopy test
-$ ccc  objcopy
-$ link objcopy, -
+       Creating fheap test
+$ ccc  fheap
+$ link fheap, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating links test
-$ ccc  links
-$ link links, -
+       Creating fillval test
+$ ccc  fillval
+$ link fillval, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating unlink test
-$ ccc  unlink
-$ link unlink, -
+       Creating flush1 test
+$ ccc  flush1
+$ link flush1, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating big test
-$ ccc  big
-$ link big, -
+       Creating flush2 test
+$ ccc  flush2
+$ link flush2, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating mtime test
-$ ccc  mtime
-$ link mtime, -
+       Creating freespace test
+$ ccc  freespace
+$ link freespace, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating fillval test
-$ ccc  fillval
-$ link fillval, -
+       Creating getname test
+$ ccc  getname
+$ link getname, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating mount test
-$ ccc  mount
-$ link mount, -
+       Creating gheap test
+$ ccc  gheap
+$ link gheap, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating flush1 test
-$ ccc  flush1
-$ link flush1, -
+       Creating hyperslab test
+$ ccc  hyperslab
+$ link hyperslab, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating flush2 test
-$ ccc  flush2
-$ link flush2, -
+       Creating istore test
+$ ccc  istore 
+$ link istore, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating enum test
-$ ccc  enum
-$ link enum, -
+       Creating lheap test
+$ ccc  lheap
+$ link lheap, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating set_extent test
-$ ccc  set_extent
-$ link set_extent, -
+       Creating links test
+$ ccc  links
+$ link links, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating ttsafe test
-$ ccc  ttsafe
-$ link ttsafe, -
+       Creating mf test
+$ ccc  mf 
+$ link mf, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating getname test
-$ ccc  getname
-$ link getname, -
+       Creating mount test
+$ ccc  mount
+$ link mount, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating vfd test
-$ ccc  vfd
-$ link vfd, -
+       Creating mtime test
+$ ccc  mtime
+$ link mtime, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
@@ -244,15 +236,21 @@ $ link ntypes, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating dangle test
-$ ccc  dangle 
-$ link dangle, -
+       Creating objcopy test
+$ ccc  objcopy
+$ link objcopy, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating dtransform test
-$ ccc  dtransform
-$ link dtransform, -
+       Creating ohdr test
+$ ccc  ohdr
+$ link ohdr, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating pool test
+$ ccc  pool 
+$ link pool, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
@@ -262,9 +260,27 @@ $ link reserved, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
-       Creating cross_read test
-$ ccc  cross_read
-$ link cross_read, -
+       Creating set_extent test
+$ ccc  set_extent
+$ link set_extent, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating stab test
+$ ccc  stab
+$ link stab, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating unlink test
+$ ccc  unlink
+$ link unlink, -
+       libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+$!
+$ type sys$input
+       Creating vfd test
+$ ccc  vfd
+$ link vfd, -
        libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
diff --git a/vms/tools/h5copy/make.com b/vms/tools/h5copy/make.com
index b262663..384cb6e 100644
--- a/vms/tools/h5copy/make.com
+++ b/vms/tools/h5copy/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5copy tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index 9c69c85..d4de5dc 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -16,7 +16,7 @@ $! Makefile for VAX/VMX systems.
 $!
 $! Make h5diff tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $!
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 96ab968..70ae63a 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5dump tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ 
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 347c87c..b0bffd0 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5import tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com
index 086143f..5338370 100644
--- a/vms/tools/h5jam/make.com
+++ b/vms/tools/h5jam/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com
index 2ab721f..7de34e9 100644
--- a/vms/tools/h5ls/make.com
+++ b/vms/tools/h5ls/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index f9a42c4..2595337 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -16,7 +16,7 @@ $! Makefile for VMS systems.
 $!
 $! Make h5repack tool 
 $!
-$! ccopt = "/float=ieee_float"
+$ ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
diff --git a/vms/tools/h5stat/make.com b/vms/tools/h5stat/make.com
new file mode 100644
index 0000000..51f0f65
--- /dev/null
+++ b/vms/tools/h5stat/make.com
@@ -0,0 +1,36 @@
+$!#
+$!# 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
+$!# access to either file, you may request a copy from help@hdfgroup.org.
+$!#
+$! Makefile for VMS systems.
+$!
+$! Make h5stat tool 
+$!
+$ ccopt = "/float=ieee_float"
+$
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
+$ type sys$input
+    	Creating h5stat
+$!
+$ cobj= " h5stat " 
+$!                               
+$ ccc 'cobj 
+$ type sys$input
+$ link/exe=h5stat.exe -
+           h5stat, -
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
+$ type sys$input
+	Created  h5stat
+$!
+$!
+$ exit