From db2c4c497abab139485dbf6797e56b1340e4577d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 16 Jun 2008 17:17:29 -0500 Subject: [svn-r15221] Description: Bring changes from trunk from the time the branch was created (r14280) up to the 1.8.0 release (r14525) back into the metadata journaling branch. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode --- COPYING | 2 +- MANIFEST | 498 +- Makefile.in | 1 + README.txt | 4 +- bin/trace | 2 + c++/Makefile.in | 1 + c++/examples/Makefile.in | 1 + c++/examples/writedata.cpp | 2 +- c++/src/H5DataSpace.cpp | 2 +- c++/src/H5DataSpace.h | 2 +- c++/src/H5PropList.cpp | 4 +- c++/src/Makefile.in | 1 + c++/test/Makefile.am | 2 +- c++/test/Makefile.in | 7 +- config/gnu-flags | 2 +- config/lt_vers.am | 6 +- configure | 117 +- configure.in | 44 +- examples/Makefile.in | 1 + examples/h5_extlink.c | 2 +- examples/h5_ref2reg.c | 3 +- examples/h5_select.c | 3 +- examples/h5_shared_mesg.c | 12 +- fortran/Makefile.in | 1 + fortran/examples/Makefile.in | 1 + fortran/src/H5Sf.c | 2 +- fortran/src/Makefile.in | 1 + fortran/test/Makefile.in | 1 + fortran/test/tH5P.f90 | 6 + fortran/testpar/Makefile.in | 1 + hl/Makefile.in | 1 + hl/c++/Makefile.in | 1 + hl/c++/examples/Makefile.in | 1 + hl/c++/src/Makefile.in | 1 + hl/c++/test/Makefile.in | 1 + hl/examples/Makefile.in | 1 + hl/examples/ex_table_01.c | 5 +- hl/examples/ex_table_02.c | 5 +- hl/examples/ex_table_03.c | 5 +- hl/examples/ex_table_04.c | 5 +- hl/examples/ex_table_05.c | 5 +- hl/examples/ex_table_06.c | 5 +- hl/examples/ex_table_07.c | 5 +- hl/examples/ex_table_08.c | 5 +- hl/examples/ex_table_09.c | 5 +- hl/examples/ex_table_10.c | 5 +- hl/examples/ex_table_11.c | 5 +- hl/examples/ex_table_12.c | 5 +- hl/fortran/Makefile.in | 1 + hl/fortran/examples/Makefile.in | 1 + hl/fortran/src/H5IMcc.c | 1 - hl/fortran/src/H5IMcc.h | 7 - hl/fortran/src/Makefile.in | 1 + hl/fortran/test/Makefile.in | 1 + hl/src/H5IM.c | 1 - hl/src/H5IMprivate.h | 2 +- hl/src/Makefile.in | 1 + hl/test/Makefile.in | 1 + hl/tools/Makefile.in | 1 + hl/tools/gif2h5/Makefile.in | 1 + perform/Makefile.in | 1 + release_docs/HISTORY.txt | 2546 +++++++ release_docs/INSTALL_Cygwin.txt | 55 +- release_docs/INSTALL_MinGW.txt | 4 +- release_docs/INSTALL_VMS.txt | 112 +- release_docs/INSTALL_Windows.txt | 96 +- release_docs/INSTALL_Windows_Short_MSVS6.0.TXT | 127 - release_docs/INSTALL_Windows_Short_NET.TXT | 59 +- release_docs/INSTALL_Windows_Short_VS2005.TXT | 16 +- release_docs/RELEASE.txt | 1108 +-- src/H5C2journal.c | 2 +- src/H5D.c | 2 +- src/H5Dcontig.c | 8 +- src/H5Ddeprec.c | 11 +- src/H5Dint.c | 250 +- src/H5Dio.c | 338 +- src/H5Distore.c | 427 +- src/H5Dmpio.c | 18 +- src/H5Dpkg.h | 52 +- src/H5Dpublic.h | 4 +- src/H5Dselect.c | 416 +- src/H5F.c | 59 +- src/H5FD.c | 1632 +--- src/H5FDlog.c | 4 + src/H5FDmpio.c | 95 +- src/H5FDpkg.h | 67 + src/H5FDprivate.h | 3 + src/H5FDpublic.h | 36 +- src/H5FDspace.c | 1738 +++++ src/H5FS.c | 13 +- src/H5FSsection.c | 21 +- src/H5Fpkg.h | 5 +- src/H5Fprivate.h | 2 + src/H5Fpublic.h | 6 + src/H5G.c | 486 +- src/H5Gcompact.c | 8 +- src/H5Gdense.c | 47 +- src/H5Gdeprec.c | 4 +- src/H5Glink.c | 33 +- src/H5Gname.c | 282 +- src/H5Gnode.c | 52 +- src/H5Gobj.c | 47 +- src/H5Gpkg.h | 40 +- src/H5Gprivate.h | 5 +- src/H5Gstab.c | 10 +- src/H5HFdbg.c | 94 +- src/H5HFpkg.h | 2 +- src/H5HFspace.c | 52 +- src/H5HL.c | 115 +- src/H5L.c | 132 +- src/H5Lpublic.h | 5 + src/H5MF.c | 225 +- src/H5MFprivate.h | 9 +- src/H5O.c | 455 +- src/H5Ocache.c | 22 +- src/H5Olinfo.c | 7 +- src/H5Omessage.c | 57 +- src/H5Opkg.h | 6 + src/H5Oprivate.h | 21 +- src/H5Opublic.h | 23 +- src/H5Pfapl.c | 135 +- src/H5Pfcpl.c | 2 +- src/H5Ppublic.h | 8 +- src/H5R.c | 2 +- src/H5S.c | 40 +- src/H5SL.c | 243 +- src/H5SLprivate.h | 3 +- src/H5SM.c | 24 +- src/H5Sall.c | 61 +- src/H5Shyper.c | 240 +- src/H5Snone.c | 41 +- src/H5Spkg.h | 6 +- src/H5Spoint.c | 264 +- src/H5Sprivate.h | 21 +- src/H5Spublic.h | 12 +- src/H5Sselect.c | 68 +- src/H5TS.c | 51 +- src/H5TSprivate.h | 1 - src/H5Znbit.c | 3 +- src/H5Zpublic.h | 19 + src/H5Zscaleoffset.c | 1 - src/H5Zshuffle.c | 2 - src/H5Zszip.c | 7 - src/H5checksum.c | 33 + src/H5config.h.in | 3 + src/H5private.h | 7 + src/H5public.h | 4 +- src/H5trace.c | 20 + src/Makefile.am | 2 +- src/Makefile.in | 73 +- test/Makefile.am | 10 +- test/Makefile.in | 47 +- test/cache2_journal.c | 24 +- test/dsets.c | 15 +- test/dtypes.c | 4 +- test/external.c | 3 +- test/family_v1.6_00000.h5 | Bin 5120 -> 0 bytes test/family_v1.6_00001.h5 | Bin 5120 -> 0 bytes test/family_v1.6_00002.h5 | Bin 5120 -> 0 bytes test/family_v1.6_00003.h5 | Bin 4048 -> 0 bytes test/family_v16_00000.h5 | Bin 0 -> 5120 bytes test/family_v16_00001.h5 | Bin 0 -> 5120 bytes test/family_v16_00002.h5 | Bin 0 -> 5120 bytes test/family_v16_00003.h5 | Bin 0 -> 4048 bytes test/fheap.c | 10 +- test/fillval.c | 4 +- test/flush2.c | 6 +- test/gen_bad_ohdr.c | 103 + test/gen_new_group.c | 4 +- test/getname.c | 93 +- test/h5test.c | 22 +- test/links.c | 708 +- test/mount.c | 26 +- test/objcopy.c | 10 +- test/ohdr.c | 2 +- test/stab.c | 4 +- test/tattr.c | 50 +- test/tbad_msg_count.h5 | Bin 0 -> 1984 bytes test/tcoords.c | 507 ++ test/testhdf5.c | 1 + test/testhdf5.h | 2 + test/th5o.c | 14 +- test/th5s.c | 2 +- test/titerate.c | 6 +- test/tmisc.c | 65 +- test/trefer.c | 6 +- test/tselect.c | 76 +- test/tskiplist.c | 7 +- test/tsohm.c | 84 +- test/unlink.c | 4 +- test/vfd.c | 4 +- testpar/Makefile.in | 1 + testpar/t_mdset.c | 2 +- tools/Makefile.in | 1 + tools/h5copy/Makefile.in | 1 + tools/h5copy/h5copy.c | 4 +- tools/h5diff/Makefile.in | 1 + tools/h5diff/h5diff_common.c | 381 +- tools/h5diff/h5diffgentest.c | 74 +- tools/h5dump/Makefile.in | 1 + tools/h5dump/h5dump.c | 54 +- tools/h5dump/h5dumpgentest.c | 2 +- tools/h5dump/testh5dump.sh.in | 17 +- tools/h5import/Makefile.am | 2 +- tools/h5import/Makefile.in | 7 +- tools/h5jam/Makefile.in | 1 + tools/h5ls/Makefile.in | 1 + tools/h5ls/h5ls.c | 524 +- tools/h5ls/testh5ls.sh | 57 +- tools/h5recover/Makefile.in | 1 + tools/h5recover/enable_journaling.c | 4 +- tools/h5recover/h5recover.c | 4 +- tools/h5repack/Makefile.am | 4 +- tools/h5repack/Makefile.in | 12 +- tools/h5repack/h5repack.c | 789 +- tools/h5repack/h5repack.h | 68 +- tools/h5repack/h5repack.sh.in | 21 +- tools/h5repack/h5repack_copy.c | 482 +- tools/h5repack/h5repack_filters.c | 77 +- tools/h5repack/h5repack_list.c | 153 - tools/h5repack/h5repack_main.c | 699 +- tools/h5repack/h5repack_opttable.c | 476 +- tools/h5repack/h5repack_parse.c | 1082 ++- tools/h5repack/h5repack_refs.c | 2 +- tools/h5repack/h5repack_verify.c | 848 ++- tools/h5repack/h5repacktst.c | 37 + tools/h5stat/Makefile.in | 1 + tools/h5stat/h5stat.c | 327 +- tools/h5stat/h5stat_gentest.c | 2 +- tools/h5stat/testfiles/h5stat_filters-file.ddl | 1 - tools/h5stat/testfiles/h5stat_filters.ddl | 1 - tools/h5stat/testfiles/h5stat_newgrat.ddl | 1 - tools/h5stat/testfiles/h5stat_tsohm.ddl | 1 - tools/lib/Makefile.in | 1 + tools/lib/h5diff.c | 2 +- tools/lib/h5diff_array.c | 4130 +++++----- tools/lib/h5tools.c | 155 +- tools/lib/h5tools_ref.c | 192 +- tools/lib/h5tools_utils.c | 186 +- tools/lib/h5tools_utils.h | 2 +- tools/lib/h5trav.c | 276 +- tools/lib/h5trav.h | 14 + tools/misc/Makefile.in | 1 + tools/misc/h5mkgrp.c | 4 +- tools/testfiles/h5copytst.out.ls | 163 +- tools/testfiles/h5diff_17.txt | 2 + tools/testfiles/h5diff_basic1.h5 | Bin 8552 -> 9392 bytes tools/testfiles/h5mkgrp_nested.ls | 3 + tools/testfiles/h5mkgrp_nested_latest.ls | 4 + tools/testfiles/h5mkgrp_nested_mult.ls | 3 + tools/testfiles/h5mkgrp_nested_mult_latest.ls | 4 + tools/testfiles/h5mkgrp_several.ls | 3 + tools/testfiles/h5mkgrp_several_latest.ls | 4 + tools/testfiles/h5mkgrp_single.ls | 3 + tools/testfiles/h5mkgrp_single_latest.ls | 4 + tools/testfiles/tall-2.ls | 1 + tools/testfiles/tarray1.ls | 1 + tools/testfiles/tattr2.ls | 143 - tools/testfiles/tcomp-1.ls | 1 + tools/testfiles/tdset-1.ls | 1 + tools/testfiles/textlink-1.ls | 1 + tools/testfiles/tgroup-1.ls | 40 +- tools/testfiles/tgroup-2.ls | 4 + tools/testfiles/tindicessub1.ddl | 14 +- tools/testfiles/tindicessub2.ddl | 22 +- tools/testfiles/tindicessub3.ddl | 30 +- tools/testfiles/tindicessub4.ddl | 58 +- tools/testfiles/tloop-1.ls | 1 + tools/testfiles/tnestcomp-1.ls | 1 + tools/testfiles/tnofilename.ddl | 4 +- tools/testfiles/tsaf.ls | 1 + tools/testfiles/tslink-1.ls | 1 + tools/testfiles/tstr-1.ls | 1 + tools/testfiles/tudlink-1.ls | 1 + tools/testfiles/tvldtypes1.ls | 1 + vms/build.com | 51 + vms/c++/examples/make.com | 33 +- vms/examples/make.com | 29 +- vms/fortran/examples/make.com | 61 +- vms/install.com | 157 + vms/make.com | 21 +- vms/src/make.com | 2 +- vms/test/make.com | 4 +- vms/tools/h5diff/check.com | 231 - vms/tools/h5diff/check_h5diff.com | 171 +- vms/tools/h5diff/make.com | 12 +- vms/tools/h5dump/check.com | 199 - vms/tools/h5dump/check_h5dump.com | 177 +- vms/tools/h5dump/make.com | 9 +- vms/tools/h5import/check_h5import.com | 130 +- vms/tools/h5import/make.com | 12 +- vms/tools/h5ls/check_h5ls.com | 11 +- vms/tools/h5repack/check_h5repack.com | 125 +- vms/tools/h5repack/make.com | 19 +- vms/tools/testfiles/tattr-3.ddl | 13 + vms/tools/testfiles/tdset-2.ddl | 17 + vms/tools/testfiles/tgroup-2.ddl | 47 + vms/tools/testfiles/tperror.ddl | 9 + windows/hdf5build.BAT | 25 +- windows/installhdf5lib.bat | 4 +- windows/proj/hdf5/hdf5.vcproj | 50 +- windows/proj/hdf5dll/hdf5dll.vcproj | 52 +- windows/test/testhdf5/testhdf5.vcproj | 4 + windows/test/testhdf5dll/testhdf5dll.vcproj | 4 + windows/tools/h5diff/testh5diff.bat | 6 +- windows/tools/h5dump/testh5dump.bat | 19 +- windows/tools/h5ls/testh5ls.bat | 83 +- windows/tools/h5repack/h5repack.bat | 27 +- windows/tools/h5repack/h5repack.vcproj | 48 - windows/tools/h5repackdll/h5repackdll.vcproj | 46 - .../tools/testfiles/h5repacktst/h5repacktst.vcproj | 48 - .../tools/testfiles/h5reparttst/h5reparttst.vcproj | 4 +- windows_vnet/COPYING | 16 + .../c++/examples/allcppexamples/allcppexamples.sln | 149 + .../examples/allcppexamples/allcppexamples.vcproj | 136 + .../c++/examples/chunkstest/chunkstest.vcproj | 166 + .../examples/chunkstestdll/chunkstestdll.vcproj | 164 + .../c++/examples/compoundtest/compoundtest.vcproj | 166 + .../compoundtestdll/compoundtestdll.vcproj | 164 + .../c++/examples/createtest/createtest.vcproj | 166 + .../examples/createtestdll/createtestdll.vcproj | 164 + .../examples/extend_dstest/extend_dstest.vcproj | 166 + .../extend_dstestdll/extend_dstestdll.vcproj | 164 + .../c++/examples/h5grouptest/h5grouptest.vcproj | 166 + .../examples/h5grouptestdll/h5grouptestdll.vcproj | 164 + .../c++/examples/readdatatest/readdatatest.vcproj | 166 + .../readdatatestdll/readdatatestdll.vcproj | 164 + .../examples/writedatatest/writedatatest.vcproj | 166 + .../writedatatestdll/writedatatestdll.vcproj | 164 + windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj | 213 + .../c++/test/dsets_cppdll/dsets_cppdll.vcproj | 213 + .../c++/test/testhdf5_cpp/testhdf5_cpp.vcproj | 381 + .../test/testhdf5_cppdll/testhdf5_cppdll.vcproj | 379 + windows_vnet/examples/allexamples/allexamples.sln | 185 + .../examples/allexamples/allexamples.vcproj | 135 + .../examples/attributetest/attributetest.vcproj | 163 + .../attributetestdll/attributetestdll.vcproj | 164 + windows_vnet/examples/chunkread/chunkread.vcproj | 163 + .../examples/chunkreaddll/chunkreaddll.vcproj | 164 + .../examples/compoundtest/compoundtest.vcproj | 163 + .../compoundtestdll/compoundtestdll.vcproj | 164 + .../extendwritetest/extendwritetest.vcproj | 163 + .../extendwritetestdll/extendwritetestdll.vcproj | 164 + windows_vnet/examples/grouptest/grouptest.vcproj | 163 + .../examples/grouptestdll/grouptestdll.vcproj | 164 + .../intermgrouptest/intermgrouptest.vcproj | 177 + .../intermgrouptestdll/intermgrouptestdll.vcproj | 176 + windows_vnet/examples/readtest/readtest.vcproj | 163 + .../examples/readtestdll/readtestdll.vcproj | 164 + windows_vnet/examples/selectest/selectest.vcproj | 163 + .../examples/selectestdll/selectestdll.vcproj | 164 + windows_vnet/examples/writetest/writetest.vcproj | 163 + .../examples/writetestdll/writetestdll.vcproj | 164 + .../hl_test_table_cpp/hl_test_table_cpp.vcproj | 174 + .../hl_test_table_cppdll.vcproj | 174 + .../hl/examples/allhlcexamples/allhlcexamples.sln | 113 + .../examples/allhlcexamples/allhlcexamples.vcproj | 57 + windows_vnet/hl/examples/ex_ds/ex_ds.vcproj | 176 + windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj | 176 + .../hl/examples/ex_images/ex_images.vcproj | 176 + .../hl/examples/ex_imagesdll/ex_imagesdll.vcproj | 176 + windows_vnet/hl/examples/ex_lite/ex_lite.vcproj | 176 + .../hl/examples/ex_litedll/ex_litedll.vcproj | 176 + .../hl/examples/ex_packet/ex_packet.vcproj | 176 + .../hl/examples/ex_packetdll/ex_packetdll.vcproj | 176 + windows_vnet/hl/examples/ex_table/ex_table.vcproj | 176 + .../hl/examples/ex_tabledll/ex_tabledll.vcproj | 176 + windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj | 178 + .../hl/test/hl_test_dsdll/hl_test_dsdll.vcproj | 176 + .../hl/test/hl_test_image/hl_test_image.vcproj | 163 + .../test/hl_test_imagedll/hl_test_imagedll.vcproj | 174 + .../hl/test/hl_test_lite/hl_test_lite.vcproj | 163 + .../hl/test/hl_test_litedll/hl_test_litedll.vcproj | 174 + .../hl/test/hl_test_packet/hl_test_packet.vcproj | 177 + .../hl_test_packetdll/hl_test_packetdll.vcproj | 174 + .../hl/test/hl_test_table/hl_test_table.vcproj | 163 + .../test/hl_test_tabledll/hl_test_tabledll.vcproj | 174 + windows_vnet/hl/tools/gifconv/gif2h5.vcproj | 256 + windows_vnet/hl/tools/gifconv/h52gif.vcproj | 196 + windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj | 252 + windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj | 192 + windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj | 172 + windows_vnet/proj/all/all.sln | 2300 ++++++ windows_vnet/proj/all/all.vcproj | 57 + windows_vnet/proj/hdf5/hdf5.vcproj | 7876 +++++++++++++++++++ windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj | 741 ++ windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj | 770 ++ windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj | 271 + windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj | 151 + .../proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj | 181 + windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj | 302 + windows_vnet/proj/hdf5dll/hdf5dll.vcproj | 7923 ++++++++++++++++++++ windows_vnet/test/big/big.vcproj | 303 + windows_vnet/test/bigdll/bigdll.vcproj | 295 + windows_vnet/test/bittests/bittests.vcproj | 295 + windows_vnet/test/bittestsdll/bittestsdll.vcproj | 291 + windows_vnet/test/btree2/btree2.vcproj | 178 + windows_vnet/test/btree2dll/btree2dll.vcproj | 176 + windows_vnet/test/cache/cache.vcproj | 184 + windows_vnet/test/cache_api/cache_api.vcproj | 196 + windows_vnet/test/cache_apidll/cache_apidll.vcproj | 194 + windows_vnet/test/cachedll/cachedll.vcproj | 182 + windows_vnet/test/chunk/chunk.vcproj | 299 + windows_vnet/test/chunkdll/chunkdll.vcproj | 291 + windows_vnet/test/cmpd_dset/cmpd_dset.vcproj | 297 + windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj | 295 + windows_vnet/test/cross_read/cross_read.vcproj | 178 + .../test/cross_readdll/cross_readdll.vcproj | 176 + windows_vnet/test/dangle/dangle.vcproj | 164 + windows_vnet/test/dangledll/dangledll.vcproj | 160 + windows_vnet/test/dsets/dsets.vcproj | 297 + windows_vnet/test/dsetsdll/dsetsdll.vcproj | 295 + windows_vnet/test/dt_arith/dt_arith.vcproj | 178 + windows_vnet/test/dt_arithdll/dt_arithdll.vcproj | 176 + windows_vnet/test/dtransform/dtransform.vcproj | 164 + .../test/dtransformdll/dtransformdll.vcproj | 160 + windows_vnet/test/dtypes/dtypes.vcproj | 297 + windows_vnet/test/dtypesdll/dtypesdll.vcproj | 295 + windows_vnet/test/enum/enum.vcproj | 297 + windows_vnet/test/enumdll/enumdll.vcproj | 295 + windows_vnet/test/err_compat/err_compat.vcproj | 178 + .../test/err_compatdll/err_compatdll.vcproj | 176 + windows_vnet/test/error_test/error_test.vcproj | 178 + .../test/error_testdll/error_testdll.vcproj | 176 + windows_vnet/test/extend/extend.vcproj | 297 + windows_vnet/test/extenddll/extenddll.vcproj | 295 + windows_vnet/test/external/external.vcproj | 297 + windows_vnet/test/externaldll/externaldll.vcproj | 295 + windows_vnet/test/fheap/fheap.vcproj | 178 + windows_vnet/test/fheapdll/fheapdll.vcproj | 176 + windows_vnet/test/fillval/fillval.vcproj | 297 + windows_vnet/test/fillvaldll/fillvaldll.vcproj | 295 + windows_vnet/test/flush1/flush1.vcproj | 297 + windows_vnet/test/flush1dll/flush1dll.vcproj | 295 + windows_vnet/test/flush2/flush2.vcproj | 297 + windows_vnet/test/flush2dll/flush2dll.vcproj | 295 + windows_vnet/test/getname/getname.vcproj | 166 + windows_vnet/test/getnamedll/getnamedll.vcproj | 166 + windows_vnet/test/getub/getub.vcproj | 163 + windows_vnet/test/gheap/gheap.vcproj | 297 + windows_vnet/test/gheapdll/gheapdll.vcproj | 295 + windows_vnet/test/hyperslab/hyperslab.vcproj | 297 + windows_vnet/test/hyperslabdll/hyperslabdll.vcproj | 291 + windows_vnet/test/iopipe/iopipe.vcproj | 295 + windows_vnet/test/iopipedll/iopipedll.vcproj | 291 + windows_vnet/test/istore/istore.vcproj | 297 + windows_vnet/test/istoredll/istoredll.vcproj | 295 + windows_vnet/test/lheap/lheap.vcproj | 297 + windows_vnet/test/lheapdll/lheapdll.vcproj | 295 + windows_vnet/test/libtest/libtest.vcproj | 179 + windows_vnet/test/libtestD/libtestD.vcproj | 202 + windows_vnet/test/links/links.vcproj | 297 + windows_vnet/test/linksdll/linksdll.vcproj | 295 + windows_vnet/test/mount/mount.vcproj | 297 + windows_vnet/test/mountdll/mountdll.vcproj | 295 + windows_vnet/test/mtime/mtime.vcproj | 297 + windows_vnet/test/mtimedll/mtimedll.vcproj | 295 + windows_vnet/test/ntypes/ntypes.vcproj | 166 + windows_vnet/test/ntypesdll/ntypesdll.vcproj | 166 + windows_vnet/test/objcopy/objcopy.vcproj | 176 + windows_vnet/test/objcopydll/objcopydll.vcproj | 176 + windows_vnet/test/ohdr/ohdr.vcproj | 297 + windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj | 174 + windows_vnet/test/ohdrdll/ohdrdll.vcproj | 295 + windows_vnet/test/overhead/overhead.vcproj | 295 + windows_vnet/test/overheaddll/overheaddll.vcproj | 291 + windows_vnet/test/pool/pool.vcproj | 178 + windows_vnet/test/pooldll/pooldll.vcproj | 176 + windows_vnet/test/reserved/reserved.vcproj | 164 + windows_vnet/test/reserveddll/reserveddll.vcproj | 162 + windows_vnet/test/set_extent/set_extent.vcproj | 164 + .../test/set_extentdll/set_extentdll.vcproj | 163 + windows_vnet/test/stab/stab.vcproj | 297 + windows_vnet/test/stabdll/stabdll.vcproj | 295 + windows_vnet/test/tellub/tellub.vcproj | 163 + windows_vnet/test/testhdf5/testhdf5.vcproj | 1172 +++ windows_vnet/test/testhdf5dll/testhdf5dll.vcproj | 1131 +++ windows_vnet/test/ttsafedll/ttsafedll.vcproj | 254 + windows_vnet/test/unlink/unlink.vcproj | 297 + windows_vnet/test/unlinkdll/unlinkdll.vcproj | 295 + windows_vnet/test/vfd/vfd.vcproj | 178 + windows_vnet/test/vfddll/vfddll.vcproj | 178 + windows_vnet/tools/h5copy/h5copy.vcproj | 176 + windows_vnet/tools/h5debug/h5debug.vcproj | 295 + windows_vnet/tools/h5debugdll/h5debugdll.vcproj | 291 + windows_vnet/tools/h5diff/h5diff.vcproj | 187 + windows_vnet/tools/h5diffdll/h5diffdll.vcproj | 180 + windows_vnet/tools/h5dump/h5dump.vcproj | 295 + windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj | 293 + windows_vnet/tools/h5import/h5import.vcproj | 292 + windows_vnet/tools/h5importdll/h5importdll.vcproj | 288 + windows_vnet/tools/h5jam/h5jam.vcproj | 163 + windows_vnet/tools/h5ls/h5ls.vcproj | 295 + windows_vnet/tools/h5lsdll/h5lsdll.vcproj | 291 + windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj | 174 + windows_vnet/tools/h5repack/h5repack.vcproj | 329 + windows_vnet/tools/h5repackdll/h5repackdll.vcproj | 315 + windows_vnet/tools/h5repart/h5repart.vcproj | 295 + windows_vnet/tools/h5repartdll/h5repartdll.vcproj | 291 + windows_vnet/tools/h5stat/h5stat.vcproj | 174 + windows_vnet/tools/h5statdll/h5statdll.vcproj | 173 + windows_vnet/tools/h5unjam/h5unjam.vcproj | 163 + windows_vnet/tools/talign/talign.vcproj | 164 + windows_vnet/tools/taligndll/taligndll.vcproj | 162 + .../tools/testfiles/binread/binread.vcproj | 166 + .../tools/testfiles/h5difftst/h5difftst.vcproj | 179 + .../tools/testfiles/h5dumptst/h5dumptst.vcproj | 295 + .../tools/testfiles/h5importtst/h5importtst.vcproj | 160 + .../tools/testfiles/h5jamtst/h5jamtst.vcproj | 163 + .../tools/testfiles/h5repacktst/h5repacktst.vcproj | 329 + .../h5repart_gentest/h5repart_gentest.vcproj | 174 + .../tools/testfiles/h5reparttst/h5reparttst.vcproj | 174 + .../testh5repack_detect_szip.vcproj | 163 + .../testh5repack_detect_szipdll.vcproj | 160 + windows_vnet/tools/toolslib/toolslib.vcproj | 660 ++ windows_vnet/tools/toolslibD/toolslibD.vcproj | 660 ++ windows_vs6/COPYING | 16 - .../c++/examples/allcppexamples/allcppexamples.dsp | 89 - .../c++/examples/allcppexamples/allcppexamples.dsw | 239 - windows_vs6/c++/examples/chunkstest/chunkstest.dsp | 95 - .../c++/examples/chunkstestdll/chunkstestdll.dsp | 95 - .../c++/examples/compoundtest/compoundtest.dsp | 95 - .../examples/compoundtestdll/compoundtestdll.dsp | 95 - windows_vs6/c++/examples/createtest/createtest.dsp | 93 - .../c++/examples/createtestdll/createtestdll.dsp | 94 - .../c++/examples/extend_dstest/extend_dstest.dsp | 93 - .../examples/extend_dstestdll/extend_dstestdll.dsp | 94 - .../c++/examples/h5grouptest/h5grouptest.dsp | 93 - .../c++/examples/h5grouptestdll/h5grouptestdll.dsp | 94 - .../c++/examples/readdatatest/readdatatest.dsp | 93 - .../examples/readdatatestdll/readdatatestdll.dsp | 94 - .../c++/examples/writedatatest/writedatatest.dsp | 93 - .../examples/writedatatestdll/writedatatestdll.dsp | 94 - windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp | 111 - windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp | 111 - windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp | 152 - .../c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp | 148 - windows_vs6/examples/allexamples/allexamples.dsp | 90 - windows_vs6/examples/allexamples/allexamples.dsw | 299 - .../examples/attributetest/attributetest.dsp | 95 - .../examples/attributetestdll/attributetestdll.dsp | 95 - windows_vs6/examples/chunkread/chunkread.dsp | 95 - windows_vs6/examples/chunkreaddll/chunkreaddll.dsp | 95 - windows_vs6/examples/compoundtest/compoundtest.dsp | 95 - .../examples/compoundtestdll/compoundtestdll.dsp | 95 - .../examples/extendwritetest/extendwritetest.dsp | 95 - .../extendwritetestdll/extendwritetestdll.dsp | 95 - windows_vs6/examples/grouptest/grouptest.dsp | 95 - windows_vs6/examples/grouptestdll/grouptestdll.dsp | 95 - .../examples/intermgrouptest/intermgrouptest.dsp | 104 - .../intermgrouptestdll/intermgrouptestdll.dsp | 104 - windows_vs6/examples/readtest/readtest.dsp | 95 - windows_vs6/examples/readtestdll/readtestdll.dsp | 95 - windows_vs6/examples/selectest/selectest.dsp | 95 - windows_vs6/examples/selectestdll/selectestdll.dsp | 95 - windows_vs6/examples/writetest/writetest.dsp | 95 - windows_vs6/examples/writetestdll/writetestdll.dsp | 95 - .../examples/allf90examples/allf90examples.dsp | 91 - .../examples/allf90examples/allf90examples.dsw | 449 -- .../examples/attreexampletest/attreexampletest.dsp | 98 - .../attreexampletestdll/attreexampletestdll.dsp | 98 - .../fortran/examples/compoundtest/compoundtest.dsp | 95 - .../examples/compoundtestdll/compoundtestdll.dsp | 95 - .../examples/dsetexampletest/dsetexampletest.dsp | 95 - .../dsetexampletestdll/dsetexampletestdll.dsp | 94 - .../examples/fileexampletest/fileexampletest.dsp | 93 - .../fileexampletestdll/fileexampletestdll.dsp | 94 - .../examples/groupexampletest/groupexampletest.dsp | 93 - .../groupexampletestdll/groupexampletestdll.dsp | 94 - .../grpdsetexampletest/grpdsetexampletest.dsp | 93 - .../grpdsetexampletestdll.dsp | 94 - .../fortran/examples/grpittest/grpittest.dsp | 97 - .../fortran/examples/grpittestdll/grpittestdll.dsp | 97 - .../examples/grpsexampletest/grpsexampletest.dsp | 96 - .../grpsexampletestdll/grpsexampletestdll.dsp | 97 - .../examples/hyperslabtest/hyperslabtest.dsp | 96 - .../examples/hyperslabtestdll/hyperslabtestdll.dsp | 97 - .../examples/mountexampletest/mountexampletest.dsp | 96 - .../mountexampletestdll/mountexampletestdll.dsp | 97 - .../refobjexampletest/refobjexampletest.dsp | 97 - .../refobjexampletestdll/refobjexampletestdll.dsp | 97 - .../refregexampletest/refregexampletest.dsp | 97 - .../refregexampletestdll/refregexampletestdll.dsp | 97 - .../rwdsetexampletest/rwdsetexampletest.dsp | 97 - .../rwdsetexampletestdll/rwdsetexampletestdll.dsp | 97 - .../examples/selecteletest/selecteletest.dsp | 97 - .../examples/selecteletestdll/selecteletestdll.dsp | 98 - .../fortran/test/flush1_fortran/flush1_fortran.dsp | 98 - .../test/flush1_fortrandll/flush1_fortrandll.dsp | 98 - .../fortran/test/flush2_fortran/flush2_fortran.dsp | 98 - .../test/flush2_fortrandll/flush2_fortrandll.dsp | 98 - .../test/libtest_cstubdll/libtest_cstubdll.dsp | 108 - .../test/libtest_fortran/libtest_fortran.dsp | 104 - .../test/libtest_fortrandll/libtest_fortrandll.dsp | 103 - .../test/testhdf5_fortran/testhdf5_fortran.dsp | 201 - .../testhdf5_fortrandll/testhdf5_fortrandll.dsp | 211 - .../test/hl_test_table_cpp/hl_test_table_cpp.dsp | 108 - .../hl_test_table_cppdll/hl_test_table_cppdll.dsp | 106 - .../hl/examples/allhlcexamples/allhlcexamples.dsp | 63 - .../hl/examples/allhlcexamples/allhlcexamples.dsw | 179 - windows_vs6/hl/examples/ex_ds/ex_ds.dsp | 107 - windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp | 107 - windows_vs6/hl/examples/ex_images/ex_images.dsp | 107 - .../hl/examples/ex_imagesdll/ex_imagesdll.dsp | 105 - windows_vs6/hl/examples/ex_lite/ex_lite.dsp | 107 - windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp | 105 - windows_vs6/hl/examples/ex_packet/ex_packet.dsp | 105 - .../hl/examples/ex_packetdll/ex_packetdll.dsp | 106 - windows_vs6/hl/examples/ex_table/ex_table.dsp | 106 - .../hl/examples/ex_tabledll/ex_tabledll.dsp | 105 - .../examples/allhlf90examples/allhlf90examples.dsp | 63 - .../examples/allhlf90examples/allhlf90examples.dsw | 59 - .../hl/fortran/examples/ex_lite/ex_lite.dsp | 113 - .../hl/fortran/examples/ex_litedll/ex_litedll.dsp | 112 - .../hl_test_image_fortran.dsp | 103 - .../hl_test_image_fortrandll.dsp | 111 - .../hl_test_lite_fortran/hl_test_lite_fortran.dsp | 103 - .../hl_test_lite_fortrandll.dsp | 109 - .../hl_test_table_fortran.dsp | 103 - .../hl_test_table_fortrandll.dsp | 109 - windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp | 112 - .../hl/test/hl_test_dsdll/hl_test_dsdll.dsp | 108 - .../hl/test/hl_test_image/hl_test_image.dsp | 96 - .../hl/test/hl_test_imagedll/hl_test_imagedll.dsp | 108 - windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp | 96 - .../hl/test/hl_test_litedll/hl_test_litedll.dsp | 108 - .../hl/test/hl_test_packet/hl_test_packet.dsp | 108 - .../test/hl_test_packetdll/hl_test_packetdll.dsp | 108 - .../hl/test/hl_test_table/hl_test_table.dsp | 96 - .../hl/test/hl_test_tabledll/hl_test_tabledll.dsp | 108 - windows_vs6/hl/tools/gifconv/gif2h5.dsp | 123 - windows_vs6/hl/tools/gifconv/h52gif.dsp | 112 - windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp | 122 - windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp | 111 - .../H5fortran_detect_gen/H5fortran_detect_gen.dsp | 106 - .../H5fortran_detect_gen/H5fortran_detect_gen.dsw | 29 - .../misc/fortrantypegen/H5fortran_detect.dsp | 106 - windows_vs6/misc/fortrantypegen/fortrantypegen.dsw | 29 - windows_vs6/misc/matchtypegen/H5match_types.dsp | 106 - windows_vs6/misc/matchtypegen/matchtypegen.dsw | 29 - windows_vs6/misc/typegen/h5tinit/h5tinit.dsp | 118 - windows_vs6/proj/all/all.dsp | 69 - windows_vs6/proj/all/all.dsw | 3695 --------- windows_vs6/proj/hdf5/hdf5.dsp | 3707 --------- windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp | 321 - windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp | 332 - windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp | 161 - .../proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp | 172 - windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp | 215 - .../proj/hdf5_fortrandll/hdf5_fortrandll.dsp | 226 - windows_vs6/proj/hdf5_hl/hdf5_hl.dsp | 125 - windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp | 101 - windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp | 111 - .../hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp | 123 - .../proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp | 144 - .../proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp | 135 - windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp | 135 - windows_vs6/proj/hdf5dll/hdf5dll.dsp | 3925 ---------- windows_vs6/test/big/big.dsp | 172 - windows_vs6/test/bigdll/bigdll.dsp | 170 - windows_vs6/test/bittests/bittests.dsp | 170 - windows_vs6/test/bittestsdll/bittestsdll.dsp | 170 - windows_vs6/test/btree2/btree2.dsp | 107 - windows_vs6/test/btree2dll/btree2dll.dsp | 105 - windows_vs6/test/cache/cache.dsp | 99 - windows_vs6/test/cache_api/cache_api.dsp | 111 - windows_vs6/test/cache_apidll/cache_apidll.dsp | 109 - windows_vs6/test/cachedll/cachedll.dsp | 99 - windows_vs6/test/chunk/chunk.dsp | 170 - windows_vs6/test/chunkdll/chunkdll.dsp | 170 - windows_vs6/test/cmpd_dset/cmpd_dset.dsp | 170 - windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp | 170 - windows_vs6/test/cross_read/cross_read.dsp | 107 - windows_vs6/test/cross_readdll/cross_readdll.dsp | 105 - windows_vs6/test/dangle/dangle.dsp | 95 - windows_vs6/test/dangledll/dangledll.dsp | 95 - windows_vs6/test/dsets/dsets.dsp | 170 - windows_vs6/test/dsetsdll/dsetsdll.dsp | 170 - windows_vs6/test/dt_arith/dt_arith.dsp | 107 - windows_vs6/test/dt_arithdll/dt_arithdll.dsp | 106 - windows_vs6/test/dtransform/dtransform.dsp | 95 - windows_vs6/test/dtransformdll/dtransformdll.dsp | 95 - windows_vs6/test/dtypes/dtypes.dsp | 172 - windows_vs6/test/dtypesdll/dtypesdll.dsp | 170 - windows_vs6/test/enum/enum.dsp | 170 - windows_vs6/test/enumdll/enumdll.dsp | 170 - windows_vs6/test/err_compat/err_compat.dsp | 102 - windows_vs6/test/err_compatdll/err_compatdll.dsp | 103 - windows_vs6/test/error_test/error_test.dsp | 102 - windows_vs6/test/error_testdll/error_testdll.dsp | 103 - windows_vs6/test/extend/extend.dsp | 170 - windows_vs6/test/extenddll/extenddll.dsp | 170 - windows_vs6/test/external/external.dsp | 170 - windows_vs6/test/externaldll/externaldll.dsp | 170 - windows_vs6/test/fheap/fheap.dsp | 105 - windows_vs6/test/fheapdll/fheapdll.dsp | 105 - windows_vs6/test/fillval/fillval.dsp | 170 - windows_vs6/test/fillvaldll/fillvaldll.dsp | 170 - windows_vs6/test/flush1/flush1.dsp | 170 - windows_vs6/test/flush1dll/flush1dll.dsp | 170 - windows_vs6/test/flush2/flush2.dsp | 170 - windows_vs6/test/flush2dll/flush2dll.dsp | 170 - windows_vs6/test/getname/getname.dsp | 95 - windows_vs6/test/getnamedll/getnamedll.dsp | 95 - windows_vs6/test/getub/getub.dsp | 95 - windows_vs6/test/gheap/gheap.dsp | 170 - windows_vs6/test/gheapdll/gheapdll.dsp | 170 - windows_vs6/test/hyperslab/hyperslab.dsp | 172 - windows_vs6/test/hyperslabdll/hyperslabdll.dsp | 170 - windows_vs6/test/iopipe/iopipe.dsp | 170 - windows_vs6/test/iopipedll/iopipedll.dsp | 170 - windows_vs6/test/istore/istore.dsp | 170 - windows_vs6/test/istoredll/istoredll.dsp | 170 - windows_vs6/test/lheap/lheap.dsp | 170 - windows_vs6/test/lheapdll/lheapdll.dsp | 170 - windows_vs6/test/libtest/libtest.dsp | 127 - windows_vs6/test/libtestD/libtestD.dsp | 116 - windows_vs6/test/links/links.dsp | 170 - windows_vs6/test/linksdll/linksdll.dsp | 170 - windows_vs6/test/mount/mount.dsp | 170 - windows_vs6/test/mountdll/mountdll.dsp | 170 - windows_vs6/test/mtime/mtime.dsp | 170 - windows_vs6/test/mtimedll/mtimedll.dsp | 170 - windows_vs6/test/ntypes/ntypes.dsp | 95 - windows_vs6/test/ntypesdll/ntypesdll.dsp | 95 - windows_vs6/test/objcopy/objcopy.dsp | 107 - windows_vs6/test/objcopydll/objcopydll.dsp | 107 - windows_vs6/test/ohdr/ohdr.dsp | 170 - windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp | 104 - windows_vs6/test/ohdrdll/ohdrdll.dsp | 170 - windows_vs6/test/overhead/overhead.dsp | 170 - windows_vs6/test/overheaddll/overheaddll.dsp | 170 - windows_vs6/test/pool/pool.dsp | 106 - windows_vs6/test/pooldll/pooldll.dsp | 107 - windows_vs6/test/ref/ref.dsp | 107 - windows_vs6/test/refdll/refdll.dsp | 106 - windows_vs6/test/reserved/reserved.dsp | 95 - windows_vs6/test/reserveddll/reserveddll.dsp | 95 - windows_vs6/test/set_extent/set_extent.dsp | 95 - windows_vs6/test/set_extentdll/set_extentdll.dsp | 95 - windows_vs6/test/stab/stab.dsp | 170 - windows_vs6/test/stabdll/stabdll.dsp | 170 - windows_vs6/test/tellub/tellub.dsp | 95 - windows_vs6/test/testhdf5/testhdf5.dsp | 530 -- windows_vs6/test/testhdf5dll/testhdf5dll.dsp | 517 -- windows_vs6/test/ttsafedll/ttsafedll.dsp | 123 - windows_vs6/test/unlink/unlink.dsp | 170 - windows_vs6/test/unlinkdll/unlinkdll.dsp | 172 - windows_vs6/test/vfd/vfd.dsp | 107 - windows_vs6/test/vfddll/vfddll.dsp | 105 - windows_vs6/tools/h5copy/h5copy.dsp | 105 - windows_vs6/tools/h5debug/h5debug.dsp | 170 - windows_vs6/tools/h5debugdll/h5debugdll.dsp | 170 - windows_vs6/tools/h5diff/h5diff.dsp | 99 - windows_vs6/tools/h5diffdll/h5diffdll.dsp | 99 - windows_vs6/tools/h5dump/h5dump.dsp | 170 - windows_vs6/tools/h5dumpdll/h5dumpdll.dsp | 170 - windows_vs6/tools/h5import/h5import.dsp | 170 - windows_vs6/tools/h5importdll/h5importdll.dsp | 170 - windows_vs6/tools/h5jam/h5jam.dsp | 95 - windows_vs6/tools/h5ls/h5ls.dsp | 172 - windows_vs6/tools/h5lsdll/h5lsdll.dsp | 170 - windows_vs6/tools/h5mkgrp/h5mkgrp.dsp | 104 - windows_vs6/tools/h5repack/h5repack.dsp | 144 - windows_vs6/tools/h5repackdll/h5repackdll.dsp | 144 - windows_vs6/tools/h5repart/h5repart.dsp | 170 - windows_vs6/tools/h5repartdll/h5repartdll.dsp | 170 - windows_vs6/tools/h5stat/h5stat.dsp | 106 - windows_vs6/tools/h5statdll/h5statdll.dsp | 105 - windows_vs6/tools/h5unjam/h5unjam.dsp | 95 - windows_vs6/tools/talign/talign.dsp | 95 - windows_vs6/tools/taligndll/taligndll.dsp | 95 - windows_vs6/tools/testfiles/binread/binread.dsp | 105 - .../tools/testfiles/h5difftst/h5difftst.dsp | 111 - .../tools/testfiles/h5dumptst/h5dumptst.dsp | 170 - .../tools/testfiles/h5importtst/h5importtst.dsp | 95 - windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp | 95 - .../tools/testfiles/h5repacktst/h5repacktst.dsp | 144 - .../h5repart_gentest/h5repart_gentest.dsp | 106 - .../tools/testfiles/h5reparttst/h5reparttst.dsp | 105 - .../testh5repack_detect_szip.dsp | 95 - .../testh5repack_detect_szipdll.dsp | 95 - windows_vs6/tools/toolslib/toolslib.dsp | 359 - windows_vs6/tools/toolslibD/toolslibD.dsp | 359 - 784 files changed, 81797 insertions(+), 57651 deletions(-) delete mode 100755 release_docs/INSTALL_Windows_Short_MSVS6.0.TXT create mode 100644 src/H5FDpkg.h create mode 100644 src/H5FDspace.c delete mode 100644 test/family_v1.6_00000.h5 delete mode 100644 test/family_v1.6_00001.h5 delete mode 100644 test/family_v1.6_00002.h5 delete mode 100644 test/family_v1.6_00003.h5 create mode 100644 test/family_v16_00000.h5 create mode 100644 test/family_v16_00001.h5 create mode 100644 test/family_v16_00002.h5 create mode 100644 test/family_v16_00003.h5 create mode 100644 test/gen_bad_ohdr.c create mode 100644 test/tbad_msg_count.h5 create mode 100644 test/tcoords.c delete mode 100644 tools/h5repack/h5repack_list.c create mode 100644 tools/testfiles/tgroup-2.ls create mode 100644 vms/build.com create mode 100644 vms/install.com delete mode 100644 vms/tools/h5diff/check.com delete mode 100644 vms/tools/h5dump/check.com create mode 100644 vms/tools/testfiles/tattr-3.ddl create mode 100644 vms/tools/testfiles/tdset-2.ddl create mode 100644 vms/tools/testfiles/tgroup-2.ddl create mode 100644 vms/tools/testfiles/tperror.ddl create mode 100755 windows_vnet/COPYING create mode 100644 windows_vnet/c++/examples/allcppexamples/allcppexamples.sln create mode 100644 windows_vnet/c++/examples/allcppexamples/allcppexamples.vcproj create mode 100644 windows_vnet/c++/examples/chunkstest/chunkstest.vcproj create mode 100644 windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj create mode 100644 windows_vnet/c++/examples/compoundtest/compoundtest.vcproj create mode 100644 windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj create mode 100644 windows_vnet/c++/examples/createtest/createtest.vcproj create mode 100644 windows_vnet/c++/examples/createtestdll/createtestdll.vcproj create mode 100644 windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj create mode 100644 windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj create mode 100644 windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj create mode 100644 windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj create mode 100644 windows_vnet/c++/examples/readdatatest/readdatatest.vcproj create mode 100644 windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj create mode 100644 windows_vnet/c++/examples/writedatatest/writedatatest.vcproj create mode 100644 windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj create mode 100644 windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj create mode 100644 windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj create mode 100644 windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj create mode 100644 windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj create mode 100644 windows_vnet/examples/allexamples/allexamples.sln create mode 100644 windows_vnet/examples/allexamples/allexamples.vcproj create mode 100644 windows_vnet/examples/attributetest/attributetest.vcproj create mode 100644 windows_vnet/examples/attributetestdll/attributetestdll.vcproj create mode 100644 windows_vnet/examples/chunkread/chunkread.vcproj create mode 100644 windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj create mode 100644 windows_vnet/examples/compoundtest/compoundtest.vcproj create mode 100644 windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj create mode 100644 windows_vnet/examples/extendwritetest/extendwritetest.vcproj create mode 100644 windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj create mode 100644 windows_vnet/examples/grouptest/grouptest.vcproj create mode 100644 windows_vnet/examples/grouptestdll/grouptestdll.vcproj create mode 100644 windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj create mode 100644 windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj create mode 100644 windows_vnet/examples/readtest/readtest.vcproj create mode 100644 windows_vnet/examples/readtestdll/readtestdll.vcproj create mode 100644 windows_vnet/examples/selectest/selectest.vcproj create mode 100644 windows_vnet/examples/selectestdll/selectestdll.vcproj create mode 100644 windows_vnet/examples/writetest/writetest.vcproj create mode 100644 windows_vnet/examples/writetestdll/writetestdll.vcproj create mode 100644 windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj create mode 100644 windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj create mode 100644 windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln create mode 100644 windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj create mode 100644 windows_vnet/hl/examples/ex_ds/ex_ds.vcproj create mode 100644 windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj create mode 100644 windows_vnet/hl/examples/ex_images/ex_images.vcproj create mode 100644 windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj create mode 100644 windows_vnet/hl/examples/ex_lite/ex_lite.vcproj create mode 100644 windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj create mode 100644 windows_vnet/hl/examples/ex_packet/ex_packet.vcproj create mode 100644 windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj create mode 100644 windows_vnet/hl/examples/ex_table/ex_table.vcproj create mode 100644 windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj create mode 100644 windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj create mode 100644 windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj create mode 100644 windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj create mode 100644 windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj create mode 100644 windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj create mode 100644 windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj create mode 100644 windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj create mode 100644 windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj create mode 100644 windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj create mode 100644 windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj create mode 100644 windows_vnet/hl/tools/gifconv/gif2h5.vcproj create mode 100644 windows_vnet/hl/tools/gifconv/h52gif.vcproj create mode 100644 windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj create mode 100644 windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj create mode 100644 windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj create mode 100644 windows_vnet/proj/all/all.sln create mode 100644 windows_vnet/proj/all/all.vcproj create mode 100644 windows_vnet/proj/hdf5/hdf5.vcproj create mode 100644 windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj create mode 100644 windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj create mode 100644 windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj create mode 100644 windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj create mode 100644 windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj create mode 100644 windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj create mode 100644 windows_vnet/proj/hdf5dll/hdf5dll.vcproj create mode 100644 windows_vnet/test/big/big.vcproj create mode 100644 windows_vnet/test/bigdll/bigdll.vcproj create mode 100644 windows_vnet/test/bittests/bittests.vcproj create mode 100644 windows_vnet/test/bittestsdll/bittestsdll.vcproj create mode 100644 windows_vnet/test/btree2/btree2.vcproj create mode 100644 windows_vnet/test/btree2dll/btree2dll.vcproj create mode 100644 windows_vnet/test/cache/cache.vcproj create mode 100644 windows_vnet/test/cache_api/cache_api.vcproj create mode 100644 windows_vnet/test/cache_apidll/cache_apidll.vcproj create mode 100644 windows_vnet/test/cachedll/cachedll.vcproj create mode 100644 windows_vnet/test/chunk/chunk.vcproj create mode 100644 windows_vnet/test/chunkdll/chunkdll.vcproj create mode 100644 windows_vnet/test/cmpd_dset/cmpd_dset.vcproj create mode 100644 windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj create mode 100644 windows_vnet/test/cross_read/cross_read.vcproj create mode 100644 windows_vnet/test/cross_readdll/cross_readdll.vcproj create mode 100644 windows_vnet/test/dangle/dangle.vcproj create mode 100644 windows_vnet/test/dangledll/dangledll.vcproj create mode 100644 windows_vnet/test/dsets/dsets.vcproj create mode 100644 windows_vnet/test/dsetsdll/dsetsdll.vcproj create mode 100644 windows_vnet/test/dt_arith/dt_arith.vcproj create mode 100644 windows_vnet/test/dt_arithdll/dt_arithdll.vcproj create mode 100644 windows_vnet/test/dtransform/dtransform.vcproj create mode 100644 windows_vnet/test/dtransformdll/dtransformdll.vcproj create mode 100644 windows_vnet/test/dtypes/dtypes.vcproj create mode 100644 windows_vnet/test/dtypesdll/dtypesdll.vcproj create mode 100644 windows_vnet/test/enum/enum.vcproj create mode 100644 windows_vnet/test/enumdll/enumdll.vcproj create mode 100644 windows_vnet/test/err_compat/err_compat.vcproj create mode 100644 windows_vnet/test/err_compatdll/err_compatdll.vcproj create mode 100644 windows_vnet/test/error_test/error_test.vcproj create mode 100644 windows_vnet/test/error_testdll/error_testdll.vcproj create mode 100644 windows_vnet/test/extend/extend.vcproj create mode 100644 windows_vnet/test/extenddll/extenddll.vcproj create mode 100644 windows_vnet/test/external/external.vcproj create mode 100644 windows_vnet/test/externaldll/externaldll.vcproj create mode 100644 windows_vnet/test/fheap/fheap.vcproj create mode 100644 windows_vnet/test/fheapdll/fheapdll.vcproj create mode 100644 windows_vnet/test/fillval/fillval.vcproj create mode 100644 windows_vnet/test/fillvaldll/fillvaldll.vcproj create mode 100644 windows_vnet/test/flush1/flush1.vcproj create mode 100644 windows_vnet/test/flush1dll/flush1dll.vcproj create mode 100644 windows_vnet/test/flush2/flush2.vcproj create mode 100644 windows_vnet/test/flush2dll/flush2dll.vcproj create mode 100644 windows_vnet/test/getname/getname.vcproj create mode 100644 windows_vnet/test/getnamedll/getnamedll.vcproj create mode 100644 windows_vnet/test/getub/getub.vcproj create mode 100644 windows_vnet/test/gheap/gheap.vcproj create mode 100644 windows_vnet/test/gheapdll/gheapdll.vcproj create mode 100644 windows_vnet/test/hyperslab/hyperslab.vcproj create mode 100644 windows_vnet/test/hyperslabdll/hyperslabdll.vcproj create mode 100644 windows_vnet/test/iopipe/iopipe.vcproj create mode 100644 windows_vnet/test/iopipedll/iopipedll.vcproj create mode 100644 windows_vnet/test/istore/istore.vcproj create mode 100644 windows_vnet/test/istoredll/istoredll.vcproj create mode 100644 windows_vnet/test/lheap/lheap.vcproj create mode 100644 windows_vnet/test/lheapdll/lheapdll.vcproj create mode 100644 windows_vnet/test/libtest/libtest.vcproj create mode 100644 windows_vnet/test/libtestD/libtestD.vcproj create mode 100644 windows_vnet/test/links/links.vcproj create mode 100644 windows_vnet/test/linksdll/linksdll.vcproj create mode 100644 windows_vnet/test/mount/mount.vcproj create mode 100644 windows_vnet/test/mountdll/mountdll.vcproj create mode 100644 windows_vnet/test/mtime/mtime.vcproj create mode 100644 windows_vnet/test/mtimedll/mtimedll.vcproj create mode 100644 windows_vnet/test/ntypes/ntypes.vcproj create mode 100644 windows_vnet/test/ntypesdll/ntypesdll.vcproj create mode 100644 windows_vnet/test/objcopy/objcopy.vcproj create mode 100644 windows_vnet/test/objcopydll/objcopydll.vcproj create mode 100644 windows_vnet/test/ohdr/ohdr.vcproj create mode 100644 windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj create mode 100644 windows_vnet/test/ohdrdll/ohdrdll.vcproj create mode 100644 windows_vnet/test/overhead/overhead.vcproj create mode 100644 windows_vnet/test/overheaddll/overheaddll.vcproj create mode 100644 windows_vnet/test/pool/pool.vcproj create mode 100644 windows_vnet/test/pooldll/pooldll.vcproj create mode 100644 windows_vnet/test/reserved/reserved.vcproj create mode 100644 windows_vnet/test/reserveddll/reserveddll.vcproj create mode 100644 windows_vnet/test/set_extent/set_extent.vcproj create mode 100644 windows_vnet/test/set_extentdll/set_extentdll.vcproj create mode 100644 windows_vnet/test/stab/stab.vcproj create mode 100644 windows_vnet/test/stabdll/stabdll.vcproj create mode 100644 windows_vnet/test/tellub/tellub.vcproj create mode 100644 windows_vnet/test/testhdf5/testhdf5.vcproj create mode 100644 windows_vnet/test/testhdf5dll/testhdf5dll.vcproj create mode 100644 windows_vnet/test/ttsafedll/ttsafedll.vcproj create mode 100644 windows_vnet/test/unlink/unlink.vcproj create mode 100644 windows_vnet/test/unlinkdll/unlinkdll.vcproj create mode 100644 windows_vnet/test/vfd/vfd.vcproj create mode 100644 windows_vnet/test/vfddll/vfddll.vcproj create mode 100644 windows_vnet/tools/h5copy/h5copy.vcproj create mode 100644 windows_vnet/tools/h5debug/h5debug.vcproj create mode 100644 windows_vnet/tools/h5debugdll/h5debugdll.vcproj create mode 100644 windows_vnet/tools/h5diff/h5diff.vcproj create mode 100644 windows_vnet/tools/h5diffdll/h5diffdll.vcproj create mode 100644 windows_vnet/tools/h5dump/h5dump.vcproj create mode 100644 windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj create mode 100644 windows_vnet/tools/h5import/h5import.vcproj create mode 100644 windows_vnet/tools/h5importdll/h5importdll.vcproj create mode 100644 windows_vnet/tools/h5jam/h5jam.vcproj create mode 100644 windows_vnet/tools/h5ls/h5ls.vcproj create mode 100644 windows_vnet/tools/h5lsdll/h5lsdll.vcproj create mode 100644 windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj create mode 100644 windows_vnet/tools/h5repack/h5repack.vcproj create mode 100644 windows_vnet/tools/h5repackdll/h5repackdll.vcproj create mode 100644 windows_vnet/tools/h5repart/h5repart.vcproj create mode 100644 windows_vnet/tools/h5repartdll/h5repartdll.vcproj create mode 100644 windows_vnet/tools/h5stat/h5stat.vcproj create mode 100644 windows_vnet/tools/h5statdll/h5statdll.vcproj create mode 100644 windows_vnet/tools/h5unjam/h5unjam.vcproj create mode 100644 windows_vnet/tools/talign/talign.vcproj create mode 100644 windows_vnet/tools/taligndll/taligndll.vcproj create mode 100644 windows_vnet/tools/testfiles/binread/binread.vcproj create mode 100644 windows_vnet/tools/testfiles/h5difftst/h5difftst.vcproj create mode 100644 windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj create mode 100644 windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj create mode 100644 windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj create mode 100644 windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj create mode 100644 windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj create mode 100644 windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj create mode 100644 windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj create mode 100644 windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj create mode 100644 windows_vnet/tools/toolslib/toolslib.vcproj create mode 100644 windows_vnet/tools/toolslibD/toolslibD.vcproj delete mode 100755 windows_vs6/COPYING delete mode 100755 windows_vs6/c++/examples/allcppexamples/allcppexamples.dsp delete mode 100755 windows_vs6/c++/examples/allcppexamples/allcppexamples.dsw delete mode 100755 windows_vs6/c++/examples/chunkstest/chunkstest.dsp delete mode 100755 windows_vs6/c++/examples/chunkstestdll/chunkstestdll.dsp delete mode 100755 windows_vs6/c++/examples/compoundtest/compoundtest.dsp delete mode 100755 windows_vs6/c++/examples/compoundtestdll/compoundtestdll.dsp delete mode 100755 windows_vs6/c++/examples/createtest/createtest.dsp delete mode 100755 windows_vs6/c++/examples/createtestdll/createtestdll.dsp delete mode 100755 windows_vs6/c++/examples/extend_dstest/extend_dstest.dsp delete mode 100755 windows_vs6/c++/examples/extend_dstestdll/extend_dstestdll.dsp delete mode 100755 windows_vs6/c++/examples/h5grouptest/h5grouptest.dsp delete mode 100755 windows_vs6/c++/examples/h5grouptestdll/h5grouptestdll.dsp delete mode 100755 windows_vs6/c++/examples/readdatatest/readdatatest.dsp delete mode 100755 windows_vs6/c++/examples/readdatatestdll/readdatatestdll.dsp delete mode 100755 windows_vs6/c++/examples/writedatatest/writedatatest.dsp delete mode 100755 windows_vs6/c++/examples/writedatatestdll/writedatatestdll.dsp delete mode 100755 windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp delete mode 100755 windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp delete mode 100755 windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp delete mode 100755 windows_vs6/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp delete mode 100755 windows_vs6/examples/allexamples/allexamples.dsp delete mode 100755 windows_vs6/examples/allexamples/allexamples.dsw delete mode 100755 windows_vs6/examples/attributetest/attributetest.dsp delete mode 100755 windows_vs6/examples/attributetestdll/attributetestdll.dsp delete mode 100755 windows_vs6/examples/chunkread/chunkread.dsp delete mode 100755 windows_vs6/examples/chunkreaddll/chunkreaddll.dsp delete mode 100755 windows_vs6/examples/compoundtest/compoundtest.dsp delete mode 100755 windows_vs6/examples/compoundtestdll/compoundtestdll.dsp delete mode 100755 windows_vs6/examples/extendwritetest/extendwritetest.dsp delete mode 100755 windows_vs6/examples/extendwritetestdll/extendwritetestdll.dsp delete mode 100755 windows_vs6/examples/grouptest/grouptest.dsp delete mode 100755 windows_vs6/examples/grouptestdll/grouptestdll.dsp delete mode 100644 windows_vs6/examples/intermgrouptest/intermgrouptest.dsp delete mode 100644 windows_vs6/examples/intermgrouptestdll/intermgrouptestdll.dsp delete mode 100755 windows_vs6/examples/readtest/readtest.dsp delete mode 100755 windows_vs6/examples/readtestdll/readtestdll.dsp delete mode 100755 windows_vs6/examples/selectest/selectest.dsp delete mode 100755 windows_vs6/examples/selectestdll/selectestdll.dsp delete mode 100755 windows_vs6/examples/writetest/writetest.dsp delete mode 100755 windows_vs6/examples/writetestdll/writetestdll.dsp delete mode 100755 windows_vs6/fortran/examples/allf90examples/allf90examples.dsp delete mode 100755 windows_vs6/fortran/examples/allf90examples/allf90examples.dsw delete mode 100755 windows_vs6/fortran/examples/attreexampletest/attreexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/attreexampletestdll/attreexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/compoundtest/compoundtest.dsp delete mode 100755 windows_vs6/fortran/examples/compoundtestdll/compoundtestdll.dsp delete mode 100755 windows_vs6/fortran/examples/dsetexampletest/dsetexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/dsetexampletestdll/dsetexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/fileexampletest/fileexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/fileexampletestdll/fileexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/groupexampletest/groupexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/groupexampletestdll/groupexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/grpdsetexampletest/grpdsetexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/grpittest/grpittest.dsp delete mode 100755 windows_vs6/fortran/examples/grpittestdll/grpittestdll.dsp delete mode 100755 windows_vs6/fortran/examples/grpsexampletest/grpsexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/grpsexampletestdll/grpsexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/hyperslabtest/hyperslabtest.dsp delete mode 100755 windows_vs6/fortran/examples/hyperslabtestdll/hyperslabtestdll.dsp delete mode 100755 windows_vs6/fortran/examples/mountexampletest/mountexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/mountexampletestdll/mountexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/refobjexampletest/refobjexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/refobjexampletestdll/refobjexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/refregexampletest/refregexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/refregexampletestdll/refregexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/rwdsetexampletest/rwdsetexampletest.dsp delete mode 100755 windows_vs6/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.dsp delete mode 100755 windows_vs6/fortran/examples/selecteletest/selecteletest.dsp delete mode 100755 windows_vs6/fortran/examples/selecteletestdll/selecteletestdll.dsp delete mode 100755 windows_vs6/fortran/test/flush1_fortran/flush1_fortran.dsp delete mode 100755 windows_vs6/fortran/test/flush1_fortrandll/flush1_fortrandll.dsp delete mode 100755 windows_vs6/fortran/test/flush2_fortran/flush2_fortran.dsp delete mode 100755 windows_vs6/fortran/test/flush2_fortrandll/flush2_fortrandll.dsp delete mode 100755 windows_vs6/fortran/test/libtest_cstubdll/libtest_cstubdll.dsp delete mode 100755 windows_vs6/fortran/test/libtest_fortran/libtest_fortran.dsp delete mode 100755 windows_vs6/fortran/test/libtest_fortrandll/libtest_fortrandll.dsp delete mode 100755 windows_vs6/fortran/test/testhdf5_fortran/testhdf5_fortran.dsp delete mode 100755 windows_vs6/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.dsp delete mode 100755 windows_vs6/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.dsp delete mode 100755 windows_vs6/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.dsp delete mode 100644 windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsp delete mode 100644 windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsw delete mode 100755 windows_vs6/hl/examples/ex_ds/ex_ds.dsp delete mode 100755 windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp delete mode 100755 windows_vs6/hl/examples/ex_images/ex_images.dsp delete mode 100755 windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp delete mode 100755 windows_vs6/hl/examples/ex_lite/ex_lite.dsp delete mode 100755 windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp delete mode 100755 windows_vs6/hl/examples/ex_packet/ex_packet.dsp delete mode 100755 windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp delete mode 100755 windows_vs6/hl/examples/ex_table/ex_table.dsp delete mode 100755 windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp delete mode 100644 windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsp delete mode 100644 windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsw delete mode 100644 windows_vs6/hl/fortran/examples/ex_lite/ex_lite.dsp delete mode 100644 windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.dsp delete mode 100755 windows_vs6/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.dsp delete mode 100755 windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp delete mode 100755 windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp delete mode 100755 windows_vs6/hl/test/hl_test_image/hl_test_image.dsp delete mode 100755 windows_vs6/hl/test/hl_test_imagedll/hl_test_imagedll.dsp delete mode 100755 windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp delete mode 100755 windows_vs6/hl/test/hl_test_litedll/hl_test_litedll.dsp delete mode 100755 windows_vs6/hl/test/hl_test_packet/hl_test_packet.dsp delete mode 100755 windows_vs6/hl/test/hl_test_packetdll/hl_test_packetdll.dsp delete mode 100755 windows_vs6/hl/test/hl_test_table/hl_test_table.dsp delete mode 100755 windows_vs6/hl/test/hl_test_tabledll/hl_test_tabledll.dsp delete mode 100755 windows_vs6/hl/tools/gifconv/gif2h5.dsp delete mode 100755 windows_vs6/hl/tools/gifconv/h52gif.dsp delete mode 100755 windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp delete mode 100755 windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp delete mode 100755 windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsp delete mode 100755 windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsw delete mode 100755 windows_vs6/misc/fortrantypegen/H5fortran_detect.dsp delete mode 100755 windows_vs6/misc/fortrantypegen/fortrantypegen.dsw delete mode 100755 windows_vs6/misc/matchtypegen/H5match_types.dsp delete mode 100755 windows_vs6/misc/matchtypegen/matchtypegen.dsw delete mode 100755 windows_vs6/misc/typegen/h5tinit/h5tinit.dsp delete mode 100755 windows_vs6/proj/all/all.dsp delete mode 100755 windows_vs6/proj/all/all.dsw delete mode 100755 windows_vs6/proj/hdf5/hdf5.dsp delete mode 100755 windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp delete mode 100755 windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp delete mode 100755 windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp delete mode 100755 windows_vs6/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp delete mode 100755 windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp delete mode 100755 windows_vs6/proj/hdf5_fortrandll/hdf5_fortrandll.dsp delete mode 100755 windows_vs6/proj/hdf5_hl/hdf5_hl.dsp delete mode 100755 windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp delete mode 100755 windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp delete mode 100755 windows_vs6/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp delete mode 100755 windows_vs6/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp delete mode 100755 windows_vs6/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp delete mode 100755 windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp delete mode 100755 windows_vs6/proj/hdf5dll/hdf5dll.dsp delete mode 100755 windows_vs6/test/big/big.dsp delete mode 100755 windows_vs6/test/bigdll/bigdll.dsp delete mode 100755 windows_vs6/test/bittests/bittests.dsp delete mode 100755 windows_vs6/test/bittestsdll/bittestsdll.dsp delete mode 100755 windows_vs6/test/btree2/btree2.dsp delete mode 100755 windows_vs6/test/btree2dll/btree2dll.dsp delete mode 100755 windows_vs6/test/cache/cache.dsp delete mode 100755 windows_vs6/test/cache_api/cache_api.dsp delete mode 100755 windows_vs6/test/cache_apidll/cache_apidll.dsp delete mode 100755 windows_vs6/test/cachedll/cachedll.dsp delete mode 100755 windows_vs6/test/chunk/chunk.dsp delete mode 100755 windows_vs6/test/chunkdll/chunkdll.dsp delete mode 100755 windows_vs6/test/cmpd_dset/cmpd_dset.dsp delete mode 100755 windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp delete mode 100755 windows_vs6/test/cross_read/cross_read.dsp delete mode 100755 windows_vs6/test/cross_readdll/cross_readdll.dsp delete mode 100755 windows_vs6/test/dangle/dangle.dsp delete mode 100755 windows_vs6/test/dangledll/dangledll.dsp delete mode 100755 windows_vs6/test/dsets/dsets.dsp delete mode 100755 windows_vs6/test/dsetsdll/dsetsdll.dsp delete mode 100755 windows_vs6/test/dt_arith/dt_arith.dsp delete mode 100755 windows_vs6/test/dt_arithdll/dt_arithdll.dsp delete mode 100755 windows_vs6/test/dtransform/dtransform.dsp delete mode 100755 windows_vs6/test/dtransformdll/dtransformdll.dsp delete mode 100755 windows_vs6/test/dtypes/dtypes.dsp delete mode 100755 windows_vs6/test/dtypesdll/dtypesdll.dsp delete mode 100755 windows_vs6/test/enum/enum.dsp delete mode 100755 windows_vs6/test/enumdll/enumdll.dsp delete mode 100644 windows_vs6/test/err_compat/err_compat.dsp delete mode 100644 windows_vs6/test/err_compatdll/err_compatdll.dsp delete mode 100644 windows_vs6/test/error_test/error_test.dsp delete mode 100644 windows_vs6/test/error_testdll/error_testdll.dsp delete mode 100755 windows_vs6/test/extend/extend.dsp delete mode 100755 windows_vs6/test/extenddll/extenddll.dsp delete mode 100755 windows_vs6/test/external/external.dsp delete mode 100755 windows_vs6/test/externaldll/externaldll.dsp delete mode 100755 windows_vs6/test/fheap/fheap.dsp delete mode 100755 windows_vs6/test/fheapdll/fheapdll.dsp delete mode 100755 windows_vs6/test/fillval/fillval.dsp delete mode 100755 windows_vs6/test/fillvaldll/fillvaldll.dsp delete mode 100755 windows_vs6/test/flush1/flush1.dsp delete mode 100755 windows_vs6/test/flush1dll/flush1dll.dsp delete mode 100755 windows_vs6/test/flush2/flush2.dsp delete mode 100755 windows_vs6/test/flush2dll/flush2dll.dsp delete mode 100755 windows_vs6/test/getname/getname.dsp delete mode 100755 windows_vs6/test/getnamedll/getnamedll.dsp delete mode 100755 windows_vs6/test/getub/getub.dsp delete mode 100755 windows_vs6/test/gheap/gheap.dsp delete mode 100755 windows_vs6/test/gheapdll/gheapdll.dsp delete mode 100755 windows_vs6/test/hyperslab/hyperslab.dsp delete mode 100755 windows_vs6/test/hyperslabdll/hyperslabdll.dsp delete mode 100755 windows_vs6/test/iopipe/iopipe.dsp delete mode 100755 windows_vs6/test/iopipedll/iopipedll.dsp delete mode 100755 windows_vs6/test/istore/istore.dsp delete mode 100755 windows_vs6/test/istoredll/istoredll.dsp delete mode 100755 windows_vs6/test/lheap/lheap.dsp delete mode 100755 windows_vs6/test/lheapdll/lheapdll.dsp delete mode 100755 windows_vs6/test/libtest/libtest.dsp delete mode 100755 windows_vs6/test/libtestD/libtestD.dsp delete mode 100755 windows_vs6/test/links/links.dsp delete mode 100755 windows_vs6/test/linksdll/linksdll.dsp delete mode 100755 windows_vs6/test/mount/mount.dsp delete mode 100755 windows_vs6/test/mountdll/mountdll.dsp delete mode 100755 windows_vs6/test/mtime/mtime.dsp delete mode 100755 windows_vs6/test/mtimedll/mtimedll.dsp delete mode 100755 windows_vs6/test/ntypes/ntypes.dsp delete mode 100755 windows_vs6/test/ntypesdll/ntypesdll.dsp delete mode 100755 windows_vs6/test/objcopy/objcopy.dsp delete mode 100755 windows_vs6/test/objcopydll/objcopydll.dsp delete mode 100755 windows_vs6/test/ohdr/ohdr.dsp delete mode 100644 windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp delete mode 100755 windows_vs6/test/ohdrdll/ohdrdll.dsp delete mode 100755 windows_vs6/test/overhead/overhead.dsp delete mode 100755 windows_vs6/test/overheaddll/overheaddll.dsp delete mode 100755 windows_vs6/test/pool/pool.dsp delete mode 100755 windows_vs6/test/pooldll/pooldll.dsp delete mode 100644 windows_vs6/test/ref/ref.dsp delete mode 100644 windows_vs6/test/refdll/refdll.dsp delete mode 100755 windows_vs6/test/reserved/reserved.dsp delete mode 100755 windows_vs6/test/reserveddll/reserveddll.dsp delete mode 100755 windows_vs6/test/set_extent/set_extent.dsp delete mode 100755 windows_vs6/test/set_extentdll/set_extentdll.dsp delete mode 100755 windows_vs6/test/stab/stab.dsp delete mode 100755 windows_vs6/test/stabdll/stabdll.dsp delete mode 100755 windows_vs6/test/tellub/tellub.dsp delete mode 100755 windows_vs6/test/testhdf5/testhdf5.dsp delete mode 100755 windows_vs6/test/testhdf5dll/testhdf5dll.dsp delete mode 100644 windows_vs6/test/ttsafedll/ttsafedll.dsp delete mode 100755 windows_vs6/test/unlink/unlink.dsp delete mode 100755 windows_vs6/test/unlinkdll/unlinkdll.dsp delete mode 100644 windows_vs6/test/vfd/vfd.dsp delete mode 100644 windows_vs6/test/vfddll/vfddll.dsp delete mode 100644 windows_vs6/tools/h5copy/h5copy.dsp delete mode 100755 windows_vs6/tools/h5debug/h5debug.dsp delete mode 100755 windows_vs6/tools/h5debugdll/h5debugdll.dsp delete mode 100755 windows_vs6/tools/h5diff/h5diff.dsp delete mode 100755 windows_vs6/tools/h5diffdll/h5diffdll.dsp delete mode 100755 windows_vs6/tools/h5dump/h5dump.dsp delete mode 100755 windows_vs6/tools/h5dumpdll/h5dumpdll.dsp delete mode 100755 windows_vs6/tools/h5import/h5import.dsp delete mode 100755 windows_vs6/tools/h5importdll/h5importdll.dsp delete mode 100755 windows_vs6/tools/h5jam/h5jam.dsp delete mode 100755 windows_vs6/tools/h5ls/h5ls.dsp delete mode 100755 windows_vs6/tools/h5lsdll/h5lsdll.dsp delete mode 100644 windows_vs6/tools/h5mkgrp/h5mkgrp.dsp delete mode 100755 windows_vs6/tools/h5repack/h5repack.dsp delete mode 100755 windows_vs6/tools/h5repackdll/h5repackdll.dsp delete mode 100755 windows_vs6/tools/h5repart/h5repart.dsp delete mode 100755 windows_vs6/tools/h5repartdll/h5repartdll.dsp delete mode 100755 windows_vs6/tools/h5stat/h5stat.dsp delete mode 100755 windows_vs6/tools/h5statdll/h5statdll.dsp delete mode 100755 windows_vs6/tools/h5unjam/h5unjam.dsp delete mode 100755 windows_vs6/tools/talign/talign.dsp delete mode 100755 windows_vs6/tools/taligndll/taligndll.dsp delete mode 100644 windows_vs6/tools/testfiles/binread/binread.dsp delete mode 100755 windows_vs6/tools/testfiles/h5difftst/h5difftst.dsp delete mode 100755 windows_vs6/tools/testfiles/h5dumptst/h5dumptst.dsp delete mode 100755 windows_vs6/tools/testfiles/h5importtst/h5importtst.dsp delete mode 100755 windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp delete mode 100755 windows_vs6/tools/testfiles/h5repacktst/h5repacktst.dsp delete mode 100755 windows_vs6/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp delete mode 100755 windows_vs6/tools/testfiles/h5reparttst/h5reparttst.dsp delete mode 100755 windows_vs6/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp delete mode 100755 windows_vs6/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp delete mode 100755 windows_vs6/tools/toolslib/toolslib.dsp delete mode 100755 windows_vs6/tools/toolslibD/toolslibD.dsp diff --git a/COPYING b/COPYING index eb2cfdb..1bc39c1 100644 --- a/COPYING +++ b/COPYING @@ -4,7 +4,7 @@ HDF5 (Hierarchical Data Format 5) Software Library and Utilities ----------------------------------------------------------------------------- HDF5 (Hierarchical Data Format 5) Software Library and Utilities -Copyright 2006 by The HDF Group (THG). +Copyright 2006-2008 by The HDF Group (THG). NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities Copyright 1998-2006 by the Board of Trustees of the University of Illinois. diff --git a/MANIFEST b/MANIFEST index 79be081..ce691b2 100644 --- a/MANIFEST +++ b/MANIFEST @@ -391,7 +391,6 @@ ./release_docs/INSTALL_VMS.txt ./release_docs/INSTALL_Windows.txt ./release_docs/INSTALL_Windows_From_Command_Line.txt -./release_docs/INSTALL_Windows_Short_MSVS6.0.TXT ./release_docs/INSTALL_Windows_Short_NET.TXT ./release_docs/INSTALL_Windows_Short_VS2005.TXT ./release_docs/INSTALL_parallel @@ -512,10 +511,12 @@ ./src/H5FDmpiposix.h ./src/H5FDmulti.c ./src/H5FDmulti.h +./src/H5FDpkg.h ./src/H5FDprivate.h ./src/H5FDpublic.h ./src/H5FDsec2.c ./src/H5FDsec2.h +./src/H5FDspace.c ./src/H5FDstdio.c ./src/H5FDstdio.h ./src/H5FDwindows.c @@ -764,15 +765,16 @@ ./test/external.c ./test/error_test.c ./test/err_compat.c -./test/family_v1.6_00000.h5 -./test/family_v1.6_00001.h5 -./test/family_v1.6_00002.h5 -./test/family_v1.6_00003.h5 +./test/family_v16_00000.h5 +./test/family_v16_00001.h5 +./test/family_v16_00002.h5 +./test/family_v16_00003.h5 ./test/fheap.c ./test/fill_old.h5 ./test/fillval.c ./test/flush1.c ./test/flush2.c +./test/gen_bad_ohdr.c _DO_NOT_DISTRIBUTE_ ./test/gen_bogus.c _DO_NOT_DISTRIBUTE_ ./test/gen_cross.c _DO_NOT_DISTRIBUTE_ ./test/gen_deflate.c _DO_NOT_DISTRIBUTE_ @@ -816,9 +818,11 @@ ./test/tarray.c ./test/tarrold.h5 ./test/tattr.c +./test/tbad_msg_count.h5 ./test/tbogus.h5 ./test/tchecksum.c ./test/tconfig.c +./test/tcoords.c ./test/testerror.sh.in ./test/testframe.c ./test/testhdf5.c @@ -974,7 +978,6 @@ ./tools/h5repack/h5repack_copy.c ./tools/h5repack/h5repack_refs.c ./tools/h5repack/h5repack_filters.c -./tools/h5repack/h5repack_list.c ./tools/h5repack/h5repack_main.c ./tools/h5repack/h5repack_opttable.c ./tools/h5repack/h5repack_parse.c @@ -1265,6 +1268,7 @@ ./tools/testfiles/tcomp-1.ls ./tools/testfiles/tdset-1.ls ./tools/testfiles/tgroup-1.ls +./tools/testfiles/tgroup-2.ls ./tools/testfiles/tgroup.ls ./tools/testfiles/thlink-1.ls ./tools/testfiles/tloop-1.ls @@ -1650,16 +1654,16 @@ ./vms/test/check.com ./vms/test/make.com +./vms/build.com +./vms/install.com ./vms/make.com ./vms/tools/h5copy/make.com ./vms/tools/h5copy/check_h5copy.com ./vms/tools/h5dump/make.com -./vms/tools/h5dump/check.com ./vms/tools/h5dump/check_h5dump.com ./vms/tools/h5ls/check.com ./vms/tools/h5ls/check_h5ls.com ./vms/tools/h5ls/make.com -./vms/tools/h5diff/check.com ./vms/tools/h5diff/check_h5diff.com ./vms/tools/h5diff/make.com ./vms/tools/h5import/check_h5import.com @@ -1669,6 +1673,10 @@ ./vms/tools/h5repack/check_h5repack.com ./vms/tools/h5repack/make.com ./vms/tools/lib/make.com +./vms/tools/testfiles/tattr-3.ddl +./vms/tools/testfiles/tdset-2.ddl +./vms/tools/testfiles/tgroup-2.ddl +./vms/tools/testfiles/tperror.ddl # Windows-specific Files. # Batch scripts @@ -2018,272 +2026,208 @@ ./windows/tools/toolslibdll/toolslibdll.vcproj -# Visual Studio 6.0 Project Files -./windows_vs6/COPYING -./windows_vs6/c++/examples/allcppexamples/allcppexamples.dsp -./windows_vs6/c++/examples/allcppexamples/allcppexamples.dsw -./windows_vs6/c++/examples/chunkstest/chunkstest.dsp -./windows_vs6/c++/examples/chunkstestdll/chunkstestdll.dsp -./windows_vs6/c++/examples/compoundtest/compoundtest.dsp -./windows_vs6/c++/examples/compoundtestdll/compoundtestdll.dsp -./windows_vs6/c++/examples/createtest/createtest.dsp -./windows_vs6/c++/examples/createtestdll/createtestdll.dsp -./windows_vs6/c++/examples/extend_dstest/extend_dstest.dsp -./windows_vs6/c++/examples/extend_dstestdll/extend_dstestdll.dsp -./windows_vs6/c++/examples/h5grouptest/h5grouptest.dsp -./windows_vs6/c++/examples/h5grouptestdll/h5grouptestdll.dsp -./windows_vs6/c++/examples/readdatatest/readdatatest.dsp -./windows_vs6/c++/examples/readdatatestdll/readdatatestdll.dsp -./windows_vs6/c++/examples/writedatatest/writedatatest.dsp -./windows_vs6/c++/examples/writedatatestdll/writedatatestdll.dsp -./windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp -./windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp -./windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp -./windows_vs6/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp -./windows_vs6/examples/allexamples/allexamples.dsp -./windows_vs6/examples/allexamples/allexamples.dsw -./windows_vs6/examples/attributetest/attributetest.dsp -./windows_vs6/examples/attributetestdll/attributetestdll.dsp -./windows_vs6/examples/chunkread/chunkread.dsp -./windows_vs6/examples/chunkreaddll/chunkreaddll.dsp -./windows_vs6/examples/compoundtest/compoundtest.dsp -./windows_vs6/examples/compoundtestdll/compoundtestdll.dsp -./windows_vs6/examples/extendwritetest/extendwritetest.dsp -./windows_vs6/examples/extendwritetestdll/extendwritetestdll.dsp -./windows_vs6/examples/grouptest/grouptest.dsp -./windows_vs6/examples/grouptestdll/grouptestdll.dsp -./windows_vs6/examples/intermgrouptest/intermgrouptest.dsp -./windows_vs6/examples/intermgrouptestdll/intermgrouptestdll.dsp -./windows_vs6/examples/readtest/readtest.dsp -./windows_vs6/examples/readtestdll/readtestdll.dsp -./windows_vs6/examples/selectest/selectest.dsp -./windows_vs6/examples/selectestdll/selectestdll.dsp -./windows_vs6/examples/writetest/writetest.dsp -./windows_vs6/examples/writetestdll/writetestdll.dsp -./windows_vs6/fortran/examples/allf90examples/allf90examples.dsp -./windows_vs6/fortran/examples/allf90examples/allf90examples.dsw -./windows_vs6/fortran/examples/attreexampletest/attreexampletest.dsp -./windows_vs6/fortran/examples/attreexampletestdll/attreexampletestdll.dsp -./windows_vs6/fortran/examples/compoundtest/compoundtest.dsp -./windows_vs6/fortran/examples/compoundtestdll/compoundtestdll.dsp -./windows_vs6/fortran/examples/dsetexampletest/dsetexampletest.dsp -./windows_vs6/fortran/examples/dsetexampletestdll/dsetexampletestdll.dsp -./windows_vs6/fortran/examples/fileexampletest/fileexampletest.dsp -./windows_vs6/fortran/examples/fileexampletestdll/fileexampletestdll.dsp -./windows_vs6/fortran/examples/groupexampletest/groupexampletest.dsp -./windows_vs6/fortran/examples/groupexampletestdll/groupexampletestdll.dsp -./windows_vs6/fortran/examples/grpdsetexampletest/grpdsetexampletest.dsp -./windows_vs6/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.dsp -./windows_vs6/fortran/examples/grpittest/grpittest.dsp -./windows_vs6/fortran/examples/grpittestdll/grpittestdll.dsp -./windows_vs6/fortran/examples/grpsexampletest/grpsexampletest.dsp -./windows_vs6/fortran/examples/grpsexampletestdll/grpsexampletestdll.dsp -./windows_vs6/fortran/examples/hyperslabtest/hyperslabtest.dsp -./windows_vs6/fortran/examples/hyperslabtestdll/hyperslabtestdll.dsp -./windows_vs6/fortran/examples/mountexampletest/mountexampletest.dsp -./windows_vs6/fortran/examples/mountexampletestdll/mountexampletestdll.dsp -./windows_vs6/fortran/examples/refobjexampletest/refobjexampletest.dsp -./windows_vs6/fortran/examples/refobjexampletestdll/refobjexampletestdll.dsp -./windows_vs6/fortran/examples/refregexampletest/refregexampletest.dsp -./windows_vs6/fortran/examples/refregexampletestdll/refregexampletestdll.dsp -./windows_vs6/fortran/examples/rwdsetexampletest/rwdsetexampletest.dsp -./windows_vs6/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.dsp -./windows_vs6/fortran/examples/selecteletest/selecteletest.dsp -./windows_vs6/fortran/examples/selecteletestdll/selecteletestdll.dsp -./windows_vs6/fortran/test/flush1_fortran/flush1_fortran.dsp -./windows_vs6/fortran/test/flush1_fortrandll/flush1_fortrandll.dsp -./windows_vs6/fortran/test/flush2_fortran/flush2_fortran.dsp -./windows_vs6/fortran/test/flush2_fortrandll/flush2_fortrandll.dsp -./windows_vs6/fortran/test/libtest_cstubdll/libtest_cstubdll.dsp -./windows_vs6/fortran/test/libtest_fortran/libtest_fortran.dsp -./windows_vs6/fortran/test/libtest_fortrandll/libtest_fortrandll.dsp -./windows_vs6/fortran/test/testhdf5_fortran/testhdf5_fortran.dsp -./windows_vs6/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.dsp -./windows_vs6/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.dsp -./windows_vs6/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.dsp -./windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsp -./windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsw -./windows_vs6/hl/examples/ex_ds/ex_ds.dsp -./windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp -./windows_vs6/hl/examples/ex_images/ex_images.dsp -./windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp -./windows_vs6/hl/examples/ex_lite/ex_lite.dsp -./windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp -./windows_vs6/hl/examples/ex_packet/ex_packet.dsp -./windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp -./windows_vs6/hl/examples/ex_table/ex_table.dsp -./windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp -./windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsp -./windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsw -./windows_vs6/hl/fortran/examples/ex_lite/ex_lite.dsp -./windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp -./windows_vs6/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.dsp -./windows_vs6/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.dsp -./windows_vs6/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.dsp -./windows_vs6/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.dsp -./windows_vs6/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.dsp -./windows_vs6/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.dsp -./windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp -./windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp -./windows_vs6/hl/test/hl_test_image/hl_test_image.dsp -./windows_vs6/hl/test/hl_test_imagedll/hl_test_imagedll.dsp -./windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp -./windows_vs6/hl/test/hl_test_litedll/hl_test_litedll.dsp -./windows_vs6/hl/test/hl_test_packet/hl_test_packet.dsp -./windows_vs6/hl/test/hl_test_packetdll/hl_test_packetdll.dsp -./windows_vs6/hl/test/hl_test_table/hl_test_table.dsp -./windows_vs6/hl/test/hl_test_tabledll/hl_test_tabledll.dsp -./windows_vs6/hl/tools/gifconv/gif2h5.dsp -./windows_vs6/hl/tools/gifconv/h52gif.dsp -./windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp -./windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp -./windows_vs6/misc/fortrantypegen/fortrantypegen.dsw -./windows_vs6/misc/fortrantypegen/H5fortran_detect.dsp -./windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsp -./windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsw -./windows_vs6/misc/matchtypegen/H5match_types.dsp -./windows_vs6/misc/matchtypegen/matchtypegen.dsw -./windows_vs6/misc/typegen/h5tinit/h5tinit.dsp -./windows_vs6/proj/all/all.dsp -./windows_vs6/proj/all/all.dsw -./windows_vs6/proj/hdf5/hdf5.dsp -./windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp -./windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp -./windows_vs6/proj/hdf5dll/hdf5dll.dsp -./windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp -./windows_vs6/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp -./windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp -./windows_vs6/proj/hdf5_fortrandll/hdf5_fortrandll.dsp -./windows_vs6/proj/hdf5_hl/hdf5_hl.dsp -./windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp -./windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp -./windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp -./windows_vs6/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp -./windows_vs6/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp -./windows_vs6/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp -./windows_vs6/test/big/big.dsp -./windows_vs6/test/bigdll/bigdll.dsp -./windows_vs6/test/bittests/bittests.dsp -./windows_vs6/test/bittestsdll/bittestsdll.dsp -./windows_vs6/test/btree2/btree2.dsp -./windows_vs6/test/btree2dll/btree2dll.dsp -./windows_vs6/test/cache/cache.dsp -./windows_vs6/test/cache_api/cache_api.dsp -./windows_vs6/test/cache_apidll/cache_apidll.dsp -./windows_vs6/test/cachedll/cachedll.dsp -./windows_vs6/test/chunk/chunk.dsp -./windows_vs6/test/chunkdll/chunkdll.dsp -./windows_vs6/test/cmpd_dset/cmpd_dset.dsp -./windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp -./windows_vs6/test/cross_read/cross_read.dsp -./windows_vs6/test/cross_readdll/cross_readdll.dsp -./windows_vs6/test/dangle/dangle.dsp -./windows_vs6/test/dangledll/dangledll.dsp -./windows_vs6/test/dsets/dsets.dsp -./windows_vs6/test/dsetsdll/dsetsdll.dsp -./windows_vs6/test/dt_arith/dt_arith.dsp -./windows_vs6/test/dt_arithdll/dt_arithdll.dsp -./windows_vs6/test/dtransform/dtransform.dsp -./windows_vs6/test/dtransformdll/dtransformdll.dsp -./windows_vs6/test/dtypes/dtypes.dsp -./windows_vs6/test/dtypesdll/dtypesdll.dsp -./windows_vs6/test/enum/enum.dsp -./windows_vs6/test/enumdll/enumdll.dsp -./windows_vs6/test/error_test/error_test.dsp -./windows_vs6/test/error_testdll/error_testdll.dsp -./windows_vs6/test/err_compat/err_compat.dsp -./windows_vs6/test/err_compatdll/err_compatdll.dsp -./windows_vs6/test/extend/extend.dsp -./windows_vs6/test/extenddll/extenddll.dsp -./windows_vs6/test/external/external.dsp -./windows_vs6/test/externaldll/externaldll.dsp -./windows_vs6/test/fheap/fheap.dsp -./windows_vs6/test/fheapdll/fheapdll.dsp -./windows_vs6/test/fillval/fillval.dsp -./windows_vs6/test/fillvaldll/fillvaldll.dsp -./windows_vs6/test/flush1/flush1.dsp -./windows_vs6/test/flush1dll/flush1dll.dsp -./windows_vs6/test/flush2/flush2.dsp -./windows_vs6/test/flush2dll/flush2dll.dsp -./windows_vs6/test/getname/getname.dsp -./windows_vs6/test/getnamedll/getnamedll.dsp -./windows_vs6/test/getub/getub.dsp -./windows_vs6/test/gheap/gheap.dsp -./windows_vs6/test/gheapdll/gheapdll.dsp -./windows_vs6/test/hyperslab/hyperslab.dsp -./windows_vs6/test/hyperslabdll/hyperslabdll.dsp -./windows_vs6/test/iopipe/iopipe.dsp -./windows_vs6/test/iopipedll/iopipedll.dsp -./windows_vs6/test/istore/istore.dsp -./windows_vs6/test/istoredll/istoredll.dsp -./windows_vs6/test/lheap/lheap.dsp -./windows_vs6/test/lheapdll/lheapdll.dsp -./windows_vs6/test/libtest/libtest.dsp -./windows_vs6/test/libtestD/libtestD.dsp -./windows_vs6/test/links/links.dsp -./windows_vs6/test/linksdll/linksdll.dsp -./windows_vs6/test/mount/mount.dsp -./windows_vs6/test/mountdll/mountdll.dsp -./windows_vs6/test/mtime/mtime.dsp -./windows_vs6/test/mtimedll/mtimedll.dsp -./windows_vs6/test/ntypes/ntypes.dsp -./windows_vs6/test/ntypesdll/ntypesdll.dsp -./windows_vs6/test/objcopy/objcopy.dsp -./windows_vs6/test/objcopydll/objcopydll.dsp -./windows_vs6/test/ohdr/ohdr.dsp -./windows_vs6/test/ohdrdll/ohdrdll.dsp -./windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp -./windows_vs6/test/overhead/overhead.dsp -./windows_vs6/test/overheaddll/overheaddll.dsp -./windows_vs6/test/pool/pool.dsp -./windows_vs6/test/pooldll/pooldll.dsp -./windows_vs6/test/ref/ref.dsp -./windows_vs6/test/refdll/refdll.dsp -./windows_vs6/test/reserved/reserved.dsp -./windows_vs6/test/reserveddll/reserveddll.dsp -./windows_vs6/test/set_extent/set_extent.dsp -./windows_vs6/test/set_extentdll/set_extentdll.dsp -./windows_vs6/test/stab/stab.dsp -./windows_vs6/test/stabdll/stabdll.dsp -./windows_vs6/test/tellub/tellub.dsp -./windows_vs6/test/testhdf5/testhdf5.dsp -./windows_vs6/test/testhdf5dll/testhdf5dll.dsp -./windows_vs6/test/ttsafedll/ttsafedll.dsp -./windows_vs6/test/unlink/unlink.dsp -./windows_vs6/test/unlinkdll/unlinkdll.dsp -./windows_vs6/test/vfd/vfd.dsp -./windows_vs6/test/vfddll/vfddll.dsp -./windows_vs6/tools/h5copy/h5copy.dsp -./windows_vs6/tools/h5debug/h5debug.dsp -./windows_vs6/tools/h5debugdll/h5debugdll.dsp -./windows_vs6/tools/h5diff/h5diff.dsp -./windows_vs6/tools/h5diffdll/h5diffdll.dsp -./windows_vs6/tools/h5dump/h5dump.dsp -./windows_vs6/tools/h5dumpdll/h5dumpdll.dsp -./windows_vs6/tools/h5import/h5import.dsp -./windows_vs6/tools/h5importdll/h5importdll.dsp -./windows_vs6/tools/h5jam/h5jam.dsp -./windows_vs6/tools/h5ls/h5ls.dsp -./windows_vs6/tools/h5lsdll/h5lsdll.dsp -./windows_vs6/tools/h5mkgrp/h5mkgrp.dsp -./windows_vs6/tools/h5repack/h5repack.dsp -./windows_vs6/tools/h5repackdll/h5repackdll.dsp -./windows_vs6/tools/h5repart/h5repart.dsp -./windows_vs6/tools/h5repartdll/h5repartdll.dsp -./windows_vs6/tools/h5stat/h5stat.dsp -./windows_vs6/tools/h5statdll/h5statdll.dsp -./windows_vs6/tools/h5unjam/h5unjam.dsp -./windows_vs6/tools/talign/talign.dsp -./windows_vs6/tools/taligndll/taligndll.dsp -./windows_vs6/tools/testfiles/binread/binread.dsp -./windows_vs6/tools/testfiles/h5difftst/h5difftst.dsp -./windows_vs6/tools/testfiles/h5dumptst/h5dumptst.dsp -./windows_vs6/tools/testfiles/h5importtst/h5importtst.dsp -./windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp -./windows_vs6/tools/testfiles/h5repacktst/h5repacktst.dsp -./windows_vs6/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp -./windows_vs6/tools/testfiles/h5reparttst/h5reparttst.dsp -./windows_vs6/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp -./windows_vs6/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp -./windows_vs6/tools/toolslib/toolslib.dsp -./windows_vs6/tools/toolslibD/toolslibD.dsp +# Visual Studio .NET Project Files +./windows_vnet/COPYING +./windows_vnet/c++/examples/allcppexamples/allcppexamples.vcproj +./windows_vnet/c++/examples/allcppexamples/allcppexamples.sln +./windows_vnet/c++/examples/chunkstest/chunkstest.vcproj +./windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj +./windows_vnet/c++/examples/compoundtest/compoundtest.vcproj +./windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj +./windows_vnet/c++/examples/createtest/createtest.vcproj +./windows_vnet/c++/examples/createtestdll/createtestdll.vcproj +./windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj +./windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj +./windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj +./windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj +./windows_vnet/c++/examples/readdatatest/readdatatest.vcproj +./windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj +./windows_vnet/c++/examples/writedatatest/writedatatest.vcproj +./windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj +./windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj +./windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj +./windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj +./windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj +./windows_vnet/examples/allexamples/allexamples.vcproj +./windows_vnet/examples/allexamples/allexamples.sln +./windows_vnet/examples/attributetest/attributetest.vcproj +./windows_vnet/examples/attributetestdll/attributetestdll.vcproj +./windows_vnet/examples/chunkread/chunkread.vcproj +./windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj +./windows_vnet/examples/compoundtest/compoundtest.vcproj +./windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj +./windows_vnet/examples/extendwritetest/extendwritetest.vcproj +./windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj +./windows_vnet/examples/grouptest/grouptest.vcproj +./windows_vnet/examples/grouptestdll/grouptestdll.vcproj +./windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj +./windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj +./windows_vnet/examples/readtest/readtest.vcproj +./windows_vnet/examples/readtestdll/readtestdll.vcproj +./windows_vnet/examples/selectest/selectest.vcproj +./windows_vnet/examples/selectestdll/selectestdll.vcproj +./windows_vnet/examples/writetest/writetest.vcproj +./windows_vnet/examples/writetestdll/writetestdll.vcproj +./windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj +./windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj +./windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj +./windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln +./windows_vnet/hl/examples/ex_ds/ex_ds.vcproj +./windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj +./windows_vnet/hl/examples/ex_images/ex_images.vcproj +./windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj +./windows_vnet/hl/examples/ex_lite/ex_lite.vcproj +./windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj +./windows_vnet/hl/examples/ex_packet/ex_packet.vcproj +./windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj +./windows_vnet/hl/examples/ex_table/ex_table.vcproj +./windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj +./windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj +./windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj +./windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj +./windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj +./windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj +./windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj +./windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj +./windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj +./windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj +./windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj +./windows_vnet/hl/tools/gifconv/gif2h5.vcproj +./windows_vnet/hl/tools/gifconv/h52gif.vcproj +./windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj +./windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj +./windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj +./windows_vnet/proj/all/all.vcproj +./windows_vnet/proj/all/all.sln +./windows_vnet/proj/hdf5/hdf5.vcproj +./windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj +./windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj +./windows_vnet/proj/hdf5dll/hdf5dll.vcproj +./windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj +./windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj +./windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj +./windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj +./windows_vnet/test/big/big.vcproj +./windows_vnet/test/bigdll/bigdll.vcproj +./windows_vnet/test/bittests/bittests.vcproj +./windows_vnet/test/bittestsdll/bittestsdll.vcproj +./windows_vnet/test/btree2/btree2.vcproj +./windows_vnet/test/btree2dll/btree2dll.vcproj +./windows_vnet/test/cache/cache.vcproj +./windows_vnet/test/cache_api/cache_api.vcproj +./windows_vnet/test/cache_apidll/cache_apidll.vcproj +./windows_vnet/test/cachedll/cachedll.vcproj +./windows_vnet/test/chunk/chunk.vcproj +./windows_vnet/test/chunkdll/chunkdll.vcproj +./windows_vnet/test/cmpd_dset/cmpd_dset.vcproj +./windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj +./windows_vnet/test/cross_read/cross_read.vcproj +./windows_vnet/test/cross_readdll/cross_readdll.vcproj +./windows_vnet/test/dangle/dangle.vcproj +./windows_vnet/test/dangledll/dangledll.vcproj +./windows_vnet/test/dsets/dsets.vcproj +./windows_vnet/test/dsetsdll/dsetsdll.vcproj +./windows_vnet/test/dt_arith/dt_arith.vcproj +./windows_vnet/test/dt_arithdll/dt_arithdll.vcproj +./windows_vnet/test/dtransform/dtransform.vcproj +./windows_vnet/test/dtransformdll/dtransformdll.vcproj +./windows_vnet/test/dtypes/dtypes.vcproj +./windows_vnet/test/dtypesdll/dtypesdll.vcproj +./windows_vnet/test/enum/enum.vcproj +./windows_vnet/test/enumdll/enumdll.vcproj +./windows_vnet/test/error_test/error_test.vcproj +./windows_vnet/test/error_testdll/error_testdll.vcproj +./windows_vnet/test/err_compat/err_compat.vcproj +./windows_vnet/test/err_compatdll/err_compatdll.vcproj +./windows_vnet/test/extend/extend.vcproj +./windows_vnet/test/extenddll/extenddll.vcproj +./windows_vnet/test/external/external.vcproj +./windows_vnet/test/externaldll/externaldll.vcproj +./windows_vnet/test/fheap/fheap.vcproj +./windows_vnet/test/fheapdll/fheapdll.vcproj +./windows_vnet/test/fillval/fillval.vcproj +./windows_vnet/test/fillvaldll/fillvaldll.vcproj +./windows_vnet/test/flush1/flush1.vcproj +./windows_vnet/test/flush1dll/flush1dll.vcproj +./windows_vnet/test/flush2/flush2.vcproj +./windows_vnet/test/flush2dll/flush2dll.vcproj +./windows_vnet/test/getname/getname.vcproj +./windows_vnet/test/getnamedll/getnamedll.vcproj +./windows_vnet/test/getub/getub.vcproj +./windows_vnet/test/gheap/gheap.vcproj +./windows_vnet/test/gheapdll/gheapdll.vcproj +./windows_vnet/test/hyperslab/hyperslab.vcproj +./windows_vnet/test/hyperslabdll/hyperslabdll.vcproj +./windows_vnet/test/iopipe/iopipe.vcproj +./windows_vnet/test/iopipedll/iopipedll.vcproj +./windows_vnet/test/istore/istore.vcproj +./windows_vnet/test/istoredll/istoredll.vcproj +./windows_vnet/test/lheap/lheap.vcproj +./windows_vnet/test/lheapdll/lheapdll.vcproj +./windows_vnet/test/libtest/libtest.vcproj +./windows_vnet/test/libtestD/libtestD.vcproj +./windows_vnet/test/links/links.vcproj +./windows_vnet/test/linksdll/linksdll.vcproj +./windows_vnet/test/mount/mount.vcproj +./windows_vnet/test/mountdll/mountdll.vcproj +./windows_vnet/test/mtime/mtime.vcproj +./windows_vnet/test/mtimedll/mtimedll.vcproj +./windows_vnet/test/ntypes/ntypes.vcproj +./windows_vnet/test/ntypesdll/ntypesdll.vcproj +./windows_vnet/test/objcopy/objcopy.vcproj +./windows_vnet/test/objcopydll/objcopydll.vcproj +./windows_vnet/test/ohdr/ohdr.vcproj +./windows_vnet/test/ohdrdll/ohdrdll.vcproj +./windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj +./windows_vnet/test/overhead/overhead.vcproj +./windows_vnet/test/overheaddll/overheaddll.vcproj +./windows_vnet/test/pool/pool.vcproj +./windows_vnet/test/pooldll/pooldll.vcproj +./windows_vnet/test/reserved/reserved.vcproj +./windows_vnet/test/reserveddll/reserveddll.vcproj +./windows_vnet/test/set_extent/set_extent.vcproj +./windows_vnet/test/set_extentdll/set_extentdll.vcproj +./windows_vnet/test/stab/stab.vcproj +./windows_vnet/test/stabdll/stabdll.vcproj +./windows_vnet/test/tellub/tellub.vcproj +./windows_vnet/test/testhdf5/testhdf5.vcproj +./windows_vnet/test/testhdf5dll/testhdf5dll.vcproj +./windows_vnet/test/ttsafedll/ttsafedll.vcproj +./windows_vnet/test/unlink/unlink.vcproj +./windows_vnet/test/unlinkdll/unlinkdll.vcproj +./windows_vnet/test/vfd/vfd.vcproj +./windows_vnet/test/vfddll/vfddll.vcproj +./windows_vnet/tools/h5copy/h5copy.vcproj +./windows_vnet/tools/h5debug/h5debug.vcproj +./windows_vnet/tools/h5debugdll/h5debugdll.vcproj +./windows_vnet/tools/h5diff/h5diff.vcproj +./windows_vnet/tools/h5diffdll/h5diffdll.vcproj +./windows_vnet/tools/h5dump/h5dump.vcproj +./windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj +./windows_vnet/tools/h5import/h5import.vcproj +./windows_vnet/tools/h5importdll/h5importdll.vcproj +./windows_vnet/tools/h5jam/h5jam.vcproj +./windows_vnet/tools/h5ls/h5ls.vcproj +./windows_vnet/tools/h5lsdll/h5lsdll.vcproj +./windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj +./windows_vnet/tools/h5repack/h5repack.vcproj +./windows_vnet/tools/h5repackdll/h5repackdll.vcproj +./windows_vnet/tools/h5repart/h5repart.vcproj +./windows_vnet/tools/h5repartdll/h5repartdll.vcproj +./windows_vnet/tools/h5stat/h5stat.vcproj +./windows_vnet/tools/h5statdll/h5statdll.vcproj +./windows_vnet/tools/h5unjam/h5unjam.vcproj +./windows_vnet/tools/talign/talign.vcproj +./windows_vnet/tools/taligndll/taligndll.vcproj +./windows_vnet/tools/testfiles/binread/binread.vcproj +./windows_vnet/tools/testfiles/h5difftst/h5difftst.vcproj +./windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj +./windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj +./windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj +./windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj +./windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj +./windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj +./windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj +./windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj +./windows_vnet/tools/toolslib/toolslib.vcproj +./windows_vnet/tools/toolslibD/toolslibD.vcproj diff --git a/Makefile.in b/Makefile.in index e8f00c0..ade6c24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -221,6 +221,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/README.txt b/README.txt index 295d41a..4ac4bfe 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.0-beta4post1 released on Mon Nov 19 22:20:37 CST 2007 +HDF5 version 1.8.0 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ @@ -10,7 +10,7 @@ file contains instructions on installing the parallel version of the library. The INSTALL* files can be found in the release_docs/ directory. Documentation for this release can be found at the following URL: -http://hdfgroup.org/HDF5/release/alpha/obtain518.html +http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html Four mailing lists are currently set up for use with the HDF5 library. diff --git a/bin/trace b/bin/trace index d579857..db4e788 100755 --- a/bin/trace +++ b/bin/trace @@ -45,6 +45,7 @@ $Source = ""; "H5E_type_t" => "Et", "H5F_close_degree_t" => "Fd", "H5F_scope_t" => "Fs", + "H5F_libver_t" => "Fv", "H5G_obj_t" => "Go", "H5G_stat_t" => "Gs", "hsize_t" => "h", @@ -108,6 +109,7 @@ $Source = ""; "H5MM_allocate_t" => "x", "H5MM_free_t" => "x", "H5O_info_t" => "x", + "H5O_iterate_t" => "x", "H5P_cls_create_func_t" => "x", "H5P_cls_copy_func_t" => "x", "H5P_cls_close_func_t" => "x", diff --git a/c++/Makefile.in b/c++/Makefile.in index be2bab8..b9662e7 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -192,6 +192,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index e6b643a..992435f 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp index 6381a5d..496c5d1 100644 --- a/c++/examples/writedata.cpp +++ b/c++/examples/writedata.cpp @@ -175,7 +175,7 @@ int main (void) coord[2][0] = 3; coord[2][1] = 5; coord[3][0] = 5; coord[3][1] = 6; - fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord); + fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord); /* * Write new selection of points to the dataset. diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp index 5e9e564..245e27d 100644 --- a/c++/src/H5DataSpace.cpp +++ b/c++/src/H5DataSpace.cpp @@ -454,7 +454,7 @@ void DataSpace::getSelectBounds ( hsize_t* start, hsize_t* end ) const /// http://hdf.ncsa.uiuc.edu/HDF5/doc/RM_H5S.html#Dataspace-SelectElements // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void DataSpace::selectElements ( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord[ ] ) const +void DataSpace::selectElements ( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const { herr_t ret_value; ret_value = H5Sselect_elements( id, op, num_elements, coord ); diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h index a46f486..e1c5ba4 100644 --- a/c++/src/H5DataSpace.h +++ b/c++/src/H5DataSpace.h @@ -86,7 +86,7 @@ class H5_DLLCPP DataSpace : public IdComponent { // Selects array elements to be included in the selection for // this dataspace. - void selectElements( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord[ ] ) const; + void selectElements( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const; // Selects a hyperslab region to add to the current selected region. void selectHyperslab( H5S_seloper_t op, const hsize_t *count, const hsize_t *start, const hsize_t *stride = NULL, const hsize_t *block = NULL ) const; diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp index 136fb3b..e8ff1ec 100644 --- a/c++/src/H5PropList.cpp +++ b/c++/src/H5PropList.cpp @@ -25,6 +25,8 @@ #include "H5Exception.h" #include "H5IdComponent.h" #include "H5PropList.h" +#include "H5private.h" // for HDfree + #ifndef H5_NO_NAMESPACE namespace H5 { @@ -426,7 +428,7 @@ H5std_string PropList::getClassName() const if (temp_str != NULL) { H5std_string class_name = H5std_string(temp_str); - free(temp_str); + HDfree(temp_str); return(class_name); } else diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index de7cc10..0ddfe15 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -222,6 +222,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index f274681..4c5333f 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -35,7 +35,7 @@ TEST_PROG=dsets testhdf5 check_PROGRAMS=$(TEST_PROG) # The tests depend on the hdf5 library, test library, and the c++ library -LDADD=$(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5) +LDADD=$(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5) dsets_SOURCES=dsets.cpp h5cpputil.cpp testhdf5_SOURCES=testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 7cd387f..d873c8e 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -65,14 +65,14 @@ am__EXEEXT_1 = dsets$(EXEEXT) testhdf5$(EXEEXT) am_dsets_OBJECTS = dsets.$(OBJEXT) h5cpputil.$(OBJEXT) dsets_OBJECTS = $(am_dsets_OBJECTS) dsets_LDADD = $(LDADD) -dsets_DEPENDENCIES = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5) +dsets_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5) am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tattr.$(OBJEXT) \ tcompound.$(OBJEXT) tfile.$(OBJEXT) tfilter.$(OBJEXT) \ th5s.$(OBJEXT) trefer.$(OBJEXT) ttypes.$(OBJEXT) \ tvlstr.$(OBJEXT) h5cpputil.$(OBJEXT) testhdf5_OBJECTS = $(am_testhdf5_OBJECTS) testhdf5_LDADD = $(LDADD) -testhdf5_DEPENDENCIES = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5) +testhdf5_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5) DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles @@ -208,6 +208,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ @@ -329,7 +330,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src TEST_PROG = dsets testhdf5 # The tests depend on the hdf5 library, test library, and the c++ library -LDADD = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5) +LDADD = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5) dsets_SOURCES = dsets.cpp h5cpputil.cpp testhdf5_SOURCES = testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \ th5s.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp diff --git a/config/gnu-flags b/config/gnu-flags index 29fdad8..9167a5d 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -149,7 +149,7 @@ case "$cc_vendor-$cc_version" in gcc-2.95.[34]) PROD_CFLAGS="-O3" ;; - gcc-3.[0-4]*|gcc-4.[012]*) + gcc-3.[0-4]*|gcc-4.[0123]*) # The optimization level is reduced for gcc 3.* and 4.* due to problems # with code generation for src/H5Tconv.c with the -O2 & -O3 # optimization levels (which shows up as failures for various integer diff --git a/config/lt_vers.am b/config/lt_vers.am index 698c3ed..e47c16e 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -16,9 +16,9 @@ ## # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. -LT_VERS_INTERFACE = 4 -LT_VERS_REVISION = 4 -LT_VERS_AGE = 3 +LT_VERS_INTERFACE = 5 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and ## reset LT_VERS_REVISION to 0. diff --git a/configure b/configure index 1d4979a..12b24c5 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in 14483 2008-02-01 06:51:09Z acheng . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta4post1. +# Generated by GNU Autoconf 2.61 for HDF5 1.8.0. # # Report bugs to . # @@ -729,8 +729,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.0-beta4post1' -PACKAGE_STRING='HDF5 1.8.0-beta4post1' +PACKAGE_VERSION='1.8.0' +PACKAGE_STRING='HDF5 1.8.0' PACKAGE_BUGREPORT='help@hdfgroup.org' ac_unique_file="src/H5.c" @@ -945,6 +945,7 @@ BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE DEPRECATED_SYMBOLS DEFAULT_API_VERSION +STRICT_FORMAT_CHECKS BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE @@ -1477,7 +1478,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.8.0-beta4post1 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1548,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.0-beta4post1:";; + short | recursive ) echo "Configuration of HDF5 1.8.0:";; esac cat <<\_ACEOF @@ -1616,6 +1617,9 @@ Optional Features: need [default=no] --enable-deprecated-symbols Enable deprecated public API symbols [default=yes] + --enable-strict-format-checks + Enable strict file format checks, default=yes if + debug flag is enabled, no otherwise Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1727,7 +1731,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.0-beta4post1 +HDF5 configure 1.8.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1741,7 +1745,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.8.0-beta4post1, which was +It was created by HDF5 $as_me 1.8.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2436,7 +2440,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.0-beta4post1' + VERSION='1.8.0' cat >>confdefs.h <<_ACEOF @@ -7923,7 +7927,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7926 "configure"' > conftest.$ac_ext + echo '#line 7930 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10197,11 +10201,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10200: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10204: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10204: \$? = $ac_status" >&5 + echo "$as_me:10208: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10465,11 +10469,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10468: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10472: \$? = $ac_status" >&5 + echo "$as_me:10476: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10569,11 +10573,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10572: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10576: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10576: \$? = $ac_status" >&5 + echo "$as_me:10580: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12949,7 +12953,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15408: \$? = $ac_status" >&5 + echo "$as_me:15412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15505,11 +15509,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15512: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15512: \$? = $ac_status" >&5 + echo "$as_me:15516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17075,11 +17079,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17078: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17082: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17082: \$? = $ac_status" >&5 + echo "$as_me:17086: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17179,11 +17183,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17182: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17186: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17186: \$? = $ac_status" >&5 + echo "$as_me:17190: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19377,11 +19381,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19380: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19384: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19384: \$? = $ac_status" >&5 + echo "$as_me:19388: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19645,11 +19649,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19648: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19652: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19652: \$? = $ac_status" >&5 + echo "$as_me:19656: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19749,11 +19753,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19756: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19756: \$? = $ac_status" >&5 + echo "$as_me:19760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22557,7 +22561,7 @@ fi case "X-$enable_production" in - X-yes) + X-|X-yes) enable_production="yes" { echo "$as_me:$LINENO: result: production" >&5 echo "${ECHO_T}production" >&6; } @@ -22598,7 +22602,7 @@ echo "${ECHO_T}production" >&6; } H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS" H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS" ;; - X-|X-no) + X-no) enable_production="no" { echo "$as_me:$LINENO: result: development" >&5 echo "${ECHO_T}development" >&6; } @@ -52088,6 +52092,43 @@ echo "$as_me: error: Removing old public API symbols not allowed when using them fi + +{ echo "$as_me:$LINENO: checking Whether to perform strict file format checks" >&5 +echo $ECHO_N "checking Whether to perform strict file format checks... $ECHO_C" >&6; }; +# Check whether --enable-strict-format-checks was given. +if test "${enable_strict_format_checks+set}" = set; then + enableval=$enable_strict_format_checks; STRICT_CHECKS=$enableval +fi + + +if test "X-$STRICT_CHECKS" = X- ; then + if test -z "$DEBUG_PKG" ; then + STRICT_CHECKS=no + else + STRICT_CHECKS=yes + fi +fi + +case "X-$STRICT_CHECKS" in + X-yes) + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + STRICT_FORMAT_CHECKS=yes + +cat >>confdefs.h <<\_ACEOF +#define STRICT_FORMAT_CHECKS 1 +_ACEOF + + ;; + X-no|*) + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + STRICT_FORMAT_CHECKS=no + ;; +esac + + + if test "X$HDF_CXX" = "Xyes"; then BUILD_CXX_CONDITIONAL_TRUE= BUILD_CXX_CONDITIONAL_FALSE='#' @@ -52639,7 +52680,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.8.0-beta4post1, which was +This file was extended by HDF5 $as_me 1.8.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -52692,7 +52733,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -HDF5 config.status 1.8.0-beta4post1 +HDF5 config.status 1.8.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -53145,6 +53186,7 @@ BUILD_ALL_CONDITIONAL_TRUE!$BUILD_ALL_CONDITIONAL_TRUE$ac_delim BUILD_ALL_CONDITIONAL_FALSE!$BUILD_ALL_CONDITIONAL_FALSE$ac_delim DEPRECATED_SYMBOLS!$DEPRECATED_SYMBOLS$ac_delim DEFAULT_API_VERSION!$DEFAULT_API_VERSION$ac_delim +STRICT_FORMAT_CHECKS!$STRICT_FORMAT_CHECKS$ac_delim BUILD_CXX_CONDITIONAL_TRUE!$BUILD_CXX_CONDITIONAL_TRUE$ac_delim BUILD_CXX_CONDITIONAL_FALSE!$BUILD_CXX_CONDITIONAL_FALSE$ac_delim BUILD_PARALLEL_CONDITIONAL_TRUE!$BUILD_PARALLEL_CONDITIONAL_TRUE$ac_delim @@ -53159,7 +53201,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -53955,6 +53997,9 @@ IF_ENABLED_DISABLED "$CODESTACK" PRINT_N " GPFS" IF_YES_NO "$GPFS" +PRINT_N " Strict File Format Checks" +IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS" + PRINT_N " Default API Mapping" PRINT "$DEFAULT_API_VERSION" diff --git a/configure.in b/configure.in index fda24a7..0118fa5 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.8.0-beta4post1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.0], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AM_CONFIG_HEADER([src/H5config.h]) @@ -1011,7 +1011,7 @@ AC_ARG_ENABLE(production, [Determines how to run the compiler.])]) case "X-$enable_production" in - X-yes) + X-|X-yes) enable_production="yes" AC_MSG_RESULT([production]) @@ -1053,7 +1053,7 @@ case "X-$enable_production" in H5_CXXFLAGS="$H5_CXXFLAGS $PROD_CXXFLAGS" H5_FCFLAGS="$H5_FCFLAGS $PROD_FCFLAGS" ;; - X-|X-no) + X-no) enable_production="no" AC_MSG_RESULT([development]) CONFIG_MODE=development @@ -3645,6 +3645,41 @@ if test "X${DEFAULT_API_VERSION}" != "Xv18" -a "X${DEPRECATED_SYMBOLS}" = "Xno" AC_MSG_ERROR([Removing old public API symbols not allowed when using them as default public API symbols]) fi + +dnl ---------------------------------------------------------------------- +dnl Enable strict file format checks +dnl +AC_SUBST([STRICT_FORMAT_CHECKS]) +AC_MSG_CHECKING([Whether to perform strict file format checks]); +AC_ARG_ENABLE([strict-format-checks], + [AC_HELP_STRING([--enable-strict-format-checks], + [Enable strict file format checks, default=yes if + debug flag is enabled, no otherwise])], + [STRICT_CHECKS=$enableval]) + +dnl Default to yes if debug is enabled +if test "X-$STRICT_CHECKS" = X- ; then + if test -z "$DEBUG_PKG" ; then + STRICT_CHECKS=no + else + STRICT_CHECKS=yes + fi +fi + +case "X-$STRICT_CHECKS" in + X-yes) + AC_MSG_RESULT([yes]) + STRICT_FORMAT_CHECKS=yes + AC_DEFINE([STRICT_FORMAT_CHECKS], [1], + [Define if strict file format checks are enabled]) + ;; + X-no|*) + AC_MSG_RESULT([no]) + STRICT_FORMAT_CHECKS=no + ;; +esac + + dnl ---------------------------------------------------------------------- dnl Create automake conditionals to tell automake makefiles which directories dnl need to be compiled @@ -3954,6 +3989,9 @@ IF_ENABLED_DISABLED "$CODESTACK" PRINT_N " GPFS" IF_YES_NO "$GPFS" +PRINT_N " Strict File Format Checks" +IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS" + PRINT_N " Default API Mapping" PRINT "$DEFAULT_API_VERSION" diff --git a/examples/Makefile.in b/examples/Makefile.in index f456fff..6dc5b22 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c index 1e25ef6..a728bb2 100644 --- a/examples/h5_extlink.c +++ b/examples/h5_extlink.c @@ -216,7 +216,7 @@ static void soft_link_example(void) { hid_t file_id; hid_t group_id; - /* Define the link class that we'll use to register "user-defined hard + /* Define the link class that we'll use to register "user-defined soft * links" using the callbacks we defined above. * A link class can have NULL for any callback except its traverse * callback. diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c index 0cea797..9c75d91 100644 --- a/examples/h5_ref2reg.c +++ b/examples/h5_ref2reg.c @@ -97,8 +97,7 @@ int main(void) * Create a reference to elements selection. */ status = H5Sselect_none(space_id); - status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, - (const hsize_t **)coord); + status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord); status = H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id); /* diff --git a/examples/h5_select.c b/examples/h5_select.c index dc08b8a..595a1b3 100644 --- a/examples/h5_select.c +++ b/examples/h5_select.c @@ -171,8 +171,7 @@ main (void) coord[2][0] = 3; coord[2][1] = 5; coord[3][0] = 5; coord[3][1] = 6; - ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, - (const hsize_t **)coord); + ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, coord); /* * Write new selection of points to the dataset. diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c index 2548350..68340e0 100644 --- a/examples/h5_shared_mesg.c +++ b/examples/h5_shared_mesg.c @@ -112,7 +112,7 @@ int main(void) * it holds. For the simple case, we'll put every message that could be * shared in this single index. */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40); if(ret < 0) goto error; /* The other property that can be set for shared messages is the @@ -148,7 +148,7 @@ int main(void) * will be about the same size as a normal file (with just a little extra * overhead). */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 1000); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 1000); if(ret < 0) goto error; ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id); @@ -159,7 +159,7 @@ int main(void) * attributes (which might make sense if we were going to use committed * datatypes). We could change the flags on the index: */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 40); if(ret < 0) goto error; ret = create_standard_file("only_dspaces_and_attrs_file.h5", fcpl_id); @@ -172,9 +172,9 @@ int main(void) */ ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 40); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ATTR_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40); if(ret < 0) goto error; ret = create_standard_file("separate_indexes_file.h5", fcpl_id); @@ -187,7 +187,7 @@ int main(void) */ ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40); if(ret < 0) goto error; ret = H5Pset_shared_mesg_phase_change(fcpl_id, 5, 0); diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 2d1edc6..215b5bf 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -196,6 +196,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 217ef52..e8fe92d 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index 028a8ed..0a4bd40 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -1021,7 +1021,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsi } c_nelements = *nelements; - status = H5Sselect_elements(c_space_id, c_op, c_nelements, (const hsize_t **)c_coord); + status = H5Sselect_elements(c_space_id, c_op, c_nelements, c_coord); if ( status >= 0 ) ret_value = 0; HDfree(c_coord); return ret_value; diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 1862f18..31baee2 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -249,6 +249,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 30dd71c..5e0b92f 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -242,6 +242,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90 index 7f655de..76edd61 100644 --- a/fortran/test/tH5P.f90 +++ b/fortran/test/tH5P.f90 @@ -244,6 +244,12 @@ CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl) CALL check("h5fcreate_f", error, total_error) + if(error .ne. 0) then + write(*,*) "Cannot create file using multi-file driver... Exiting...." + total_error = 1 + call h5pclose_f(fapl, error) + return + endif ! diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 53583e2..bc0df83 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -199,6 +199,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/Makefile.in b/hl/Makefile.in index ab0b512..9e248ae 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -196,6 +196,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index c9ae4f2..cfae251 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -192,6 +192,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index a540e06..04b7e60 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index ef44a6c..d5f9755 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -211,6 +211,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 8439ff5..a05ebae 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -202,6 +202,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index a5a4d4f..bbe994d 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c index 836a708..1ffcb22 100644 --- a/hl/examples/ex_table_01.c +++ b/hl/examples/ex_table_01.c @@ -127,7 +127,10 @@ int main( void ) *------------------------------------------------------------------------- */ - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c index e107754..1ef661c 100644 --- a/hl/examples/ex_table_02.c +++ b/hl/examples/ex_table_02.c @@ -121,7 +121,10 @@ int main( void ) printf ("\n"); } - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c index 111ee68..af3894e 100644 --- a/hl/examples/ex_table_03.c +++ b/hl/examples/ex_table_03.c @@ -127,7 +127,10 @@ int main( void ) printf ("\n"); } - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c index f10f526..10d888f 100644 --- a/hl/examples/ex_table_04.c +++ b/hl/examples/ex_table_04.c @@ -153,7 +153,10 @@ int main( void ) *------------------------------------------------------------------------- */ - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c index 1fa0d93..ee671e0 100644 --- a/hl/examples/ex_table_05.c +++ b/hl/examples/ex_table_05.c @@ -164,7 +164,10 @@ int main( void ) } - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c index c1eedd6..e2e1038 100644 --- a/hl/examples/ex_table_06.c +++ b/hl/examples/ex_table_06.c @@ -85,7 +85,10 @@ int main( void ) /* print */ printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out); - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c index 22e3396..1be9f13 100644 --- a/hl/examples/ex_table_07.c +++ b/hl/examples/ex_table_07.c @@ -103,7 +103,10 @@ int main( void ) /* print */ printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out); - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c index 4e1d754..6ec0ac1 100644 --- a/hl/examples/ex_table_08.c +++ b/hl/examples/ex_table_08.c @@ -134,7 +134,10 @@ int main( void ) } - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c index c8a7118..82dca3f 100644 --- a/hl/examples/ex_table_09.c +++ b/hl/examples/ex_table_09.c @@ -135,7 +135,10 @@ int main( void ) printf ("\n"); } - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c index c4df6fe3..fb11a98 100644 --- a/hl/examples/ex_table_10.c +++ b/hl/examples/ex_table_10.c @@ -127,7 +127,10 @@ int main( void ) printf ("\n"); } - /* Close the file */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c index 91cab7a..7679ac6 100644 --- a/hl/examples/ex_table_11.c +++ b/hl/examples/ex_table_11.c @@ -107,7 +107,10 @@ int main( void ) /* print */ printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out); - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c index 4601312..b4a5a3a 100644 --- a/hl/examples/ex_table_12.c +++ b/hl/examples/ex_table_12.c @@ -100,7 +100,10 @@ int main( void ) /* print */ printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out); - /* Close the file. */ + /* close type */ + H5Tclose( string_type ); + + /* close the file */ H5Fclose( file_id ); return 0; diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8125e3b..ae50941 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -196,6 +196,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index d4f12d0..062251b 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index e33edb1..492e8b8 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -63,7 +63,6 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id, /* initialize the image dimensions */ dims[0] = height; dims[1] = width; - dims[2] = 1; /*------------------------------------------------------------------------- * create and write the dataset diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h index 6b06b66..9f70bac 100644 --- a/hl/fortran/src/H5IMcc.h +++ b/hl/fortran/src/H5IMcc.h @@ -24,13 +24,6 @@ extern "C" { #endif -#define IMAGE_CLASS "IMAGE" -#define PALETTE_CLASS "PALETTE" -#define IMAGE_VERSION "1.2" -#define IMAGE8_RANK 3 -#define IMAGE24_RANK 3 - - herr_t H5IMmake_image_8bitf( hid_t loc_id, const char *dset_name, diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index a126837..0e28d46 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -216,6 +216,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 2322eea..21aa1ad 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -206,6 +206,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index ac90cf2..d760675 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -49,7 +49,6 @@ herr_t H5IMmake_image_8bit( hid_t loc_id, /* Initialize the image dimensions */ dims[0] = height; dims[1] = width; - dims[2] = 1; /* Make the dataset */ if ( H5LTmake_dataset( loc_id, dset_name, IMAGE8_RANK, dims, H5T_NATIVE_UCHAR, buffer ) < 0) diff --git a/hl/src/H5IMprivate.h b/hl/src/H5IMprivate.h index 1fa364d..0cb37cc 100644 --- a/hl/src/H5IMprivate.h +++ b/hl/src/H5IMprivate.h @@ -26,7 +26,7 @@ #define IMAGE_CLASS "IMAGE" #define PALETTE_CLASS "PALETTE" #define IMAGE_VERSION "1.2" -#define IMAGE8_RANK 3 +#define IMAGE8_RANK 2 #define IMAGE24_RANK 3 diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 278d5bf..fe85eb8 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -212,6 +212,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 19c1de4..29d44d0 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -222,6 +222,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index dc1f4f6..069c85c 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -193,6 +193,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 84c03cd..ede1783 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -214,6 +214,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 33998c4..3ba09a9 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -237,6 +237,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/release_docs/HISTORY.txt b/release_docs/HISTORY.txt index 1327827..f42bb00 100644 --- a/release_docs/HISTORY.txt +++ b/release_docs/HISTORY.txt @@ -4,6 +4,9 @@ This file contains history of the HDF5 libraries releases CONTENTS +22. Changes from 1.6.0 to 1.8.0-rc3 +21. Release Information for hdf5-1.6.7 +20. Release Information for hdf5-1.6.6 19. Release Information for hdf5-1.6.5 18. Release Information for hdf5-1.6.4 17. Release Information for hdf5-1.6.3 @@ -27,6 +30,2549 @@ CONTENTS [Search on the string '%%%%' for per-release section breaks.] +%%%%1.8.0-rc3%%%% Changes from 1.6.0 to 1.8.0-rc3 + + +HDF5 version 1.8.0-rc3 +================================================================================ + + +INTRODUCTION + +This document describes the differences between HDF5-1.6.* and +Hdf5 1.8.0 release candidate "HDF5-1.8.0-rc3", and contains information +on the platforms tested and known problems in HDF5-1.8.0-rc3. +For more details check the HISTORY.txt file in the HDF5 source. + + +Links to HDF5 1.8.0-rc3 source code, documentation, and additional materials +can be found on THG's development server (www.hdfgroup.uiuc.edu) at the +following location: + http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html +User documentation for the beta can be accessed directly at this location: + http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/ + +New features of the upcoming 1.8.0 release are described in +the "What's New in 1.8.0?" document: + http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html + +New and modified APIs are described briefly in + http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/WhatsNew180.html +and will be listed in the "HDF5 Software Changes" document: + http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/ADGuide/Changes.html + + + +For more information, see the HDF5 home page: + + http://www.hdfgroup.org/HDF5/ + +If you have any questions or comments, please send them to the HDF Help Desk: + + help@hdfgroup.org + + +CONTENTS + +- New Features +- Support for new platforms and languages +- Bug Fixes since HDF5-1.6.0 +- Platforms Tested +- Known Problems + + +New Features +============ + + Configuration: + -------------- + - Removed stream-vfd from the HDF5 library. - AKC 2007/11/19. + - Updated versions of autotools. HDF5 now uses automake 1.10.0, + autoconf 2.61, and libtool 1.5.22. MAM - 2007/7/25. + - Changed default fortran compiler to g95 when gcc is used. - AKC + 2007/2/17. + - 'make check-vfd' can now be run from the top level directory. Not all + tests that 'make check' invokes work with certain Virtual File Drivers, + so those tests have been skipped. - MAM 2006/7/17 + - Added the variable HDF5TestExpress to control how long tests run. + Setting it to a value between 0 and 3 controls how thoroughly the + library is tested, with 0 being an "exhaustive run" and 3 being a + very quick "smoke test." 1 (a "full run") is the default. + -JML 2006/6/21 + - If both shared and static libraries are installed, now both will be + tested during 'make install'. -MAM 2006/06/21 + - Added support to explicity enable stream_vfd or shared libraries + when using parallel via the '--enable-stream_vfd' and + '--enable-shared' options, respectively. If not explicity defined, + These settings default to enabled when parallel is not used, + and disabled when parallel is used. -MAM 2006/06/17 + - Remove the flexible parallel code and the --enable-fphdf5 + configure option, it was never up to production standards + anyway. -QAK 2006/4/20 + - Added a macro hdf5_mpi_special_collective_io_works to filter out + some mpi-io packages that don't support collective IO for no IO + contributions in some processes. -KY 2006/2/16 + - Added -shlib option to link against installed shared libraries to + h5c++ and h5fc. -JML 2005/11/1 + - Added --enable-build-all option to configure, which only developers + should need to use. -JML 2005/10/24 + - Configure uses the 'TR' variable to let the user override the path + to the 'tr' utility. -JML 2005/10/17 + - Configure can recognize -lmpich as a form of MPI library. -AKC- + 2005/9/28. + - MD5 checksumming has been added to snapshot releases. Release + tarballs will be accompanied by .md5 checksum files, which can + be verified using the md5sum utility. -JML 2005/9/6 + - Some configure flags are incompatible (e.g., the C++ APIs cannot + be built using the parallel version of HDF5). configure will now + output errors when some common incompatible features are used + together. -JML 2005/9/6 + - A new API function, H5Tis_hard(), was added to the library. It + checks if a conversion function is a compiler (hard) conversion. + SLU - 2005/9/6 + - t_mpi will run the test_mpio_derived_dtype by default unless it is + known not working (indicated by macro H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS + not defined.) -AKC- 2005/8/23. + - Test execution has changed in a number of ways: + When make is invoked in parallel (using -j), sequential tests + are now executed as parallel make targets. This should make them + finish more quickly on machines with multiple processors. + Since test output is garbled when they are executed by parallel make, + tests now dump their output to foo.log files and foo.logsh files + (for test scripts). These logs are printed to the screen only + when a test fails or when all tests in the current directory have + completed successfully. + When tests pass, they will create a foo.chkexe file. + This prevents the test from executing again until the test or + main library changes. + All files generated by tests (*.chkexe, *.log, and any *.h5 files + created) can be removed by invoking 'make check-clean'. + Sequential and parallel library tests can now be invoked separately. + 'make check-s' will execute only sequential tests, and 'make check-p' + will execute only parallel tests. 'make check' will still execute + all tests. + -JML 2005/08/03 + - On windows, all.zip is deprecated. users should + read INSTALL_Windows.txt to know the details. + Reasons to deprecate all.zip: + 1. Avoid confliction for windows programmers + 2. Decrease size of CVS tree by adding all.zip + 3. Avoid using winzip as the intermediate step + --KY 2005/04/22 + - When HDF5 is created as a shared library, it now uses libtool's + shared library versioning scheme. -JML 2005/04/18 + - HDF5 now uses automake 1.9.5 to generate Makefiles.in. + This has a number of effects on users: + The Fortran compiler should be set using the environment + variable $FC, not $F9X. F9X still works, but is depreciated. + The output of make may be different. This should be only a + cosmetic effect. + make depened (or make dep) is no longer recognized, since automake + handles dependency tracking. + Some new configure options exist. --enable-dependency-tracking + and --disable-dependency-tracking are used to control automake's + dependency tracking. Dependencies are on by default *on most + platforms and compilers*. If --enable-dependency-tracking is + used, they will be enabled on any platform. However, this can + slow down builds or even cause build errors in some cases. + Likewise, --disable-dependency-tracking can speed up builds and + avoid some build errors. + Some make targets have alternate names. make check-install and + make installcheck do the same thing, for instance. + pmake on IRIX can be invoked from the root directory, but the + -V flag must be used to invoke it in any subdirectory or it + will give an error about undefined variables. + JML 2005/01 - 2005/03 + - Hardware conversion between long double and integers is also added. + SLU 2005/02/10 + - Started to support software conversion between long double and + integers. Hardware conversion will come very soon. SLU - 2005/1/6 + - Intel v8.0 compiler would infinite loop when compiling some test + code with -O3 option. Changed enable-production default compiler + option to -O2. AKC - 2004/12/06 + - Long double is assumed to be a supported C data type. It is a + stanadard C89 type. AKC - 2004/10/22 + - The IA64 will use ecc as the C++ compiler by default. + - Added some initial support for making valgrind/Purify (or similar + memory checking products) happier by initializing buffers to zero + and disabling the internal free list code. To take advantage of + this, use the "--enable-using-memchecker" configure option when + building the library. QAK - 2004/07/23 + - Fixed the long compile time of H5detect.c when v7.x Intel Compiler + is used with optimization NOT off. AKC - 2004/05/20 + - Fixed configure setting of C++ for OSF1 platform. AKC - 2004/01/06 + - Prefix default is changed from /usr/local to `pwd`/hdf5. + AKC - 2003/07/09 + + Library: + -------- + - Removed size restrictions on attributes, when using the "latest" + version of the file format. - QAK - 2007/02/21 + - Relaxed restrictions on attribute operations to allow a file ID to + be used as the "location ID". If a file ID is used, the attribute + operation will occur on the root group of the file. + - QAK - 2007/02/09 + - Enabled the CORE driver to read an existing file depending on + the setting of the backing_store for H5Pset_fapl_core and file + open flags. - SLU - 2006/11/30 + - Added new H5Gget_info_by_idx() routine to query the information about + a group according to the order within an index. + - QAK - 2006/11/27 + - Added new H5Gget_info() routine to query the information about a + group by name. + - QAK - 2006/11/27 + - Added new H5Oget_info_by_idx() routine to query the information about + an object in a group according to the order within an index. + - QAK - 2006/11/26 + - Added new H5Oget_info() routine to query the information about an + object in a group by name. + - QAK - 2006/11/26 + - Added new H5Oopen_by_idx() routine to open an object in a group + according to the order within an index. + - QAK - 2006/11/20 + - Added new H5Literate() routine to iterate over links in a group + according to the order within an index. + - QAK - 2006/11/20 + - Added new H5Ldelete_by_idx() routine to delete a link according to + the order within an index. + - QAK - 2006/11/13 + - Added new H5Lget_val_by_idx() routine to query the value of a soft link + according to the order within an index. + - QAK - 2006/11/13 + - Added new H5Lget_name_by_idx() routine to query the name of a link + according to the order within an index. + - QAK - 2006/11/12 + - Added new H5Rget_name() routine to determine the name of the object + that a reference points to, as long as the object is still + reachable in the group hierarchy. + - QAK - 2006/11/10 + - Added new H5Lget_info_by_idx() routine to query the link information + according to the order within an index. + - QAK - 2006/11/10 + - Added feature to H5Iget_name to allow retrieving the name of any + object's ID, as long as the object is still reachable in the + group hierarchy. + - LA - 2006/11/01 + - Added External and User-defined links. + External links are links from one HDF5 file to another; they + require both the name of the file and a path within that file. + User-defined links allow users to supply callback functions + for link traversals, allowing links to exhibit essentially + any behavior. + External links are a kind of user-defined link, so their default + behavior can be overridden by the user. + -JML 2006/8/23 + - Added H5Oopen and H5Oclose for opening objects of unknown type + (as link callback functions do). + -JML 2006/8/23 + - Added H5Oopen_by_addr, H5Oincr_refcount, and H5Odecr_refcount for + opening objects by address. Be very careful with these! + -JML 2006/8/23 + - Added H5Fget_intent to get the "intent" of a file (whether it + was opened with read-write access or read-only. + -JML 2006/8/23 + - Added Link Access Property Lists. They currently contain two + properties, nlinks (H5Pget/set_nlinks) and elink_prefix + (H5Pget/set_elink_prefix). nlinks controls how many soft and + user-defined traversals are allowed before HDF5 assumes it has + found a cycle (previously this defaulted to 16). + The elink_prefix is a filesystem path that is prefixed to the + names of any external link files opened using this LAPL. + -JML 2006/8/23 + - Add H5L link APIs. Old APIs (H5Glink, H5Gmove, etc.) are still + supported but deprecated. + New APIs are: + H5Llink - create a link to an object given its ID + H5Lmove - just like H5Gmove2 + H5Lcopy - copy a link without copying the underlying object + H5Lcreate_hard - like H5Glink2 for hard links + H5Lcreate_soft - like H5Glink2 for soft links + H5Ldelete - just like H5Gunlink + H5Lget_val - just like H5Gget_linkval + H5Lget_info - gets link-specific info (like H5Gget_objinfo) + + In addition, H5Gcreate_anon, H5Tcommit_anon, and H5Dcreate_anon + no longer create links to objects; objects must be manually linked + using H5Llink or they will be deleted when the ID is closed. + + Link Creation Property Lists can be used to pass character + encoding (ASCII or UTF-8) for link names and to set the Intermediate + Group Creation Flag: + H5Pset_char_encoding, H5Pget_char_encoding + H5Pset_copy_object, H5Pget_copy_object + -JML 2006/7/5 + - Added managements of collective IO supports for chunking storage + inside parallel HDF5 + 1) Implemented One IO with collective mode for all chunks in the + application by building one MPI derived datatype accross all + chunks. + 2) Implemented the decision-making support to do collective IO inside + MPI-IO per chunk. + 3) Added the decision-making support to do one IO accross all chunks + or to do multiple IOs with each IO per chunk. + 4) Added the support to handle the case some processes won't do any IOs in + collectively. + 5) Some MPI-IO package(mpich 1.2.6 or lower, e.g.) cannot handle + collective IO correctly for the case when some processes have no + contributions to IOs, a special macro is added to change + collective IO mode to independent IO mode inside HDF5 library. + + Currently we find that MPICH at Linux and vender MPI-IO package at NCSA + Altix cannot handle this case. + + "hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}" + has been added at the end of file and + . + + If MPI-IO packages at your Linux and Altix support this case, + please comment out the last line and report to us at + help@hdfgroup.org. We can tune in our configuration to + support this. + + KY - 2006/02/16 + - Added character encoding to attribute creation property lists. + JML - 2006/01/02 + - Added H5Gcopy() routine to copy objects between while keeping + data in compressed form. QAK - 2005/11/06 + - Added H5Sextent_equal() routine. QAK - 2005/11/06 + - Added HSYS_ERROR which retrieves the system error message and pushes + it to the error stack. This gives more information of the failed + system call. AKC - 2005/08/04 + - Added H5F_OBJ_LOCAL flag to H5Fget_obj_count() & H5Fget_obj_ids(), to + allow querying for objects in file that were opened with a particular + file ID, instead of all objects opened in file with any file ID. + QAK - 2005/06/01 + - Added H5T_CSET_UTF8 character set to mark datatypes that use the + UTF-8 Unicode character encoding. Added tests to ensure that + library handles UTF-8 object names, attributes, etc. -JL 2005/05/13 + - HDF5 supports collective MPI-IO for irregular selection with HDF5 + dataset. Irregular selection is when users use H5Sselect_hyperslab + more than once for the same dataset. + Currently, not all MPI-IO packages support complicated MPI derived + datatype used in the implementation of irregular + selection INSIDE HDF5. + 1) DEC 5.x is not supporting complicated derived datatype. + 2) For AIX 5.1, + if your poe version number is 3.2.0.19 or lower, + please edit powerpc-ibm-aix5.x under hdf5/config, + Find the line with + << hdf5_mpi_complex_derived_datatype_works>> + and UNCOMMENT this line before the configure. + check poe version with the following command: + lpp -l all | grep ppe.poe + 3) For Linux cluster, + if mpich version is 1.2.5 or lower, collective irregular selection + IO is not supported, internally independent IO is used. + 4) For IRIX 6.5, + if C compiler version is 7.3 or lower, collective irregular selection + IO is not supported, internally independent IO is used. + 5) For platforms which internally used mpich, if the + mpich version is 1.2.5 or lower, please find the + corresponding config file and add + hdf5_mpi_complex_derived_datatype_works='no' at the + end of the configuration file. For example, at NCSA + SGI Altix, the internal mpich library is 1.2.5. So + hdf5_mpi_complex_derived_datatype_works='no' should be + added at the end of the config file ia64-linux-gnu. + KY - 2005/09/12 + We also found not all MPI-IO packages support collective IO with one + or more processes to have no contributions to IO. + For mpich version 1.2.6 or lower and all IRIX machine, + if the library checks that there are no IO contributions for some + processes, collective IO request is replaced with + independent inside HDF5. + KY - 2006/05/04 + + - HDF5 N-bit filter + HDF5 support N-bit filter from this version, + The N-Bit filter is used effectively for compressing data of N-Bit + datatype as well as compound and array datatype with N-Bit fields. + KY - 2005/04/15 + - HDF5 scaleoffset filter + HDF5 supports scaleoffset filter for users to do data + compression through HDF5 library. + Scale-Offset compression performs a scale and/or offset operation + on each data value and truncates the resulting value to a minimum + number of bits and then stores the data. + Scaleoffset filter supports floating-point and integer datatype. + Please check the HDF5 reference manual for this. + KY - 2005/06/06 + - Retired SRB vfd (--with-srb). Functions H5Pset_fapl_srb and + H5Pget_fapl_srb were removed. EIP - 2005/04/07 + - Retired GASS vfd (--with-gass). Functions H5Pset_fapl_gass and + H5Pget_fapl_gass are removed too. AKC - 2005/3/3 + - Pablo was removed from the source code EIP - 2005/01/21 + - Modified registration of SZIP to dynamically detect the presence + or absence of the encoder. Changed configure and Makefiles, + and tests to dynamically detect encoder. BEM - 2004/11/02 + - Added function H5Pget_data_transform, together with the previously + added H5Pset_data_transform, to support the data transform + feature. AKC - 2004/10/26 + - Compound datatype has been enhanced with a new feature of size + adjustment. The size can be increased and decreased(without + cutting the last member) as long as it doesn't go down to zero. + No API change is involved. SLU - 2004/10/1 + - Put back 6 old error API functions to be backward compatible with + version 1.6. They are H5Epush, H5Eprint, H5Ewalk, H5Eclear, + H5Eset_auto, H5Eget_auto. Their new equivalent functions are + called H5Epush_stack, H5Eprint_stack, H5Ewalk_stack, + H5Eclear_stack, H5Eset_auto_stack, H5Eget_auto_stack. SLU - + 2004/9/2 + - 4 new API functions, H5Tencode, H5Tdecode, H5Sencode, H5Sdecode were + added to the library. Given object ID, these functions encode and + decode HDF5 objects(data type and space) information into and from + binary buffer. SLU - 2004/07/21 + - Modified the way how HDF5 calculates 'pixels_per_scanline' parameter for + SZIP compression. Now there is no restriction on the size and shape of the + chunk except that the total number of elements in the chunk cannot be + bigger than 'pixels_per_block' parameter provided by the user. + EIP - 2004/07/21 + - Added support for SZIP without encoder. Added H5Zget_filter_info + and changed H5Pget_filter and H5Pget_filter_by_id to support this + change. JL/NF - 2004/06/30 + - SZIP always uses K13 compression. This flag no longer needs to + be set when calling H5Pset_szip. If the flag for CHIP + compression is set, it will be ignored (since the two are mutually + exclusive). JL/NF - 2004/6/30 + - A new API function H5Fget_name was added. It returns the name + of the file by object(file, group, data set, named data type, + attribute) ID. SLU - 2004/06/29 + - Added support for user defined identifier types. NF/JL - 2004/06/29 + - A new API function H5Fget_filesize was added. It returns the + actual file size of the opened file. SLU - 2004/06/24 + - New Feature of Data transformation is added. AKC - 2004/05/03. + - New exception handler for datatype conversion is put in to + replace the old overflow callback function. This exception + handler is set through H5Pset_type_conv_cb function. + SLU - 2004/4/27 + - Added option that if $HDF5_DISABLE_VERSION_CHECK is set to 2, + will suppress all library version mismatch warning messages. + AKC - 2004/4/14 + - A new type of dataspace, null dataspace(dataspace without any + element) was added. SLU - 2004/3/24 + - Data type conversion(software) from integer to float was added. + SLU - 2004/3/13 + - Data type conversion(software) from float to integer was added. + Conversion from integer to float will be added later. + SLU -2004/2/4 + - Added new H5Premove_filter routine to remove I/O pipeline filters + from dataset creation property lists. PVN - 2004/01/26 + - Added new 'compare' callback parameter to H5Pregister & H5Pinsert + routines. QAK - 2004/01/07 + - Data type conversion(hardware) between integers and floats was added. + SLU 2003/11/21 + - New function H5Iget_file_id() was added. It returns file ID given + an object(dataset, group, or attribute) ID. SLU 2003/10/29 + - Added new fields to the H5G_stat_t for more information about an + object's object header. QAK 2003/10/06 + - Added new H5Fget_freespace() routine to query the free space in a + given file. QAK 2003/10/06 + - Added backward compatability with v1.6 for new Error API. SLU - + 2003/09/24 + - Changed 'objno' field in H5G_stat_t structure from 'unsigned long[2]' + to 'haddr_t'. QAK - 2003/08/08 + - Changed 'fileno' field in H5G_stat_t structure from 'unsigned long[2]' + to 'unsigned long'. QAK - 2003/08/08 + - Changed 'hobj_ref_t' type from structure with array field to 'haddr_t'. + QAK - 2003/08/08 + - Object references (hobj_ref_t) can now be compared with the 'objno' + field in the H5G_stat_t struct for testing if two objects are the + same within a file. QAK - 2003/08/08 + - Switched over to new error API. SLU - 2003/07/25 + + Parallel Library: + ----------------- + - Added mpich2 as a testing "platform" informally. AKC - 2005/9/28. + - A dataset created in serial mode with H5D_ALLOC_TIME_INCR allocation + setting was not extendible, either explicitly by H5Dextend or + implicitly by writing to unallocated chunks. Library now allocates + more space when needed or directed if the file is opened by parallel + mode, independent of what the dataset allocation mode is. + CC/AKC - 2005/08/29. + - Allow compressed, chunked datasets to be read in parallel. + QAK - 2004/10/04 + - Add options of using atomicity and file-sync to test_mpio_1wMr. + AKC - 2003/11/13 + - Added parallel test, test_mpio_1wMr, which tests if the + underlaying parallel I/O system is conforming to the POSIX + write/read requirement. AKC - 2003/11/12 + + Fortran Library: + ---------------- + - added support for shared Fortran libraries. -JML 2005/09/20 + - added missing h5tget_member_class_f function + EIP 2005/04/06 + - added new functions h5fget_name_f and h5fget_filesize_f + EIP 2004/07/08 + - h5dwrite/read_f and h5awrite/read_f functions only accept dims parameter + of the type INTEGER(HSIZE_T). + - added support for native integers of 8 bytes (i.e. when special + compiler flag is specified to set native fortran integers to 8 bytes, + for example, -i8 flag for PGI and Absoft Fortran compilers, + -qintsize=8 flag for IBM xlf compiler). + EIP 2005/06/20 + - added support for "big" REAL and DOUBLE PRECISION types + (usually the size is specified by compilers flags like + -r8, -r16, etc.) + Known problem: multi file test fails when REAL is 16 bytes. + EIP 2005/09/8 + + C++ Library: + ---------------- + - added support for shared C++ libraries. -JML 2005/09/20 + - Added missing member functions + H5::CompType::getMemberArrayType + H5::CompType::getMemberVarLenType + H5::AbstractDs::getArrayType + H5::AbstractDs::getVarLenType + H5::CommonFG::openArrayType + H5::CommonFG::openVarLenType + H5::PropList::copyProp -- this will replace the current + H5::PropList::copyProp in later releases due + to incorrect prototype. + H5::IdComponent::getHDFObjType + BMR - 2005/08/08 + + + Tools: + ------ + - h5repack and h5diff changed command line parameter syntax to be + similar to h5dump, adding also long switch names. PVN - 2008/1/16 + - h5repack now supports adding multiple filters to all objects. + PVN - 2008/1/16 + - h5dump lists groups and attributes in requested orders (by name and + creation order, both ascending and descending). PVN - 2007/10/5 + - h5import imports string (text) data. PVN - 2007/10/5 + - h52gif and gif2h5: Both these tools were revised to include the High + Level Image API support, and tests were added to /hl/tools/gif2h5. + PVN - 2007/04/13 + - h5dump: added support for double long type H5T_NATIVE_LDOUBLE. PVN + 2007/03/13 + - h5dump: added support for binary output, see usage. PVN 2007/03/13 + - h5repack: added support for the new nbit and scaleoffset filters. + PVN - 2007/05/07 + - h5repack: now uses the API function H5Ocopy (of the tool h5copy) to + recreate objects if there is not a user input for changes. PVN - + 2007/05/07 + - h5repack: added support for reading and repacking by hyperslabs for + large files. PVN - 2007/03/01 + - h5repack: a new option allows the copy using the file type (default) + instead of the previous conversion to native type. PVN - 2007/03/01 + - h5repack: output the percentage of compression used. PVN - 2007/03/01 + - h5diff: added support for -p option for unsigned long_long data. PVN + - 2007/02/26 + - h5diff: added support for comparing dataset regions. PVN - 2007/02/20 + - h5diff: added support for reading and comparing by hyperslabs for large files. + PVN - 2007/02/20 + - h5diff: printing of dataset dimensions along with dataset name. PVN -2007/02/19 + - h5dump now uses the new API function H5Rget_name to display the name + of the dataset referenced instead of its ID. PVN - 2007/02/19 + - Added new tool, h5mkgrp. QAK - 2007/02/14 + - Added new tool, h5copy. PVN - 2006/7/15 + - Removed obsolete pdb2hdf5 tool from tools/misc -JML 2005/10/24 + - Added build_h5perf_alone.sh that builds h5perf by standalone mode. + AKC - 2005/09/18. + - Sped up h5dump on files with large numbers of objects. + QAK - 2005/08/25 + - Added a standalone mode for building h5perf. AKC - 2005/08/12 + - new tool, h5jam. See reference manual. 2004/10/08 + - h5repack.sh did not report errors encountered during tests. It does + now. AKC - 2004/04/02 + - Added the MPI-I/O and MPI-POSIX drivers to the list of VFL drivers + available for h5dump and h5ls. RPM & QAK - 2004/02/01 + - Added option --vfd= to h5ls to allow a VFL driver to be selected + by a user. RPM & QAK - 2004/02/01 + - Added option -showconfig to compiler tools (h5cc,h5fc,h5c++). + AKC - 2004/01/08 + - Install the "h5cc" and "h5fc" tools as "h5pcc" and "h5pfc" + respectively if library is built in parallel mode. + WCW - 2003/11/04 + - Added metadata benchmark (perform/perf_meta). SLU - 2003/10/03 + - Changed output of "OID"s from h5dump from "-" to + ":::" to ":" + QAK - 2003/08/08 + + High-Level APIs: + ------ + - Fortran interfaces for the Image, Table and Lite APIs. PVN - 2007/5/1 + - New HDF5 Dimension Scale API (H5DS) allows dimension scales to be + created in an HDF5 file and associated with specific datasets. PVN - 2007/5/1 + - There are two new functions in the Lite library, H5LTtext_to_dtype + and H5LTdtype_to_text. H5LTtext_to_dtype creates a HDF5 data type + given a text description; H5LTdtype_to_text converts a data type + to text description. Only DDL definition is supported as text + desciption now. SLU - 2006/05/17 + - Added Packet Table API for creating tables with less overhead than + H5TB API. Added C++ wrapper for Packet Tables. See documentation. + JML - 2004/03/28 + + Documentation + ------------- + - The documentation for this release is largely complete, but + trails the source code. A few of the newer functions are + not yet documented. FMB - 2007/04/18 + - The user documents for this release can be accessed directly at + this location: + http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/ + The most recent document versions (updated daily) in the + 1.8 development branch can be accessed at this location: + http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/ + FMB - 2007/04/18 + + +Support for new platforms, languages and compilers. +======================================= + - Added support for Free-BSD on amd64 with GNU C and Fortran compilers + 4.2.1 + EIP - 2007/06/25 + - Added support for sequential and parallel libraries for Intel 64 Linux + cluster (abe.ncsa.uiuc.edu). Among three MPICH packages available on + this machine, only Open MPI works. The VMI has seg fault in hyperslab.c + and bittests.c tests. The MVAPICH2 complained about mpd not running + the parallel test. (see Known Problems section for more info) + EIP - 2007/06/25 + - Added support for HPUX11.23 for both 32 and 64-bit; HDF5 C++ + - Added support for 64-bit Windows with Visual Studio .NET and 2005. + SJW - 2007/06/25 + - Added suport for HPUX11.23 for both 32 and 64-bit; HDF5 C++ + shared library is not supported with +DD64 flag. + EIP - 2006/06/22 + - Added support for VAX floating numbers for Alpha Open VMS 7.3.2 + EIP - 2006/05/05 + - Fixed broken make.com files in tools directories + EIP - 2006/05/05 + - Added support for Alpha Open VMS 7.3.2 EIP - 2006/04/15 + - Added support for Cray X1. JML - 2005/10/03 + - PGI Fortran compiler is supported on Linux64 systems (x86_64) + EIP - 2004/08/19 + - Absoft compiler f95 v9.0 supported on Linux 2.4 + EIP - 2004/07/29 + - HDF5 Fortran APIs are supported on Mac OSX with IBM XL Fortran + compiler version 8.1. This is a default compiler. + - HDF5 Fortran APIs are supported on MAC OSX with Absoft F95 compiler + version 8.2; set F9X environment varibale to f95, for example + setenv F9X f95 + Use --disable-shared --enable-static configure flags when Absoft + compiler is used. + EIP - 2004/07/27 + - HDF5 Fortran APIs are supported on MAC OSX with IBM XL Fortran + Compiler version 8.1 Use "--disable-shared --enable-static" + configure flags along with the "--enable-fortran" flag to build + Fortran library. EIP - 2004/01/07 + +Bug Fixes since HDF5-1.6.0 release +================================== + + Library + ------- + - Changed library's behavior for reading files that might have + corrupted object header information from a previous (buggy) + version of the library. By default, the library now rebuilds the + correct object header information instead of issuing an error. + Previous "strict" file format interpretation can be enabled with + the "--enable-strict-format-checks" configure option. + QAK - 2008/01/13 + - Fixed several bugs with writing fill values for datasets that have + a variable-length datatype or component datatype. QAK - 2007/06/19 + - STDIO driver didn't support files bigger than 2GB because the OFFSET + parameter of fseek is of type LONG INT, not big enough for big files. + Use fseeko instead for big files if it's available on the system. + SLU - 2007/4/5 + - Fixed a bug in H5Sselect_valid() that caused an incorrect value to + be returned (0) instead of FAIL on error conditions such as the + selection or extent not being defined. CMC - 2007/01/17 + - Fixed the MULTI driver problem (Bug #731) that corruptted the data. + SLU - 2007/1/12 + - Fixed file corruption bug which could write an incorrect number of + messages to an object's header under certain circumstances. + Generally, the sequence of actions to generate this bug looks + like this: + - Create an object + - Close the file + - Re-open the file + - Add 2 (or more) attributes to the object + - Close the file + - Re-open the file + - Delete one of the attributes on the object + - Add a smaller attribute to the object + - Delete the smaller atttribute on the object + - Add a larger attribute on the object + + After this, the number of header messages stored for the object + will be off by one. Other sequences of modifying attributes on an + object could also trigger this bug. If you are opening an + object and the bottom few messages of the HDF5 error stack + resembles this, the object has been affected by this bug: + + #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry(): unable to load entry + major(08): Meta data cache layer + minor(40): Unable to load metadata into cache + #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load(): corrupt object header - too few messages + major(12): Object header layer + minor(40): Unable to load metadata into cache + + Specifically, "corrupt object header" is the best string to search + for in the HDF5 error stack output. + + If your files have been affected by this bug, or you are concerned + that your files might have been, please contact the HDF Helpdesk + at help@hdfgroup.org for a tool to detect and repair files + affected by this problem. QAK - 2006/6/16 + - Fixed various problems with retrieving names of objects, especially + with mounted files. QAK - 2005/12/25 + - Fixed core dump when closing root groups opened through two different + file handles that operate on the same actual file. QAK - 2005/10/02 + - Corrected errors when performing various operations on a group opened + by dereferencing an object reference. QAK - 2005/07/30 + - Fixed a bug with named datatypes where a copy of a named datatype + used to create a dataset would accidentally use the original + named datatype for the dataset's datatype. QAK - 2005/07/23 + - Made H5Fget_name() be consistent and always return name of actual + file the ID is in. (Instead of the name of the top file in a + file mounting hierarchy). QAK - 2005/07/19 + - Reworked internal file mounting semantics to hopefully eliminate + mounting problems. We now require that files that are mounting + together all have the same "file close degree". QAK - 2005/07/19 + - More bug fixes on holding open files that are mounted and have + IDs open. QAK - 2005/07/14 + - Don't unmount child files until the parent file actually closes. + (Previously, if an object is holding open a file, the child files + would get unmounted too early). QAK - 2005/07/05 + - Fixed bug where unmounted files could cause the library to go into + an infinite loop when shutting down. QAK - 2005/06/30 + - The library didn't save the information of family driver in file. + The original file member size was lost after file was closed (see + bug #213). This has been fixed by saving driver name and member + file size in the superblock. SLU - 2005/6/24 + - Fixed bug with hyperslab selections that use selection offsets and + operate on chunked datasets going into infinite loop or dumping + core. QAK - 2005/06/17 + - Corrected memory leak and possible corruption when opening a group. + QAK - 2005/06/17 + - Added check for opaque datatype tags being too long (check against + H5T_OPAQUE_TAG_MAX, currently set to 256). QAK - 2005/06/14 + - Fixed various errors in maintaining names for open objects in the + face of unusual mount & unmount operations. QAK - 2005/06/08 + - "SEMI" and "STRONG" file close degree settings now apply only to the + particular file ID being closed, instead of operating on all open + file IDs for a given file. QAK - 2005/06/01 + - For family driver, the library didn't save member size in file. + When file is reopened, the size of 1st member file determine the + member size. Now member size is saved in file and is used to + define member file size. Wrong file access property of member size + will result in a failure. Using any other driver except family + will cause library to return error. So is multi driver. SLU - + 2005/05/24 + - Fixed error in opening object in group that was opened in mounted + file which has been unmounted. QAK - 2005/03/17 + - Fixed a racing condition in MPIPOSIX virtual file drive close + function. Now all processes must completed the close before any + of them is returned. This prevents some "faster" processes start + accessing the file for another purpose (e.g., open with truncate) + while other "slower" processes have not closed the same file with + the previous purpose. AKC - 2005/03/01 + - H5Tget_member_value calls for enum datatype didn't return correct + value if H5Tenum_valueof was called first. It's fixed. SLU - + 2005/02/08 + - For variable-length string, H5Tget_class returned H5T_STRING as its + class. But H5Tdetect_class and H5Tget_member_class considered it + as H5T_VLEN. This is fixed to let all these 3 functions treat it + as H5T_STRING. SLU - 2005/02/08 + - The byte order of 1-byte integer types was fixed as little endian + even on a big-endian machine. This has been corrected. SLU - + 2005/02/07 + - Fix segmentation fault when calling H5Fflush with an attribute that + hasn't had a value written to it open. QAK - 2004/10/18 + - Back up supporting bitfield and time types in H5Tget_native_type. + Leave it to future support. The function simply returns error + message of "not support" for bitfield and time types. + SLU - 2004/10/5 + - Fixed address check in Core VFL driver to avoid spurious address/size + overflows for odd valued addresses and/or sizes. QAK - 2004/09/27 + - Fixed parallel bug in which some processes attempted collective + I/O while others did independent I/O. Bug appeared when some + processes used point selections, and others didn't. JRM - 2004/9/15 + - Corrected error where dataset region references were written in an + incorrect way on Cray machines. PVN & QAK - 2004/09/13 + - The H5Tget_native_type now determines the native type for integers + based on the precision. This is to avoid cases of wrongly converting + an int to a short in machines that have a short of 8 bytes but with + 32bit precision (e.g Cray SV1). PVN - 2004/09/07 + - Changed H5Dread() to not overwrite data in an application's buffer + with garbage when accessing a chunked dataset with an undefined + fill value and an unwritten chunk is uncountered. QAK - 2004/08/25 + - Fixed error which could cause a core dump when a type conversion + routine was registered after a compound datatype had been + converted and then an equivalment compound datatype was converted + again. QAK - 2004/08/07 + - Fixed memory overwrite when encoding "multi" file driver information + for file's superblock. QAK - 2004/08/05 + - Fixed obscure bug where a filter which failed during chunk allocation + could allow library to write uncompressed data to disk but think + the data was compressed. QAK - 2004/07/29 + - Fixed bug where I/O to an extendible chunked dataset with zero-sized + dimensions would cause library to fail an assertion. + QAK - 2004/07/27 + - Fixed bug where chunked datasets which have filters defined, + allocation time set to "late" and whose chunks don't align with + the dataspace bounds could have incorrect data stored when + overwriting the entire dataset on the first write. QAK - 2004/07/27 + - Added check to ensure that dataspaces have extents set. JML-2004/07/26 + - Fixed bug on some Solaris systems where HDF5 would try to use + gettimeofday() when that function didn't work properly. + JML - 2004/07/23 + - Fixed bug in H5Sset_extent_simple where setting maximum size to + non-zero, then to zero would cause an error. JML - 2004/07/20 + - Allow NULL pointer for buffer parameter to H5Dread & H5Dwrite + when not writing data ("none" selection or hyperslab or point + selection with no elements defined). QAK - 2004/07/20 + - Calling H5Gcreate() on "/" or "." throws an error instead of + failing quietly. JML - 2004/07/19 + - Fixed bug where setting file address size to be very small could + trigger an assert if the file grew to more than 64 KB. Now throws + an error and data can be recovered. JL/NF - 2004/07/14 + - Fixed bug where "resurrecting" a dataset was failing. + QAK - 2004/07/14 + - Fixed bug where incorrect data could be read from a chunked dataset + after it was extended. QAK - 2004/07/12 + - Fixed failure to read data back from file of compound type with + variable-length string as field. SLU - 2004/06/10 + - Fixed potential file corruption bug when a block of metadata could + overlap the end of the internal metadata accumulator buffer and + the buffer would be extended correctly, but would incorrectly + change it's starting address. QAK - 2004/06/09 + - Opaque datatype with no tag failed for some operations. Fixed. + SLU - 2004/6/3 + - Fixed potential file corruption bug where dimensions that were + too large (a value greater than could be represented in 32-bits) + could cause the incorrect amount of space to be allocated in a + file for the raw data for the dataset. QAK - 2004/06/01 + - Fixed dtypes "sw long double -> double" failure in QSC class + machines. AKC - 2004/4/16 + - Fixed problem with fletcher32 filter when converting data of different + endianess. PVN - 2004/03/10 + - Fixed problem with H5Tget_native_type() not handling opaque fields + correctly. QAK - 2004/01/31 + - Fixed several errors in B-tree deletion code which could cause a + B-tree (used with groups and chunked datasets) to become corrupt + with the right sequence of deleted objects. QAK - 2004/01/19 + - Fixed small internal memory leaks of fill-value information. + QAK - 2004/01/13 + - Fixed bug that caused variable-length datatypes (strings or sequences) + used for datasets in files with objects that were unlinked to + fail to be read/written to a file. QAK - 2004/01/13 + - Detect situation where szip 'pixels per block' is larger than the + fastest changing dimension of a dataset's chunk size and disallow + this (due to limits in szip library). QAK - 2003/12/31 + - Fixed bug with flattened hyperslab selections that would generate + incorrect hyperslab information with certain high-dimensionality + combinations of start/stride/count/block information. + QAK - 2003/12/31 + - Fixed bug with variable-length datatypes used in compound datatypes. + SLU - 2003/12/29 + - Fixed bug in parallel I/O routines that would cause reads from + "short datasets" (datasets which were only partially written out) + to return invalid data. QAK & AKC - 2003/12/19 + - Fixed bug where scalar dataspaces for attributes were reporting as + simple dataspaces. QAK - 2003/12/13 + - Fixed problem with selection offsets of hyperslab selections in + chunked datasets causing the library to go into an infinite loop. + QAK - 2003/12/13 + - Fixed H5Giterate to avoid re-using index parameter after iteration + callback has been called (allows iteration callback to modify the + index parameter itself). QAK - 2003/12/06 + - Fixed various floating-point conversion problems, including a + change which could corrupt data when converting from double->float. + QAK - 2003/11/24 + - Changed "single process" metadata writing in library to collective + I/O by all processes, in order to guarantee correct data being + written with MPI-I/O. QAK - 2003/11/20 + - Fixed problems with fill values and variable-length types and also + I/O on VL values that were set to NULL. QAK - 2003/11/08 + - Fixed problems with MPI datatypes that caused ASCI Q machine to + hang. QAK - 2003/10/28 + - Removed HDF5_MPI_PREFER_DERIVED_TYPES environment variable support, + since it had no benefit. QAK - 2003/10/28 + - Single hyperslab selections (which were set with only one call to + H5Sselect_hyperslab) that had dimensions that could be "flattened" + but were interspersed with dimensions that could not be flattened + were not correctly handled, causing core dumps. QAK - 2003/10/25 + - Fixed incorrect datatype of the third parameter to the Fortran90 + h5pset(get)_cache_f subroutine (INTEGER to INTEGER(SIZE_T)) + EIP - 2003/10/13 + - Fixed problems with accessing variable-length data datatypes on + Crays. QAK - 2003/10/10 + - Fixed potential file corruption bug when too many object header + messages (probably attributes, from a user perspective) were + inserted into an object header and certain other conditions were + met. QAK - 2003/10/08 + - Changed implementation of internal ID searching algorithm to avoid + O(n) behavior for many common cases. QAK - 2003/10/06 + - Allow partial parallel writing to compact datasets. QAK - 2003/10/06 + - Correctly create reference to shared datatype in attribute, instead + of making a copy of the shared datatype in the attribute. + QAK - 2003/10/01 + - Revert changes which caused files >2GB to fail when created with + MPI-I/O file driver on certain platforms. QAK - 2003/09/16 + - Allow compound datatypes to grow in size. SLU - 2003/09/10 + - Detect if a type is already packed before attempting to pack it + again or check if it is locked. SLU - 2003/09/10 + - Corrected bug when opening a file twice with read-only permission + for one open and then closing the read-only access file ID would + generate an error. QAK - 2003/09/10 + - Corrected bug in repeated calls to H5Pget_access_plist() which would + incorrectly manage reference counts of internal information and + eventually blow up. QAK - 2003/09/02 + - Return rank of the array datatype on successful call to + H5Tget_array_dims(). QAK - 2003/08/30 + - Corrected bug in H5Tdetect_class which was not correctly detecting + datatype classes of fields in nested compound datatypes in some + circumstances. QAK - 2003/08/30 + - Corrected bug in sieve buffer code which could cause loss of data + when a small dataset was created and deleted in quick succession. + QAK - 2003/08/27 + - Corrected bug in H5Gget_objname_by_idx which was not allowing NULL + for the name when just querying for the object name's length. + QAK - 2003/08/25 + - Corrected bug in variable-length string handling which could + generate a core dump on writing variable-length strings as part + of a compound datatype on certain architectures. QAK - 2003/08/25 + - Corrected bug in H5Tget_native_type which would incorrectly compute + the size of certain compound datatypes and also incorrectly + compute the offset of the last field for those compound datatypes. + QAK - 2003/08/25 + - Corrected bug in H5Tget_native_type which would drop string datatype + metadata (padding, etc.) QAK - 2003/08/25 + - Corrected bugs in H5Gget_num_objs, H5Gget_objname_by_idx and + H5Gget_objtype_by_idx to allow them to accept location IDs, not just + group IDs. QAK - 2003/08/21 + - Corrected bug when using scalar dataspace for memory selection and + operating on chunked dataset. QAK - 2003/08/18 + - Corrected bugs with multiple '/' characters in names for H5Glink + and H5Gunlink. QAK - 2003/08/16 + - Corrected bug with user blocks that didn't allow a user block to + be inserted in front of a file after the file was created. + QAK - 2003/08/13 + - Corrected errors with using point selections to access data in + chunked datasets. QAK - 2003/07/23 + - Corrected error with variable-length datatypes and chunked datasets + caused H5Dwrite to fail sometimes. QAK - 2003/07/19 + - Modified library and file format to support storing indexed storage + (chunked dataset) B-tree's with non-default internal 'K' values. + QAK - 2003/07/15 + - Returned H5T_BKG_TEMP support to library after it was accidentally + removed. QAK - 2003/07/14 + + Configuration + ------------- + - Configure can now use any tr command. No more need for + defining variable TR nor is it supported. -AKC 2006/05/19 + - Parallel I/O with the MPI-I/O driver will no longer work if the + filesystem is not POSIX compliant. The "HDF5_MPI_1_METAWRITE" + environment variable has been removed. QAK - 2004/01/30 + - Fixed the error that cause "make install" to fail because of the + macro definition syntax of "prefix?=..." AKC - 2003/07/22 + + Performance + ------------- + - Optimized I/O for enumerated datatypes that are a superset of source + enumerated datatype. QAK - 2005/03/19 + - More optimizations to inner loops of datatype conversions for + integers and floats which give a 10-50% speedup. QAK - 2003/11/07 + - Hoisted invariant 'if/else's out of inner datatype conversion loop for + integer and floating-point values, giving about a 20% speedup. + QAK - 2003/10/20 + + Tools + ----- + - Fixed h5dump regarding the display of blocks in hyperslab + selections. PVN 2008/01/16 + - Fixed h5diff regarding the display of NaN (Not a Number) + values. PVN 2008/01/16 + - Fixed h5dump regarding the parsing of binary output parameters. + PVN 2008/01/16 + - Fixed memory problems in h52gif and gif2h5. PVN 2008/01/16 + - Fixed h5repack dealing with NULL references. PVN 2008/01/16 + - Fixed h5dump & h5ls to display attributes in "name" order, rather + than the order they are encountered in the object header. + QAK - 2007/10/04 + - Fixed h5dump regarding the display of named datatypes + attributes. PVN 2007/03/13 + - Fixed h5dump regarding the display of group comments. PVN + 2007/03/13 + - Fixed h5dump regarding the display of hardlinks pointing + to the root group. PVN 2007/03/13 + - Fixed h5diff percentage option -p. PVN 2007/03/05 + - Fixed h5dump that caused array indices greater than 2 ^32-1 + not to be printed correctly - PVN 2007/2/19 + - Fixed h5dump to print attributes data in ASCII if -r option is used. + AKC - 2004/11/18 + - Fixed space utilization reported in h5ls to correct error in formula + used. QAK - 2004/10/22 + - Fixed h5redeploy which sometimes complain too many argument for the + test command. (The complain did not hinder the h5redploy to + proceed correctly.) AKC - 2003/11/03 + - Fixed a segmentation fault of h5diff when percentage option is used. + AKC - 2003/08/27 + - Switched away from tools using internal "fixtype" function(s) to use + H5Tget_native_type() internally. QAK - 2003/08/25 + + + Documentation + ------------- + + + F90 APIs + -------- + - h5pget_driver_f was returning information that could not be + interpreted by fortran application program; fixed. EIP - 2005/04/10 + + +Platforms Tested +================ +Platforms marked with * were not tested for hdf5-1.8.0-rc* release +(This information is somewhat out of date and may be inaccurate. It will be + updated for a later release) + +* AIX 5.2 (32/64 bit) xlc 8.0.0.11 + xlC 8.0 + xlf 10.01.0000.0 + mpcc_r 6.0.0.8 + mpxlf_r 8.1.1.7 +* AIX 5.3 (32/64 bit) xlc 7.0.0.8 + xlC 7.0.0.8 + xlf 09.01.0000.0007 +* Cray X1 water 3.0.35 Cray Standard C Version 5.4.0.7.4 + Cray Fortran 5.4.0.7.3 + Cray C++ 5.4.0.7.4 + FreeBSD 6.2-STABLE i386 gcc 3.4.6 [FreeBSD] 20060305 + (duty) g++ 3.4.6 [FreeBSD] 20060305 + gcc 4.2.1 20080123 + g++ 4.2.1 20080123 + gfortran 4.2.1 20070620 + FreeBSD 6.2-STABLE amd64 gcc 3.4.6 [FreeBSD] 20060305 + (liberty) g++ 3.4.6 [FreeBSD] 20060305 + gcc 4.2.1 20080123 + g++ 4.2.1 20080123 + gfortran 4.2.1 20080123 + +* HP-UX B.11.23 HP aC++/ANSI C B3910B A.06.00 + HP F90 v2.9.2 + HP aC++/ANSI C B3910B A.06.00 + IRIX64 6.5 (64 & n32) MIPSpro cc 7.4.4m + F90 MIPSpro 7.4.4m + C++ MIPSpro cc 7.4.4m + +* Linux 2.6.9 (RHEL4) Intel 10.0 compilers + (abe.ncsa.uiuc.edu) + Linux 2.4.21-47 gcc 3.2.3 20030502 + (osage) + Linux 2.6.9-42.0.10 gcc 3.4.6 20060404 + (kagiso) PGI 7.0-7 (pgcc, pgf90, pgCC) + Intel 9.1 (icc, ifort, icpc) + Linux 2.6.16.27 x86_64 AMD gcc 4.1.0 (SuSE Linux), g++ 4.1.0, g95 (GCC 4.0.3) + (smirom) PGI 6.2-5 (pgcc, pgf90, pgCC) + Intel 9.1 (icc, iort, icpc) + Linux 2.6.5-7.252.1-rtgfx #1 + SMP ia64 Intel(R) C++ Version 9.0 + (cobalt) Intel(R) Fortran Itanium(R) Version 9.0 + SGI MPI + SunOS 5.8 32,46 Sun WorkShop 6 update 2 C 5.3 + (Solaris 2.8) Sun WorkShop 6 update 2 Fortran 95 6.2 + Sun WorkShop 6 update 2 C++ 5.3 +* SunOS 5.10 i86pc Sun C 5.7 + Sun Fortran 95 8.1 + Sun C++ 5.7 + SunOS 5.10 cc: Sun C 5.8 + (linew) f90: Sun Fortran 95 8.2 + CC: Sun C++ 5.8 + Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre + (tungsten) gcc 3.2.2 20030222 + Intel(R) C++ Version 9.0 + Intel(R) Fortran Compiler Version 9.0 + IA-64 Linux 2.4.21.SuSE_292.til1 ia64 + (NCSA tg-login) gcc 3.2.2 + Intel(R) C++ Version 8.1 + Intel(R) Fortran Compiler Version 8.1 + mpich-gm-1.2.5..10-intel-r2 + Windows XP + Visual Studio .NET + Visual Studio 2005 w/ Intel Fortran 9.1 + Cygwin(native gcc compiler and g95) + MinGW(native gcc compiler and g95) + Windows XP x64 + Visual Studio 2005 w/ Intel Fortran 9.1 + Windows Vista + Visual Studio 2005 + + MAC OS 10.4 (Intel) gcc i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 + G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006) +* Alpha Open VMS 7.3 + + +Supported Configuration Features Summary +(This table was not modified for 1.8.0-rc* release; for information contact help@hdfgroup.org) +======================================== + + In the tables below + y = tested and supported + n = not supported or not tested in this release + x = not working in this release + dna = does not apply + ( ) = footnote appears below second table + = testing incomplete on this feature or platform + +Platform C F90 F90 C++ zlib SZIP + parallel parallel +SunOS5.8 64-bit n y n y y y +SunOS5.8 32-bit n y n y y y +SunOS5.10 64-bit y(1) y n y y y +SunOS5.10 32-bit y(1) y n y y y +IRIX64_6.5 64-bit n y y y y y +IRIX64_6.5 32-bit n n n n y y +Cray XT3 (16) n n n n n n +AIX-5.2 & 5.3 32-bit y y y y y y +AIX-5.2 & 5.3 64-bit y y y y y y +Windows XP n y(15) n(15) y y y +Windows XP x64 n y(15) n(15) y y y +Windows Vista n n n y y y +Mac OS X 10.4 PowerPC n n +FreeBSD 4.11 n n n y y y +RedHat EL3 W (3) y(1a) y(10) y(1a) y y y +RedHat EL3 W Intel (3) n y n y y n +RedHat EL3 W PGI (3) n y n y y n +SuSe x86_64 gcc (3,12) y(1a) y(11) n y y y +SuSe x86_64 Int (3,12) n y(13) n y y n +SuSe x86_64 PGI (3,12) n y(8) n y y y +Linux 2.4 Xeon C + Lustre Intel (3,6) n y n y y n +Linux 2.6 SuSE ia64 C + Intel (3,7) y y y y y n +Linux 2.6 SGI Altix + ia64 Intel (3) y y y y y y +Alpha OpenVMS 7.3.2 n y n y n n + + + +Platform Shared Shared Shared static- Thread- + C libs F90 libs C++ libs exec safe +Solaris2.8 64-bit y y y x y +Solaris2.8 32-bit y y y x y +Solaris2.10 64-bit y x y +Solaris2.10 32-bit y x y +IRIX64_6.5 64-bit y y n y y +IRIX64_6.5 32-bit y dna y y y +HPUX11.00 y n y x n +HPUX11.23-32bit y n n y n +HPUX11.23-64bit y dna n y n +Cray XT3 (16) n n n n n +AIX-5.2 & 5.3 32-bit n n n y n +AIX-5.2 & 5.3 64-bit n n n y n +Windows XP y y(15) y y y +Windows XP x64 y y(15) y y y +Windows Vista y n n y y +Mac OS X 10.3 y y n +Mac OS X 10.4 PowerPC +FreeBSD 4.11 y n y y y +RedHat EL3 W (3) y y(10) y y y +RedHat EL3 W Intel (3) y y y y n +RedHat EL3 W PGI (3) y y y y n +SuSe x86_64 W GNU (3,12) y y y y y +SuSe x86_64 W Int (3,12) y y y y(14) n +SuSe x86_64 W PGI (3,12) y y y y(14) n +Linux 2.4 Xeon C + Lustre Intel (6) y y y y n +Linux 2.4 SuSE + ia64 C Intel (7) y y y y n +Linux 2.4 SGI Altix + ia64 Intel y y n +Alpha OpenVMS 7.3.2 n n n y n + + Notes: (1) Using mpich 1.2.6. + (1a) Using mpich2 1.0.6. + (2) Using mpt and mpich 1.2.6. + (3) Linux 2.6 with GNU, Intel, and PGI compilers, as indicated. + W or C indicates workstation or cluster, respectively. + + (6) Linux 2.4.21-32.0.1. Xeon cluster with ELsmp_perfctr_lustre + and Intel compilers + (7) Linux 2.4.21, SuSE_292.till. Ia64 cluster with Intel compilers + (8) pgf90 + (9) With Compaq Visual Fortran 6.6c compiler. + (10) With PGI and Absoft compilers. + (11) PGI and Intel compilers for both C and Fortran + (12) AMD Opteron x86_64 + (13) ifort + (14) Yes with C and Fortran, but not with C++ + (15) Using Visual Studio 2005 or Cygwin + (16) Not tested for this release. + Compiler versions for each platform are listed in the preceding + "Platforms Tested" table. + + + +Known Problems +============== +* We discovered two problems when running collective IO parallel HDF5 tests + with chunking storage on ChaMPIon MPI compiler on tungsten, a linux + cluster at NCSA. + Under some complex selection cases, + 1) MPI_Get_element returns the wrong value. + 2) MPI_Type_struct also generates wrong derived data type and corrupt data + may be generated. + This only happens when turning on collective IO with chunking storage + with some complex selections. We haven't found these problems on other + MPI-IO compilers. If you encounter these problems, you may use Independent IO + instead. + + Change the following line in your code: + H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE); + + to + H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_INDEPENDENT); + + KY - 2007/08/24 + +* For SNL, spirit/liberty/thunderbird: The serial tests pass but parallel + tests failed with MPI-IO file locking message. AKC - 2007/6/25. +* On Intel 64 Linux cluster (RH 4, Linux 2.6.9) with Intel 10.0 compilers use + -mp -O1 compilation flags to build the libraries. Higher level of optimization + causes failures in several HDF5 library tests. +* For HPUX 11.23 many tools tests failed for 64-bit version when linked to the + shared libraries (tested for 1.8.0-beta2) +* For SNL, Red Storm: only paralle HDF5 is supported. The serial tests pass + and the parallel tests also pass with lots of non-fatal error messages. +* For LLNL, uP: both serial and parallel pass. Zeus: serial passes but + parallel fails with a known proglem in MPI. ubgl: serial passes but + parallel fails. +* on SUN 5.10 C++ test fails in the "Testing Shared Datatypes with Attributes" test +* configuring with --enable-debug=all produces compiler errors on most + platforms. Users who want to run HDF5 in debug mode should use + --enable-debug rather than --enable-debug=all to enable debugging + information on most modules. +* On Mac OS 10.4, test/dt_arith.c has some errors in conversion from long + double to (unsigned) long long and from (unsigned)long long to long double. +* On Altix SGI with Intel 9.0 testmeta.c would not compile with -O3 + optimization flag. +* On VAX, Scaleoffset filter isn't supported. The filter cannot be applied to + HDF5 data generated on VAX. Scaleoffset filter only supports IEEE standard + for floating-point data. +* On Cray X1, a lone colon on the command line of h5dump --xml (as in + the testh5dumpxml.sh script) is misinterpereted by the operating system + and causes an error. +* On mpich 1.2.5 and 1.2.6, we found that if more than two processes + contribute no IO and the application asks to do IO with collective, we found + that when using 4 processors, a simple collective write will be hung + sometimes. This can be verified with t_mpi test under testpar. +* On IRIX6.5, when C compiler version >7.4, the complicate MPI derived data type + code will work. However, the user should be aware to enlarge MPI_TYPE_MAX environment + variable to some certian value in order to use collective irregular selection code. + For example, the current parallel HDF5 test needs to enlarge MPI_TYPE_MAX to + 200,000 to make the test pass. +* The dataset created or rewritten with the v1.6.3 library or after can't + be read with the v1.6.2 library or before when Fletcher32 EDC(filter) is + enabled. There was a bug in the calculating code of the Fletcher32 + checksum in the library before v1.6.3. The checksum value wasn't consistent + between big-endian and little-endian systems. This bug was fixed in + Release 1.6.3. However, after fixing the bug, the checksum value is no + longer the same as before on little-endian system. The library release + after 1.6.4 can still read the dataset created or rewritten with the library + of v1.6.2 or before. SLU - 2005/6/30 +* For the version 6(6.02 and 6.04) of Portland Group compiler on AMD Opteron + processor, there's a bug in the compiler for optimization(-O2). The library + failed in several tests but all related to multi driver. The problem has + been reported to the vendor. +* On IBM AIX systems, parallel HDF5 mode will fail some tests with error + messages like "INFO: 0031-XXX ...". This is from the command poe. + Set the environment variable MP_INFOLEVEL to 0 to minimize the messages + and run the tests again. + The tests may fail with messages like "The socket name is already + in use". HDF5 does not use sockets (except for stream-VFD). This is + due to problems of the poe command trying to set up the debug socket. + Check if there are many old /tmp/s.pedb.* staying around. These are + sockets used by the poe command and left behind due to failed commands. + Ask your system administrator to clean them out. Lastly, request IBM + to provide a mean to run poe without the debug socket. + +* The C++ library's tests fails when compiling with PGI C++ compiler. The + workaround until the problem is correctly handled is to use the + flag "--instantiate=local" prior to the configure and build steps, as: + setenv CXX "pgCC --instantiate=local" for pgCC 5.02 and higher + + +* The stream-vfd test uses ip port 10007 for testing. If another + application is already using that port address, the test will hang + indefinitely and has to be terminated by the kill command. To try the + test again, change the port address in test/stream_test.c to one not + being used in the host. + +* The --enable-static-exec configure flag fails to compile for Solaris + platforms. This is due to the fact that not all of the system + libraries on Solaris are available in a static format. + + The --enable-static-exec configure flag also fails to correctly compile + on IBM SP2 platform for the serial mode. The parallel mode works fine + with this option. + + It is suggested that you don't use this option on these platforms + during configuration. + +* With the gcc 2.95.2 compiler, HDF 5 uses the `-ansi' flag during + compilation. The ANSI version of the compiler complains about not being + able to handle the `long long' datatype with the warning: + + warning: ANSI C does not support `long long' + + This warning is innocuous and can be safely ignored. + + +* The Stream VFD was not tested yet under Windows. It is not supported + in the TFLOPS machine. + + +* The ./dsets tests failed in the TFLOPS machine if the test program, + dsets.c, is compiled with the -O option. The hdf5 library still works + correctly with the -O option. The test program works fine if it is + compiled with -O1 or -O0. Only -O (same as -O2) causes the test + program to fail. + +* Certain platforms give false negatives when testing h5ls: + - Cray J90 and Cray T90IEEE give errors during testing when displaying + some floating-point values. These are benign differences due to + the different precision in the values displayed and h5ls appears to + be dumping floating-point numbers correctly. + +* Before building HDF5 F90 Library from source on Crays + replace H5Aff.f90, H5Dff.f90 and H5Pff.f90 files in the fortran/src + subdirectory in the top level directory with the Cray-specific files + from this site: + ftp://www.hdfgroup.uiuc.edu/pub/outgoing/hdf5/hdf5-1.8.0-pre/PATCH/ + +* Not all platforms behave correctly with szip's shared libraries. Szip is + disabled in these cases, and a message is relayed at configure time. Static + libraries should be working on all systems that support szip, and should be + used when shared libraries are unavailable. There is also a configure error + on Altix machines that incorrectly reports when a version of szip without + an encoder is being used. + +* On some platforms that use Intel and Absoft compilers to build HDF5 fortran library, + compilation may fail for fortranlib_test.f90, fflush1.f90 and fflush2.f90 + complaining about exit subroutine. Comment out the line + IF (total_error .ne. 0) CALL exit (total_error) + +* On IA32 and IA64 systems, if you use a compiler other than GCC (such as + Intel's ecc or icc compilers), you will need to modify the generated + "libtool" program after configuration is finished. On or around line 104 of + the libtool file, there are lines which look like: + + # How to pass a linker flag through the compiler. + wl="" + + change these lines to this: + + # How to pass a linker flag through the compiler. + wl="-Wl," + + UPDATE: This is now done automatically by the configure script. However, if + you still experience a problem, you may want to check this line in the + libtool file and make sure that it has the correct value. + +* Information about building with PGI and Intel compilers is available in + INSTALL file sections 5.7 and 5.8 + +* On at least one system, (SDSC DataStar), the scheduler (in this case + LoadLeveler) sends job status updates to standard error when you run + any executable that was compiled with the parallel compilers. + + This causes problems when running "make check" on parallel builds, as + many of the tool tests function by saving the output from test runs, + and comparing it to an exemplar. + + The best solution is to reconfigure the target system so it no longer + inserts the extra text. However, this may not be practical. + + In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to + the configure and build. This will cause "make check" to continue after + detecting errors in the tool tests. However, in the case of SDSC DataStar, + it also leaves you with some 150 "failed" tests to examine by hand. + + A second solution is to write a script to run serial tests and filter + out the text added by the scheduler. A sample script used on SDSC + DataStar is given below, but you will probably have to customize it + for your installation. + + Observe that the basic idea is to insert the script as the first item + on the command line which executes the the test. The script then + executes the test and filters out the offending text before passing + it on. + + #!/bin/csh + + set STDOUT_FILE=~/bin/serial_filter.stdout + set STDERR_FILE=~/bin/serial_filter.stderr + + rm -f $STDOUT_FILE $STDERR_FILE + + ($* > $STDOUT_FILE) >& $STDERR_FILE + + set RETURN_VALUE=$status + + cat $STDOUT_FILE + + tail +3 $STDERR_FILE + + exit $RETURN_VALUE + + You get the HDF make files and test scipts to execute your filter script + by setting the environment variable "RUNSERIAL" to the full path of the + script prior to running configure for parallel builds. Remember to + "unsetenv RUNSERIAL" before running configure for a serial build. + + Note that the RUNSERIAL environment variable exists so that we can + can prefix serial runs as necessary on the target system. On DataStar, + no prefix is necessary. However on an MPICH system, the prefix might + have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to + get the serial tests to run at all. + + In such cases, you will have to include the regular prefix in your + filter script. + +* H5Ocopy() does not copy reg_ref attributes correctly when shared-message + is turn on. The value of the reference in the destination attriubte is + wrong. This H5Ocopy problem will affect h5copy tool + +%%%%1.6.7%%%% Release Information for hdf5-1.6.7 (31/January/08) + +HDF5 version 1.6.7 released on Thu Jan 31 21:09:10 CST 2008 +================================================================================ + +INTRODUCTION +============ +This document describes the differences between HDF5-1.6.6 and HDF5-1.6.7 +It contains information on the platforms tested and known problems in +HDF5-1.6.7. For more details, check the HISTORY.txt file in the HDF5 source. + +HDF5 documentation can be found in the distributed release source code +in the subdirectory doc/html/ or on the THG (The HDF Group) FTP server: + + ftp://ftp.hdfgroup.org/HDF5/docs/ + +Documentation for the current release in the HDF5 Release 1.6.x series is +also on the HDF web site: + + http://hdfgroup.org/HDF5/doc1.6/ + +For more information, see the HDF5 home page: + + http://hdfgroup.org/products/hdf5/ + +If you have any questions or comments, please see the HDF Support page +for a list of available resources: + + http://hdfgroup.org/services/support.html + + +CONTENTS +======== +- New Features +- Support for New Platforms, Languages and Compilers +- Bug Fixes since HDF5-1.6.6 +- Documentation +- Platforms Tested +- Supported Configuration Features Summary +- Known Problems + + +New Features +============ + Configuration: + ------------------------- + '--enable-stream-vfd' and '--disable-stream-vfd' are no longer valid + configure options because the stream I/O driver has ben removed from + the distribution. + + Source code distribution + ======================== + Library: + -------- + The stream I/O driver is not included with the HDF5 Library in this + release. The source code files hdf5/src/H5FDstream.c and + hdf5/src/H5FDstream.h and the driver ENUM value H5FD_STREAM have been + removed. + + Parallel Library: + ----------------- + None + + Tools: + ------ + None + + F90 API: + -------- + None + + C++ API: + -------- + None + + +Support for New Platforms, Languages and Compilers +================================================== + +No new platorms, languages, or compilers are supported in this release. + + +Bug Fixes since HDF5-1.6.6 Release +================================== + + Library + ------- + - H5Iget_name could not be used with an object identifier returned + by H5Rdereference; the function would not be able to determine + a valid object name. It has been fixed. SLU - 2008/1/30 + - Changed library's behavior for reading files that might have + corrupted object header information from a previous (buggy) + version of the library. By default, the library now rebuilds the + correct object header information instead of issuing an error. + Previous "strict" file format interpretation can be enabled with + the "--enable-strict-format-checks" configure option. + QAK - 2008/01/13 + - Fixed bug in H5Epush() which was clearing the error stack before + pushing new error value. QAK - 2007/08/23 + - Fixed bug in H5Ewalk() which was not passing back the return value + from error stack walking callback. QAK - 2007/08/23 + + + Configuration + ------------- + None + + + Performance + ------------- + None + + + Tools + ----- + None + + + Documentation + ------------- + None + + + F90 API + ------- + None + + + C++ API + ------- + None + + +Documentation +============= + HDF5 documentation can be found in the distributed release source + code in the subdirectory doc/html/ (start with index.html) or on the + THG (The HDF Group) FTP server: + + ftp://ftp.hdfgroup.org/HDF5/docs/ + + Online documentation for the current release in the HDF5 Release 1.6.x + series can be found on the THG web site: + + http://hdfgroup.org/HDF5/doc1.6/ + + A listing of interface changes from release to release can be found + in the document "HDF5 Software Changes from Release to Release": + + http://hdfgroup.org/HDF5/doc1.6/ADGuide/Changes.html + + Since the stream I/O driver is not included in this release, the + functions H5Pset_fapl_stream and H5Pget_fapl_stream and the stream + ENUM value H5FD_STREAM have been removed from the documentation. + + +Platforms Tested +================ + + AIX 5.2 (32/64 bit) xlc 8.0.0.11 + (datastar) xlC 8.0 + xlf 10.01.0000.0002 + + FreeBSD 6.2 (32- and 64-bit) gcc and g++3.4.6 + (duty and liberty) gcc and g++ 4.2.1 + + IRIX64 6.5 MIPSpro cc 7.4.4m + (ucar mop1 64 & n32) F90 MIPSpro 7.4.4m (64 only) + C++ MIPSpro cc 7.4.4m + + Linux 2.4.21-47.ELsmp #1 SMP gcc 3.2.3 + i686 i386 GNU/Linux + (osage) + + Linux 2.6.9-42.0.10.ELsmp #1 gcc (GCC) 3.4.6 + SMP i686 i386 G95 (GCC 4.0.3 (g95 0.91!) April 18 2007) + (kagiso) PGI C, Fortran, C++ 7.0-7 32-bit + Intel(R) C Compiler for 32-bit + applications, Version 9.1 + Intel(R) C++ Compiler for 32-bit + applications, Version 9.1 + Intel(R) Fortran Compiler for 32-bit + applications, Version 9.1 + Absoft 32-bit Fortran 95 10.0.4 + MPICH mpich2-1.0.6p1 compiled with + gcc 4.2.1 and G95 (GCC 4.0.3 (g95 0.91!) + + Linux 2.6.16.46-0.12-debug #1 Intel(R) C++ Version 10.0.025 + SMP ia64 GNU/Linux Intel(R) Fortran Itanium(R) Version 10.0.025 + (ucar hir1) + + Linux 2.6.16.46-0.14-smp #1 Intel(R) C++ for Intel(R) EM64T Ver. 9.1.037 + SMP x86_64 GNU/Linux Intel(R) Fortran Intel(R) EM64T Ver. 9.1.031 + (smirom) PGI C, Fortran, C++ Version 7.0-7 + for 64-bit target on x86-64 + tested for both 32- and 64-bit binaries + + Linux 2.6.5-7.287.3-sn2 #1 Intel(R) C++ Version 9.0 + Altix SMP ia64 Intel(R) Fortran Itanium(R) Version 9.0 + (cobalt) SGI MPI + + SunOS 5.8 32- and 64-bit Sun WorkShop 6 update 2 C 5.3 + (sol) Sun WorkShop 6 update 2 Fortran 95 6.2 + Sun WorkShop 6 update 2 C++ 5.3 + + SunOS 5.10 32- and 64-bit Sun WorkShop 6 update 2 C 5.8 + (linew) Sun WorkShop 6 update 2 Fortran 95 8.2 + Sun WorkShop 6 update 2 C++ 5.8 + Patch 121019-06 + + Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre + (tungsten) Intel(R) C++ Version 9.0 + Intel(R) Fortran Compiler Version 9.0 + PGI C Version 6.0-5 + PGI C++ Version 6.0-5 + PGI Fortran Version 6.0-5 + gcc (GCC) 3.2.2 (Red Hat Linux 3.2.2-5) + + Xeon Linux 2.6.9-42.0.10.EL_lustre-1.4.10.1smp + (abe) Intel(R) C++ Version 10.0 + Intel(R) Fortran Compiler Version 10.0 + Open MPI 1.2.2 + + IA-64 Linux 2.4.21-309.tg1 #1 SMP + ia64 gcc (GCC) 3.2.2 + (NCSA tg-login) Intel(R) C++ Version 8.1 + Intel(R) Fortran Compiler Version 8.1 + mpich-gm-1.2.6..14-intel-r2 + + Windows XP Visual Studio 6.0 + Visual Studio .NET (with Intel Fortran 9.1) + Visual Studio 2005 (with Intel Fortran 9.1) + cygwin (gcc 3.4.4) + + Windows Vista Visual studio 2005 + MAC OS X Intel Darwin 8.10.1 + i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 + g95 0.91 + + +Supported Configuration Features Summary +======================================== + +Key: y = Tested and supported + n = Not supported or not tested in this release + C = Cluster + W = Workstation + ( ) = Footnote appears below second table + +Platform C F90 F90 C++ zlib SZIP + parallel parallel +Solaris2.8 32-bit n y n y n y +Solaris2.8 64-bit n y n n y y +Solaris2.10 32-bit n y n y y y +Solaris2.10 64-bit n y n n y y +IRIX64_6.5 32-bit n n n n y y +IRIX64_6.5 64-bit n y n n y y +WinXP Visual Studio 6.0 n n n y y y +WinXP CYGWIN n n n y y y +WinXP 2005 n y n y y y +WinXP .Net n y n y y y +WinVista 2005 n n n y y y +Mac OS X 10.4.10 n y n y y y +AIX-5.2 & 5.3 32- and 64-bit y y y y y y +FreeBSD 6.2 32- and 64-bit n n n y y y +RedHat Linux 2.4.21 W n n n n y n +RedHat Linux 2.6.9-42 i686 GNU (1) W y y y y y y +RedHat Linux 2.6.9-42 i686 Intel W n y n y y n +RedHat Linux 2.6.9-42 i686 PGI W n y n y y n +SuSE Linux 2.6.16 x86_64 GNU (1) W y y n y y y +SuSE Linux 2.6.16 x86_64 Intel W n y n y y n +SuSE Linux 2.6.16 x86_64 PGI W n y n y y n +RHEL 4 Linux 2.6.9 Xeon Lustre C n y n y y y +RedHat Linux 2.4 Xeon Lustre C n y n y y n +SuSE Linux 2.4 ia64 C y y y y y y +SuSe Linux 2.6.5 SGI Altix ia64 n y n y y y + + +Platform Shared static- Thread- + libraries(4) exec safe +Solaris2.8 32- and 64-bit y n y +Solaris2.10 32- and 64-bit y n y +IRIX64_6.5 32-bit y n y +IRIX64_6.5 64-bit y n y +WinXP Visual Studio 6.0 y n n +WinXP CYGWIN y n n +WinXP 2005 y n n +WinXP .Net y n n +WinVista 2005 y n n +Mac OS X 10.4.10 y n n +AIX-5.2 & 5.3 32- and 64-bit n n n +FreeBSD 6.2 32- and 64-bit y n n +RedHat Linux 2.4.21 W y n n +SuSE Linux 2.6.9-42 i686 GNU (1) W y n y +SuSE Linux 2.6.9-42 i686 Intel W y n n +SuSE Linux 2.6.9-42 i686 PGI W n n n +SuSE Linux 2.6.16 x86_64 GNU (1) W y n y +SuSE Linux 2.6.16 x86_64 Intel W y n n +SuSE Linux 2.6.16 x86_64 PGI W n n n +RHEL 4 Linux 2.6.9 Xeon Lustre C y n n +RedHat Linux 2.4 Xeon Lustre C y n n +SuSE Linux 2.4 ia64 C y n n +SuSe Linux 2.6.5 SGI Altix ia64 n n n + +Compiler versions for each platform are listed in the "Platforms Tested" +table found elsewhere in this file (RELEASE.txt). Unless otherwise noted, +compilers used are the system compilers. + +Footnotes: +(1) Fortran compiled with g95. + + +Known Problems +============== +* We discovered two problems when running collective IO parallel HDF5 tests + with chunking storage with the ChaMPIon MPI compiler on tungsten, a Linux + cluster at NCSA. + Under some complex selection cases, + 1) MPI_Get_element returns the wrong value. + 2) MPI_Type_struct also generates the wrong derived datatype and corrupt + data may be generated. + This only happens when turning on collective IO with chunking storage + with some complex selections. We haven't found these problems on other + MPI-IO compilers. If you encounter these problems, you may use Independent + IO instead. + + To avoid this problem, change the following line in your code: + H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_COLLECTIVE); + + to + H5Pset_dxpl_mpio(xfer_plist, H5FD_MPIO_INDEPENDENT); + + KY - 2007/08/24 + +* QSC (an HP alpha-based OSF1 cluster) does not create h5pfc correctly. It + does not include the -lmpi properly. This will be fixed in the next + release. AKC - 2007/08/07. + +* On IRIX64 6.5 (UCAR SGI mop1), when testing HDF5 tools with an HDF5 shared + library, especially for h5repacktst and h52gifgentst, the following (or a + similar) error message may appear: + "523648:lt-h5repacktst: rld: Fatal Error: Cannot Successfully map soname + 'libh5test.so.1' under any of the filenames .......(bunch of directories) + " + And the testing will fail. + + We believe this is a libtool problem. One way to get rid of this is to + add the paths of libh5test.so.1 and libh5.so.1 to the shared library path. + + For 32-bit: + You may do this, under csh: + setenv LD_LIBRARYN32_PATH .......(existing paths):[full path of HDF5 + directory/test/.libs]:[full path of HDF5 directory/src/.libs] + + For 64-bit: + setenv LD_LIBRARY64_PATH ......(existing paths):[full path of HDF5 + directory/test/.libs]:[full path of HDF5 directory/src/.libs] + + NOTE: This problem ONLY affects the testing of the HDF5 library when you + build from source. It won't affect any applications that would like to link + with the HDF5 shared library since the shared library path needs to be set + anyway. KY - 2007/8/2 + +* QSC (an HP alpha-based OSF1 cluster) failed the testpar/testphdf5 sub-test + "calloc". All other tests passed. This indicates that a dataset using + chunked storage created by serial HDF5 may not work properly with parallel + HDF5. The calloc test can be skipped by running "prun ... testphdf5 -x + calloc". AKC - 2007/7/12. + +* The Intel C Compiler for the Linux x86_64 platform (EM64T-based, v8.1) has + an optimization error in the datatypes conversion code. Before running + configure, edit the file config/intel-flags by changing the setting of + PROD_CFLAGS from -O3 to -O0. Then run configure. AKC - 2005/11/10. + +* When testing parallel HDF5 with the C compiler version MIPSpro 7.4.3 on IRIX + 6.5, set the environment variable MPI_TYPE_MAX to be a bigger number, for + example 120000, in order to pass the complicated collective IO tests inside + the parallel HDF5 library. This is not a problem inside the parallel HDF5 + library. You can always set a bigger number on your system. KY - 2005/10/6 + +* A contiguous or chunked dataset created by a sequential version of HDF5 + might not be able to be modified with a parallel version of the library. + Use the H5Pset_alloc_time function with H5D_ALLOC_TIME_EARLY to set up the + dataset creation property list to avoid the problem. EIP - 2005/09/09 + +* A dataset created or rewritten with the v1.6.3 library or after can't + be read with the v1.6.2 library or before when Fletcher32 EDC (a filter) is + enabled. There was a bug in the calculating code of the Fletcher32 + checksum in the library before v1.6.3. The checksum value wasn't consistent + between big-endian and little-endian systems. This bug was fixed in + Release 1.6.3. However, after fixing the bug, the checksum value is no + longer the same as before on little-endian system. HDF5 library releases + after 1.6.4 can still read datasets created or rewritten with an HDF5 + library of v1.6.2 or before. SLU - 2005/7/8 + +* For version 6 (6.02 and 6.04) of the Portland Group compiler on AMD Opteron + processor, there's a bug in the compiler for optimization(-O2). The library + failed in several tests, all related to the multi driver. The problem has + been reported to the vendor. + +* test/big fails sometimes with the message "Possible overlap with another + region." The test selects regions randomly, and this error occurs when + two regions overlap each other; it is a bug in the test and not in + HDF5. Since the error is triggered by a random situation, it will + usually disappear if the test is re-run. + +* Newer SGI MIPSpro compilers (version 7.4.x) support C99 features but + have a "guard" statement in stdint.h that will #error and skip the rest + of the header file if the C99 option is not used explicitly. Hardsetting + $CC to c99 will resolve the problem. AKC - 2004/12/13 + +* On IBM AIX systems, parallel HDF5 mode will fail some tests with error + messages like "INFO: 0031-XXX ...". This is from the command poe. + Set the environment variable MP_INFOLEVEL to 0 to minimize the messages + and run the tests again. + + The tests may also fail with messages like "The socket name is already + in use". HDF5 does not use sockets. This is due to problems of the + poe command trying to set up the debug socket. Check whether there are + many old /tmp/s.pedb.* files staying around. These are sockets used by + the poe command and left behind due to failed commands. Ask your system + administrator to clean them out. Lastly, request IBM to provide a means + to run poe without the debug socket. + +* The h5dump tests may fail to match the expected output on some platforms + (e.g. parallel jobs, Windows) where the error messages directed to + "stderr" do not appear in the "right order" with output from stdout. + This is not an error. + +* The --enable-static-exec configure flag fails to compile for Solaris + platforms. This is due to the fact that not all of the system + libraries on Solaris are available in a static format. + + The --enable-static-exec configure flag also fails to correctly compile + on the IBM SP2 platform for the serial mode. The parallel mode works fine + with this option. + + The --enable-static-exec configure flag also fails to correctly compile + on the HPUX 11.00. + + It is suggested that you don't use this option on these platforms + during configuration. + +* Use the --disable-shared configure flag if building with an Absoft Fortran + compiler. + +* Information about building with PGI and Intel compilers is available in + INSTALL file sections 5.7 and 5.8. + +* In LANL QSC, the new cc compiler has problems converting small values of + long long (absolute values less than 1**-308) to double. This triggers + the test/dtypes to report failure in the following test: + Testing random sw long double -> double conversions + If -ieee is used, the converted doubles spread over the range 0.0 to + 10**-308. If -ieee is not used, the converted double values are mostly + 0.0, but occasionally appear as 10**-308. This has been reported to the + system staff. + + All other tests have passed. + +* On at least one system, SDSC DataStar, the scheduler (in this case + LoadLeveler) sends job status updates to standard error when you run + any executable that was compiled with the parallel compilers. + + This causes problems when running "make check" on parallel builds, as + many of the tool tests function by saving the output from test runs, + and comparing it to an exemplar. + + The best solution is to reconfigure the target system so it no longer + inserts the extra text. However, this may not be practical. + + In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to + the configure and build. This will cause "make check" to continue after + detecting errors in the tool tests. However, in the case of SDSC DataStar, + it also leaves you with some 150 "failed" tests to examine by hand. + + A second solution is to write a script to run serial tests and filter + out the text added by the scheduler. A sample script used on SDSC + DataStar is given below, but you will probably have to customize it + for your installation. + + Observe that the basic idea is to insert the script as the first item + on the command line which executes the test. The script then + executes the test and filters out the offending text before passing + it on. + + #!/bin/csh + + set STDOUT_FILE=~/bin/serial_filter.stdout + set STDERR_FILE=~/bin/serial_filter.stderr + + rm -f $STDOUT_FILE $STDERR_FILE + + ($* > $STDOUT_FILE) >& $STDERR_FILE + + set RETURN_VALUE=$status + + cat $STDOUT_FILE + + tail +3 $STDERR_FILE + + exit $RETURN_VALUE + + You get the HDF5 make files and test scripts to execute your filter script + by setting the environment variable "RUNSERIAL" to the full path of the + script prior to running configure for parallel builds. Remember to + "unsetenv RUNSERIAL" before running configure for a serial build. + + Note that the RUNSERIAL environment variable exists so that we can + prefix serial runs as necessary on the target system. On DataStar, + no prefix is necessary. However, on an MPICH system, the prefix might + have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to + get the serial tests to run at all. + + In such cases, you will have to include the regular prefix in your + filter script. JM - 2004/9/15 + +%%%%1.6.6%%%% Release Information for hdf5-1.6.6 (16/August/08) + +HDF5 version 1.6.6 released on Thu Aug 16 11:17:10 CDT 2007 +================================================================================ + +INTRODUCTION +============ +This document describes the differences between HDF5-1.6.5 and +HDF5-1.6.6 It contains information on the platforms tested and +known problems in HDF5-1.6.6. For more details, check the HISTORY.txt +file in the HDF5 source. + +HDF5 documentation can be found in the distributed release source +code in the subdirectory doc/html/ or on the THG (The HDF Group) +ftp server (ftp.hdfgroup.org) in the directory: + + /HDF5/docs/ + +Documentation for the current release is also on the HDF web site: + + http://hdfgroup.org/HDF5/doc/ + +For more information, see the HDF5 home page at: + + http://hdfgroup.org/HDF5/ + +If you have any questions or comments, please send them to: + + help@hdfgroup.org + + +CONTENTS +======== +- New Features +- Support for New Platforms, Languages and Compilers +- Bug Fixes since HDF5-1.6.5 +- Documentation +- Platforms Tested +- Supported Configuration Features Summary +- Known Problems + + +New Features +============ + Configuration: + ------------------------- + - HDF5 now uses autoconf 2.61 to generate configure. MAM - 2007/7/25. + + Source code distribution + ======================== + Library: + -------- + - None + + Parallel Library: + ----------------- + - None + + Tools: + ------ + - h52gif and gif2h5: Both these tools were revised to include High + Level Image API support. Tests were added to /hl/tools/gif2h5. + PVN - 2007/04/13 + - h5dump: Added support for double long type H5T_NATIVE_LDOUBLE. + PVN - 2007/03/13 + - h5dump: Added support for binary output; see usage. PVN 2007/03/13 + - h5repack: Added support for reading and writing by hyperslabs for + large files. PVN - 2007/03/01 + - h5repack: A new option allows the copy to use the source file type + (default) instead of the previous conversion to native type. + PVN - 2007/03/01 + - h5repack: Added output of the percentage of compression achieved. + PVN - 2007/03/01 + - h5diff: Added support for comparing dataset regions. PVN - + 2007/02/20 + - h5diff: Added support for reading and comparing by hyperslabs for + large files. PVN - 2007/02/20 + - h5diff: Added printing of dataset dimensions along with dataset + name. + PVN - 2007/02/19 + + F90 API: + -------- + - None + + C++ API: + -------- + - Added support for Szip: DSetCreatPropList::setSzip - BMR 2007/01/24 + + +Support for New Platforms, Languages and Compilers +================================================== + - Added support for MAC Intel (Darwin 8.8.2) (gcc 4.0.1 and g95 0.91) + EIP - 2007/02/13 + - Added support for GNU C compiler version 4.2.1 for FreeBSD 6.2 + (32- and 64-bit) + + +Bug Fixes since HDF5-1.6.5 Release +================================== + + Library + ------- + - Fixed several bugs with writing fill values for datasets that have + a variable-length datatype or component datatype. QAK - +2007/06/19 + - STDIO driver didn't support files bigger than 2GB because the OFFSET + parameter of fseek is of type LONG INT, not big enough for big + files. Use fseeko instead for big files if it's available on the + system. SLU - 2007/4/5 + - Relaxed restrictions on attribute operations to allow a file ID to + be used as the "location ID". If a file ID is used, the attribute + operation will occur on the root group of the file. + QAK - 2007/02/09 + - Fixed a bug in H5Sselect_valid() that caused an incorrect value to + be returned (0) instead of FAIL on error conditions such as the + selection or extent not being defined. CMC - 2007/01/05 + - Fixed potential file corruption bug which could overwrite a portion + of an object's header when an attribute was renamed. If the new + name for the attribute was longer than the old name, it was +possible + that the attribute would grow enough to overwrite another message + in the object's header. QAK - 2007/01/02 + - Fixed file corruption bug which could write an incorrect number of + messages to an object's header under certain circumstances. + Generally, the sequence of actions to generate this bug looks + like this: + - Create an object. + - Close the file. + - Re-open the file. + - Add 2 (or more) attributes to the object. + - Close the file. + - Re-open the file. + - Delete one of the attributes on the object. + - Add a smaller attribute to the object. + - Delete the smaller atttribute on the object. + - Add a larger attribute on the object. + + After this, the number of header messages stored for the object + will be off by one. Other sequences of modifying attributes on an + object could also trigger this bug. If you are opening an + object and the bottom few messages of the HDF5 error stack + resembles the following, the object has been affected by this bug: + + #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry(): +unable to load entry + major(08): Meta data cache layer + minor(40): Unable to load metadata into cache + #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load(): +corrupt object header - too few messages + major(12): Object header layer + minor(40): Unable to load metadata into cache + + Specifically, "corrupt object header" is the best string to search + for in the HDF5 error stack output. + + If your files have been affected by this bug, or you are concerned + that your files might have been, please contact the HDF Helpdesk + at help@hdfgroup.org for a tool to detect and repair files + affected by this problem. QAK - 2006/6/16 + + - Fixed various problems with retrieving names of objects, especially + with mounted files. QAK - 2005/12/25 + + Configuration + ------------- + - Changed to default to --disable-shared if parallel is enabled. + AKC - 2007/5/12 + - Corrected a coding error in configure when it tries to locate the + needed MPI and MPI-IO library for the fortran interface. + AKC - 007/5/9. + - Changed default fortran compiler to g95 when gcc is used. + AKC - 007/2/17. + - Configure can now use any tr command. No more need for + defining the variable TR, nor is it supported. AKC - 2006/05/20 + + Performance + ------------- + - None + + Tools + ----- + - Fixed a bug in h5dump regarding the display of named datatypes + attributes. PVN - 2007/03/13 + - Fixed a bug in h5dump regarding the display of group comments. + PVN - 2007/03/13 + - Fixed a bug in h5dump regarding the display of hardlinks pointing + to the root group. PVN - 2007/03/13 + - Fixed a bug in the h5diff percentage option -p. PVN - 2007/03/05 + - Fixed a bug in h5dump that caused array indices greater than 2^32-1 + not to be printed correctly. PVN - 2007/2/19 + + Documentation + ------------- + - Corrected errors and extended the descriptions in Reference Manual + entries for several functions. + + F90 API + ------- + - None + + C++ API + ------- + - Changed + StrType::StrType(const size_t& size); + to + StrType::StrType(const int dummy, const size_t& size); + because the first one clashed with + StrType::StrType(const hid_t existing_id); - BMR 2007/05/03 + - Wrappers of H5Rcreate had incorrect prototypes. Added these + overloaded functions: + IdComponent::reference(void* ref, const char* name, +DataSpace& + dataspace, H5R_type_t ref_type = H5R_DATASET_REGION) + IdComponent::void reference(void* ref, const char* name) + IdComponent::reference(void* ref, const H5std_string& name) + and will remove these incorrect member functions: + DataSet::Reference + DataType::Reference + Group::Reference + H5File::Reference + - Added wrappers for H5Rdereference as constructors: + DataSet(IdComponent& obj, void* ref); + Group(IdComponent& obj, void* ref); + DataType(IdComponent& obj, void* ref); + + +Documentation +============= + + HDF5 documentation can be found in the distributed release source + code in the subdirectory doc/html/ (start with index.html) or on the + THG (The HDF Group) ftp server (ftp.hdfgroup.org) in the directory: + + /HDF5/docs/ + + Online documentation for the current release can be found on the THG + web site: + + http://hdfgroup.org/HDF5/doc/ + + +Platforms Tested +================ + + AIX 5.2 (32/64 bit) xlc 6.0.0.8 + (datastar) xlC 6.0.0.9 + xlf 8.1.1.7 + mpcc_r 6.0.0.8 + mpxlf_r 8.1.1.7 + + AIX 5.3 (32/64 bit) xlc 7.0.0.0 + (copper) xlC 7.0. + xlf 9.1.0.3 + + FreeBSD 6.2 (32- and 64-bit) gcc and g++3.4.6 + (duty and liberty) gcc and g++ 4.2.1 + + HP-UX B.11.23 HP aC++/ANSI C B3910B A.06.02 + (sirius) HP F90 v3.1 (32-bit only) + HP aC++/ANSI C B3910B A.06.02 + + IRIX64 6.5 MIPSpro cc 7.4.4m + (ucar mop1 64 & n32) F90 MIPSpro 7.4.4m (64 only) + C++ MIPSpro cc 7.4.4m + + Linux 2.4.21-47.ELsmp #1 SMP gcc 3.2.3 + i686 i386 GNU/Linux + (osage) + + Linux 2.6.9-42.0.10.ELsmp #1 gcc (GCC) 3.4.6 + SMP i686 i386 G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006) + (kagiso) PGI C, Fortran, C++ 6.2-5 32-bit + icc (ICC) 9.1 + Intel(R) C++ Compiler for 32-bit + applications, Version 9.1 + Intel(R) Fortran Compiler for 32-bit + applications, Version 9.1 + Absoft 32-bit Fortran 95 10.0.4 + MPICH mpich2-1.0.4p1 compiled with + gcc 3.4.6 and G95 (GCC 4.0.3 (g95 0.91!) + + Linux 2.6.16.46-0.12-debug #1 + SMP ia64 GNU/Linux Intel(R) C++ Version 10.0.025 + (ucar hir1) Intel(R) Fortran Itanium(R) Version 10.0.025 + + Linux 2.6.16.46-0.14-smp #1 Intel(R) C++ for Intel(R) EM64T Ver. 9.1.037 + SMP x86_64 GNU/Linux Intel(R) Fortran Intel(R) EM64T Ver. 9.1.031 + (smirom) PGI C, Fortran, C++ Version 6.2-5 + for 64-bit target on x86-64 + tested for both 32- and 64-bit binaries + + Linux 2.6.5-7.283-rtgfx Altix + SMP ia64 Intel(R) C++ Version 9.0 + (cobalt) Intel(R) Fortran Itanium(R) Version 9.0 + SGI MPI + + OSF1 V5.1 (QSC) Compaq C V6.5-011 + (See "Known Problems.") HP Fortran V5.5A-3548 + Compaq C++ V6.5-036 + MPIX200_64_r13.4 + + SunOS 5.8 32- and 64-bit Sun WorkShop 6 update 2 C 5.3 + (sol) Sun WorkShop 6 update 2 Fortran 95 6.2 + Sun WorkShop 6 update 2 C++ 5.3 + + SunOS 5.10 32- and 64-bit Sun WorkShop 6 update 2 C 5.8 + (linew) Sun WorkShop 6 update 2 Fortran 95 8.2 + Sun WorkShop 6 update 2 C++ 5.8 + Patch 121019-06 + + Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre + (tungsten) Intel(R) C++ Version 9.0 + Intel(R) Fortran Compiler Version 9.0 + PGI C Version 6.0 + PGI C++ Version 6.0 + PGI Fortran Version 6.0 + gcc (GCC) 3.2.2 (Red Hat Linux 3.2.2-5) + + Xeon Linux 2.6.9-42.0.10.EL_lustre-1.4.10.1smp + (abe) Intel(R) C++ Version 10.0 + Intel(R) Fortran Compiler Version 10.0 + Open MPI 1.2.2 + + IA-64 Linux 2.4.21.SuSE_292.til1 + ia64 gcc (GCC) 3.2.2 + (NCSA tg-login) Intel(R) C++ Version 8.0 + Intel(R) Fortran Compiler Version 8.0 + mpich-gm-1.2.5..10-intel-r2 + + Windows XP Visual Studio 6.0 + Visual Studio .NET (with Intel Fortran 9.0) + Visual Studio 2005 (with Intel Fortran 9.0) + cygwin (gcc 3.4.4) + + MAC OS X Intel Darwin 8.10.1 + i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 + g95 0.91 + + +Supported Configuration Features Summary +======================================== + +Key: y = Tested and supported + n = Not supported or not tested in this release + C = Cluster + W = Workstation + ( ) = Footnote appears below second table + +Platform C F90 F90 C++ zlib SZIP + parallel parallel +Solaris2.8 32- and 64-bit n y n y y y +Solaris2.10 32- and 64-bit n y n y y y +IRIX64_6.5 32-bit n n n n y y +IRIX64_6.5 64-bit n y n n y y +HPUX11.23-32bit n y n y y y +HPUX11.23-64bit n n n y y y +WinXP Visual Studio 6.0 n n n y y y +WinXP CYGWIN n n n y y y +WinXP 2005 n y n y y y +WinXP .Net n y n y y y +Mac OS X 10.4.10 n y n y y y +AIX-5.2 & 5.3 32- and 64-bit y y y y y y +FreeBSD 6.2 32- and 64-bit n n n y y y +RedHat Linux 2.4.21 W n n n y y y +SuSE Linux 2.6.9-42 i686 GNU (1) W y y y y y y +SuSE Linux 2.6.9-42 i686 Intel W n y n y y y +SuSE Linux 2.6.9-42 i686 PGI W n y n y y y +SuSE Linux 2.6.16 x86_64 GNU (1) W y y y y y y +SuSE Linux 2.6.16 x86_64 Intel W n y n y y y +SuSE Linux 2.6.16 x86_64 PGI W n y n y y y +RHEL 4 Linux 2.6.9 Xeon Lustre C y y y y y y +RedHat Linux 2.4 Xeon Lustre C n y n y y y +SuSE Linux 2.4 ia64 C y y y y y y +SuSe Linux 2.6.16 SGI Altix ia64 n y n y y y +SuSe Linux 2.6.5 SGI Altix ia64 n y n y y y +OSF1 v5.1 y y y y y n + + +Platform Shared static- Thread- STREAM- + libraries(4) exec safe VFD +Solaris2.8 32- and 64-bit y n y y +Solaris2.10 32- and 64-bit y n y y +IRIX64_6.5 32-bit y n y y +IRIX64_6.5 64-bit y n y y +HPUX11.23-32bit y (3) n n y +HPUX11.23-64bit y (3) n n y +WinXP Visual Studio 6.0 y n n n +WinXP CYGWIN y n n n +WinXP 2005 y n n n +WinXP .Net y n n n +Mac OS X 10.4.10 y n n y +AIX-5.2 & 5.3 32- and 64-bit n n n y +FreeBSD 6.2 32- and 64-bit y n n y +RedHat Linux 2.4.21 W y n n y +SuSE Linux 2.6.9-42 i686 GNU (1) W y n y y +SuSE Linux 2.6.9-42 i686 Intel W y n n y +SuSE Linux 2.6.9-42 i686 PGI W n n n y +SuSE Linux 2.6.16 x86_64 GNU (1) W y n n y +SuSE Linux 2.6.16 x86_64 Intel W y n n y +SuSE Linux 2.6.16 x86_64 PGI W n n n y +RHEL 4 Linux 2.6.9 Xeon Lustre C y n n y +RedHat Linux 2.4 Xeon Lustre C y n n y +SuSE Linux 2.4 ia64 C y n n y +SuSe Linux 2.6.16 SGI Altix ia64 n n n y +SuSe Linux 2.6.5 SGI Altix ia64 n n n y +OSF1 v5.1 n n n y + +Compiler versions for each platform are listed in the "Platforms Tested" +table found elsewhere in this file (RELEASE.txt). Unless otherwise noted, +compilers used are the system compilers. + +Footnotes: +(1) Fortran compiled with g95. +(2) In most cases, shared libraries are provided only for the C library, + except on Windows where they are provided for C, C++, and Fortran. +(3) C++ works only with static libraries. + + +Known Problems +============== +* QSC (an HP alpha-based OSF1 cluster) does not create h5pfc correctly. It + does not include the -lmpi properly. This will be fixed in the next + release. AKC - 2007/08/07. + +* On IRIX64 6.5 (UCAR SGI mop1), when testing HDF5 tools with an HDF5 shared + library, especially for h5repacktst and h52gifgentst, the following (or + similar) error message may appear: + "523648:lt-h5repacktst: rld: Fatal Error: Cannot Successfully map soname + 'libh5test.so.1' under any of the filenames .......(bunch of directories) + " + And the testing will fail. + We believe this is a libtool problem. One way to get rid of this is to + add the paths of libh5test.so.1 and libh5.so.1 to the shared library path. + + For 32-bit: + You may do this, under csh: + setenv LD_LIBRARYN32_PATH .......(existing pathes):[full path of HDF5 + directory/test/.libs]:[full path of HDF5 directory/src/.libs] + + For 64-bit: + setenv LD_LIBRARY64_PATH ......(existing pathes):[full path of HDF5 + directory/test/.libs]:[full path of HDF5 directory/src/.libs] + + NOTE: This problem ONLY affects the testing of the HDF5 library when you + build from source. It won't affect any applications that would like to link + with the HDF5 shared library since the shared library path needs to be set + anyway. KY - 2007/8/2 + +* QSC (an HP alpha-based OSF1 cluster) failed the testpar/testphdf5 sub-test + "calloc". All other tests passed. This indicates that a dataset using + chunked storage created by serial HDF5 may not work properly with parallel + HDF5. The calloc test can be skipped by running "prun ... testphdf5 -x + calloc". AKC - 2007/7/12. + +* The Intel C Compiler for the Linux x86_64 platform (EM64T-based, v8.1) has + an optimization error in the datax types conversion code. Before running + configure, edit the file config/intel-flags by changing the setting of + PROD_CFLAGS from -O3 to -O0. Then run configure. AKC - 2005/11/10. + +* When testing parallel HDF5 with the C compiler version MIPSpro 7.4.3 on IRIX + 6.5, set the environment variable MPI_TYPE_MAX to be a bigger number, for + example 120000, in order to pass the complicated collective IO tests inside + the parallel HDF5 library. This is not a problem inside the parallel HDF5 + library. You can always set a bigger number on your system. KY - 2005/10/6 + +* A contiguous or chunked dataset created by a sequential version of HDF5 + might not be able to be modified with a parallel version of the library. + Use the H5Pset_alloc_time function with H5D_ALLOC_TIME_EARLY to set up the + dataset creation property list to avoid the problem. EIP - 2005/09/09 + +* The dataset created or rewritten with the v1.6.3 library or after can't + be read with the v1.6.2 library or before when Fletcher32 EDC (a filter) is + enabled. There was a bug in the calculating code of the Fletcher32 + checksum in the library before v1.6.3. The checksum value wasn't consistent + between big-endian and little-endian systems. This bug was fixed in + Release 1.6.3. However, after fixing the bug, the checksum value is no + longer the same as before on little-endian system. The library release + after 1.6.4 can still read the dataset created or rewritten with the library + of v1.6.2 or before. SLU - 2005/7/8 + +* For version 6 (6.02 and 6.04) of the Portland Group compiler on AMD Opteron + processor, there's a bug in the compiler for optimization(-O2). The library + failed in several tests, all related to the multi driver. The problem has + been reported to the vendor. + +* test/big fails sometimes with the message "Possible overlap with another + region." The test selects regions randomly, and this error occurs when + two regions overlap each other; it is a bug in the test and not in + HDF5. Since the error is triggered by a random situation, it will + usually disappear if the test is re-run. + +* Newer SGI MIPSpro compilers (version 7.4.x) support C99 features but + have a "guard" statement in stdint.h that will #error and skip the rest + of the header file if the C99 option is not used explicitly. Hardsetting + $CC to c99 will resolve the problem. AKC - 2004/12/13 + +* On IBM AIX systems, parallel HDF5 mode will fail some tests with error + messages like "INFO: 0031-XXX ...". This is from the command poe. + Set the environment variable MP_INFOLEVEL to 0 to minimize the messages + and run the tests again. + + The tests may also fail with messages like "The socket name is already + in use". HDF5 does not use sockets (except for stream-VFD). This is + due to problems of the poe command trying to set up the debug socket. + Check whether there are many old /tmp/s.pedb.* files staying around. These + are sockets used by the poe command and left behind due to failed commands. + Ask your system administrator to clean them out. Lastly, request IBM + to provide a means to run poe without the debug socket. + +* The h5dump tests may fail to match the expected output on some platforms + (e.g. parallel jobs, Windows) where the error messages directed to + "stderr" do not appear in the "right order" with output from stdout. + This is not an error. + +* The stream-vfd test uses ip port 10007 for testing. If another + application is already using that port address, the test will hang + indefinitely and has to be terminated by the kill command. To try the + test again, change the port address in test/stream_test.c to one not + being used in the host. + +* The --enable-static-exec configure flag fails to compile for Solaris + platforms. This is due to the fact that not all of the system + libraries on Solaris are available in a static format. + + The --enable-static-exec configure flag also fails to correctly compile + on the IBM SP2 platform for the serial mode. The parallel mode works fine + with this option. + + The --enable-static-exec configure flag also fails to correctly compile + on the HPUX 11.00. + + It is suggested that you don't use this option on these platforms + during configuration. + +* The Stream VFD is not supported under Windows. + +* Use the --disable-shared configure flag if building with Absoft Fortran + compiler. + +* Information about building with PGI and Intel compilers is available in + INSTALL file sections 5.7 and 5.8. + +* In LANL QSC, the new cc compiler has problems converting small values of + long long (absolute values less than 1**-308) to double. This triggers + the test/dtypes to report failure in the following test: + Testing random sw long double -> double conversions + If -ieee is used, the converted doubles spread over the range 0.0 to + 10**-308. If -ieee is not used, the converted double values are mostly + 0.0, but occasionally appear as 10**-308. This has been reported to the + system staff. + + All other tests have passed. + +* On at least one system, SDSC DataStar, the scheduler (in this case + LoadLeveler) sends job status updates to standard error when you run + any executable that was compiled with the parallel compilers. + + This causes problems when running "make check" on parallel builds, as + many of the tool tests function by saving the output from test runs, + and comparing it to an exemplar. + + The best solution is to reconfigure the target system so it no longer + inserts the extra text. However, this may not be practical. + + In such cases, one solution is to "setenv HDF5_Make_Ignore yes" prior to + the configure and build. This will cause "make check" to continue after + detecting errors in the tool tests. However, in the case of SDSC DataStar, + it also leaves you with some 150 "failed" tests to examine by hand. + + A second solution is to write a script to run serial tests and filter + out the text added by the scheduler. A sample script used on SDSC + DataStar is given below, but you will probably have to customize it + for your installation. + + Observe that the basic idea is to insert the script as the first item + on the command line which executes the test. The script then + executes the test and filters out the offending text before passing + it on. + + #!/bin/csh + + set STDOUT_FILE=~/bin/serial_filter.stdout + set STDERR_FILE=~/bin/serial_filter.stderr + + rm -f $STDOUT_FILE $STDERR_FILE + + ($* > $STDOUT_FILE) >& $STDERR_FILE + + set RETURN_VALUE=$status + + cat $STDOUT_FILE + + tail +3 $STDERR_FILE + + exit $RETURN_VALUE + + You get the HDF5 make files and test scripts to execute your filter script + by setting the environment variable "RUNSERIAL" to the full path of the + script prior to running configure for parallel builds. Remember to + "unsetenv RUNSERIAL" before running configure for a serial build. + + Note that the RUNSERIAL environment variable exists so that we can + prefix serial runs as necessary on the target system. On DataStar, + no prefix is necessary. However, on an MPICH system, the prefix might + have to be set to something like "/usr/local/mpi/bin/mpirun -np 1" to + get the serial tests to run at all. + + In such cases, you will have to include the regular prefix in your + filter script. JM - 2004/9/15 + + %%%%1.6.5%%%% Release Information for hdf5-1.6.5 (10/November/05) diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt index b63d294..0cb0968 100644 --- a/release_docs/INSTALL_Cygwin.txt +++ b/release_docs/INSTALL_Cygwin.txt @@ -98,7 +98,29 @@ Install HDF5 on Cygwin $ bunzip2 < hdf5-1.8.0.tar.bz2 | tar xf - -3. Configuring +3. Setup environment + + In the latest version of the Cygwin DLL, a bug was introduced + relating to the 'timezone' global variable and C99 support. As + work-around, we must use a special compiler flag. + + 3.1. In the command prompt you plan to build from, run the + command: + + export CFLAGS="-ansi ${CFLAGS}" + + 3.2 (Optional) If you plan to build C++ libraries, also + run the command: + + export CXXFLAGS="-ansi ${CXXFLAGS}" + + 3.3 (Optional) If you plan to build Fortran libraries, also + run the command: + + export FCFLAGS="-ansi ${FCFLAGS}" + + +4. Configuring Notes: See detailed information in hdf5/release_docs/INSTALL, part 5. Full installation instructions for source @@ -112,19 +134,19 @@ Install HDF5 on Cygwin In short, - 3.1 To configure HDF5 C Library, using + 4.1 To configure HDF5 C Library, using $ ./configure - 3.2 To configure HDF5 C/C++ Library, using + 4.2 To configure HDF5 C/C++ Library, using $ ./configure --enable-cxx - 3.3 To configure HDF5 C/Fortran Library, using + 4.3 To configure HDF5 C/Fortran Library, using $ ./configure --enable-fortran - 3.4 To configure HDF5 C with Szip library, using + 4.4 To configure HDF5 C with Szip library, using $ ./configure --with-szlib="path to szlib" @@ -135,15 +157,15 @@ Install HDF5 on Cygwin $ ./configure --with-szlib=/cygdrive/c/szip - 3.5 To configure HDF5 C without Zlib, + 4.5 To configure HDF5 C without Zlib, To disable zlib, using $ ./configure --without-zlib - 3.6 Two ways to configure HDF5 C with specified Zlib + 4.6 Two ways to configure HDF5 C with specified Zlib - 3.6.1 Using + 4.6.1 Using $ ./configure --with-zlib=INCDIR,LIBDIR @@ -153,7 +175,7 @@ Install HDF5 on Cygwin $ ./configure --with-zlib=/cygdrive/c/usr/include,/cygdrive/c/usr/lib - 3.6.2 Through the CPPFLAGS and LDFLAGS Variables + 4.6.2 Through the CPPFLAGS and LDFLAGS Variables For example, if zlib was installed in the directory /cygdrive/c/usr then using the following command to configure @@ -163,7 +185,7 @@ Install HDF5 on Cygwin $ LDFLAGS=-L/cygdrive/c/usr/lib \ $ ./configure - 3.7 To specify the installation directories, using + 4.7 To specify the installation directories, using $ ./configure --prefix="path for installation" @@ -174,7 +196,7 @@ Install HDF5 on Cygwin the path with the `--prefix=PATH' switch as in the above command. - 3.8 Combination of Switches + 4.8 Combination of Switches All of the above switches can be combined together. For example, if users want to configure HDF5 C/C++/Fortran @@ -209,7 +231,7 @@ Install HDF5 on Cygwin --enable-fortran <"If no more switches, then hit Enter"> -4. Make and Make Check +5. Make and Make Check After configuration is done successfully, run the following series of commands to build, test and install HDF5 @@ -220,20 +242,23 @@ Install HDF5 on Cygwin Before run "make install", check output file for "make check", there should be no failures at all. -5. Make Install +6. Make Install $ make install > "output file name" -6. Check installed HDF5 library +7. Check installed HDF5 library After step 4, go to your installation directory, there should be three subdirectories: "bin" "include" and "lib". -7. Known Problems +8. Known Problems Shared libraries can not be built on Cygwin In release 1.8.0. + There are issues linking with the latest Cygwin DLL. As a work-around, + make sure to follow the steps described in step 3 above. + ----------------------------------------------------------------------- Need Further assistance, email help@hdfgroup.org diff --git a/release_docs/INSTALL_MinGW.txt b/release_docs/INSTALL_MinGW.txt index f92961e..47dcadd 100644 --- a/release_docs/INSTALL_MinGW.txt +++ b/release_docs/INSTALL_MinGW.txt @@ -109,13 +109,15 @@ Build HDF5 on MinGW - ./tools/h5diff/Makefile.in: "testh5diff.sh" - - ./tools/misc/Makefile.in: "testh5stat.sh" and "testh5mkgrp.sh" + - ./tools/misc/Makefile.in: "testh5mkgrp.sh" - ./tools/h5jam/Makefile.in: "testh5jam.sh" - ./tools/h5copy/Makefile.in: "testh5copy.sh" - ./tools/h5ls/Makefile.in: "testh5ls.sh" + + - ./tools/h5stat/Makefile.in: "testh5stat.sh" 5. Configuring diff --git a/release_docs/INSTALL_VMS.txt b/release_docs/INSTALL_VMS.txt index 5e31db6..fd997c5 100644 --- a/release_docs/INSTALL_VMS.txt +++ b/release_docs/INSTALL_VMS.txt @@ -1,7 +1,6 @@ Building and installation instructions for Alpha Open VMS - This file is under construction - EIP June 1, 2006 - + HDF5 1.8.0 release + January 2008 @@ -9,83 +8,70 @@ -------- 1. Obtaining HDF5 - 2. Building C, Fortran and C++ libraries - 3. Testing HDF5 libraries and tools - 4. Installing HDF5 libraries - 5. Known problems + 2. Building and testing HDF5 C, Fortran and C++ libraries, + and utilities + 3. Installing HDF5 libraries + 4. Known problems 1.Obtaining HDF5 + Please see INSTALL file in this directory for downloading instructions. - 2. Building C, Fortran and C++ libraries + 2. Building and testing HDF5 C, Fortran and C++ libraries and utilities. - IMPORTANT: This version REQUIRES GNU ZLIB librarary to be installed + IMPORTANT: This version REQUIRES GNU ZLIB library to be installed on a system. You may download the source code from http://www.zlib.net/ - Use tar command to untar HDF5 source ball - tar -xvf hdf5-1.8.0-
.tar
-
-	 -  Change default directory to [.hdf5-1.8.0-
.vms]
-         -  Modify make.com file to point to the installed ZLIB library.
-         -  Run 
-		@make
-           command. This command file will build 
+		tar -xvf .tar
+
+	 -  Change default directory to [..vms]
+         -  Specify top HDF5 source directory in the build.com file
+         -  Edit make.com:
+         	specify path to ZLIB library
+        	if necessary, modify compilation flags 
+	    Do NOT REMOVE /define=H5_VMS and /standard=strict_ansi qualifiers.
+         -  Run build.com command file 
+		@build
+            We recommend using batch queue to build and test this distribution. 
+            The command file runs make.com and builds 
 			C library, tests, and utilities	
 			Fortran library and tests
 			C++ library and tests
-			C, Fortran and C++ examples
-
-	   IMPORTANT: Compilations flags are defined in the [.vms]make.com file of the
-	   source tree. It is set up to use /float=float_ieee qualifier for C, Fortran 
-	   and C++ compilersi, and debug mode. If desired, those flags can be removed.
-	   Do NOT REMOVE /define=H5_VMS and /standard=strict_ansi qualifiers.
-	   If you have to use make.com file in a particular directory, make sure that
-	   you modify the compilation flags in this file appropriately.
-
-	   If  make.com succeeds, the following libraries and utilties will be built:
-
-	   [.src]hdf5.olb
-	   [.fortran.src]hdf5_fortran.olb
-	   [.c__.src]hdf5_cplus.olb
-	   [.tools.h5diff]h5diff.exe
-	   [.tools.h5dump]h5dump.exe
-	   [.tools.h5import]h5import.exe
-	   [.tools.h5jam]h5jam.exe
-	   [.tools.h5jam]h5unjam.exe
-	   [.tools.h5ls]h5ls.exe
-	   [.tools.h5repack]h5repack.exe
-
-	3. Testing HDF5 libraries and tools
-	   You may try to run check.com files in the following directories
-
-	   [.test]
-	   [.fortran.test]
-	   [.c__.test]
-	   [.examples]
-	   [.fortran.examples]
-	   [.c__.examples]
-
-	4. Installing HDF5 libraries
-	   Currently one has to manually copy *.olb, public *.h (all header
-           files that do not have "private" in file name) iheader files and 
-           Fortran modules files from 
-           [.src], [.fortran.src] and [.c__.src] directories
-
-	5. Known problems
+            It also runs test scripts to test C, Fortran and C++ libraries, and
+	    h5dump, h5diff, h5ls, h5repack and h5import utilities.
+
+	3. Installing HDF5 libraries
+
+	   Modify install.com file to specify installation directory and run
+	       @install
+           to install HDF5 C, Fortran, and C++ libraries, and utilities.
+           The script will create the directories shown below in the
+           installation directory:
+
+           [.HDF5]...
+           [.HDF5.INCLUDE]
+           [.HDF5.LIB]
+           [.HDF5.BIN]
+           [.HDF5.EXAMPLES]
+           [.HDF5.EXAMPLES.C]
+           [.HDF5.EXAMPLES.F90]
+           [.HDF5.EXAMPLES.CXX]
+
+           [.HDF5.EXAMPLES.*] directories contain make.com and check.com files 
+           to build examples against the installed libraries and to verify 
+           the installation.
+
+	3. Known problems
 
 	   - dsets test fails for test_scleoffset_double and
 	     test_scleoffset_double_2 tests when G_FLOAT double is used
-                                                          06/01/2006 EIP 
            - There is no support for szip compression filter.
-	   - There are few C and Fortran tests that fail (C mtime,  Fortran file_close and
-              multifile driver tests, probably more; all major tests succeed).
-	   - Mulitifile driver has not been tested yet.
-	   - Test scripts for some tools are missing; existing tools test scripts
-	      do not compare output with the expected output.
-           - Probably more :-)
+	   - Fortran multifile driver test fails; similar C test passes.
+
 
+	For help contact help@hdfgroup.org
 
-	For help contact hdfhelp@hdf.ncsa.uiuc.edu or help@hdfgroup.org
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 703d2a8..daedadd 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -1,6 +1,6 @@
 
 ***********************************************************************
-*        HDF5 Build and Install Instructions for Windows XP           *
+*        HDF5 Build and Install Instructions for Windows XP/VISTA     *
 *                         (Full Version)                              *
 ***********************************************************************
 
@@ -16,13 +16,15 @@ Contents:
    Section I     :  What do we build and install
    Section II    :  How to build and test HDF5 libraries and tools
    Section III   :  How to build examples (optional)
-   Section IV    :  How to build an application using the HDF5 library  or DLL
+   Section IV    :  How to build an application using the HDF5 library or DLL
    Section V     :  How to disable Gzip(Zlib)/Szip compression
    Section VI    :  How to build HDF5 with Fortran Support
    Section VII   :  How to build Multi-threaded version of HDF5 library
    Section VIII  :  How to build HDF5 with Thread-Safe Feature
    Section IX    :  How to build HDF5 for 64-bit Windows
-   Section X     :  Misc.
+   Section X     :  How to build HDF5 on Windows Vista
+   Section XI    :  Backwards Compatibility with HDF5 1.6
+   Section XII   :  Misc.
 
 
 ========================================================================
@@ -108,7 +110,7 @@ Preconditions:
       Variables" box.
 
       In the New Variable window, set "Variable name" as HDF5_EXT_ZLIB and 
-      "Variable value" as zdll.lib, then click OK.
+      "Variable value" as zlib1.lib, then click OK.
 
       Similarly, you can set:
 
@@ -151,13 +153,11 @@ Notes:
       directory, run copy_hdf.bat first and then open all.dsw under 
       hdf5/windows/proj/all to start building process.
 
-   2. Users who prefer to use Visual Studio 6.0 can follow instructions in 
-      INSTALL_Windows_Short_MSVS6.0.txt.  Note, however, that Visual Studio
-      6.0 will not be supported in future versions of HDF5.
+   2. Visual Studio 6.0 will not be supported in HDF5 1.8 or later release.
 
    2. Users who prefer to use Visual Studio .NET can follow instructions in 
-      INSTALL_Windows_Short_Net.txt.  Note, however, that Visual Studio
-      .NET will not be supported in future versions of HDF5.
+      INSTALL_Windows_Short_Net.txt.  Note, however,  HDF5 Fortran product
+      will not be supported in HDF5 1.8 release.
 
    3. For users who want to quickly build HDF5 library or do not want to know 
       HDF5 building and installation details, please read the 
@@ -176,9 +176,6 @@ Notes:
 
    7. For users who would like to build Muti-threaded version of HDF5 library, 
       please read Section VII.
-
-   8. For users who would like to build, test and use HDF5 snapshot
-      release, please read Section VIII.
       
 
 ========================================================================
@@ -1372,7 +1369,7 @@ Notes: In Visual Studio 2005, the Single-threaded runtime libraries have been
        those two sections carefully before go to the following part.
 
        
-In Visual Studio 6.0 and .Net, users have the option of building multi-threaded
+In Visual Studio.Net, users have the option of building multi-threaded
 libraries by manipulating the project settings.  Otherwise, the build process
 is very much the same.  Therefore, follow the instructions below, and refer
 to the earlier sections of this document for details on building and testing.
@@ -1648,10 +1645,67 @@ Installing:
     into one folder, hdf5lib.  This script should work identically on 32- and 
     64-bit  builds.  Therefore, you may follow the instructions in Section II 
     about installing.  
- 
- 
+	
 ========================================================================
-                            Section X: Misc.
+            Section X: How to build HDF5 on Windows Vista
+========================================================================
+Building on Windows Vista is very similar to building on Windows XP, with
+some minor changes.  Therefore, follow the build instructions above, with the
+following considerations:
+
+    1. Only Visual Studio 2005 is currently supported on Windows Vista.  This
+       is because Microsoft has ended their support for 6.0 and .NET.
+       
+    2. Building Fortran libraries has not been tested, and is therefore also
+       unsupported.  You may attempt to build Fortran libraries following the
+       instructions above, but they should be considered experimental and used
+       for testing only.
+       
+    3. Elevated security permissions are required to test the HDF5 libraries.
+       This is because DLLs are installed in the system directory.  To enable
+       elevated security:
+       
+            1. In the Start menu, search for "Command Prompt".  Right click on
+               the "Command Prompt" program, and select "Run as administrator."
+               
+            2. A security dialog will pop up.  Make sure you select "Continue."
+            
+            3. Test HDF5 libraries and tools as usual using "hdf5check.bat"
+               script.
+
+
+========================================================================
+        Section XII: Backwards Compatibility with HDF5 1.6
+========================================================================
+
+Several basic HDF5 functions have changed over the years as requirements on 
+the library and data format have evolved. To enable existing applications to 
+run properly, all versions of these functions have been retained; for 
+flexibility and ease-of-use, macros have been created that can be mapped 
+either globally to broad sets of function versions or on a 
+function-by-function basis to specific versions. For example, an overall 
+approach can be determined by means global setting; function-level settings 
+can then be used to override the global setting then for specific functions.
+
+To enable 1.6 API symbols in your application:
+
+    1. Build and test HDF5 normally (see Section II).
+    
+    2. Open your application in Visual Studio.  Right click on the
+       project file, and select properties.
+       
+    3. Select the C/C++ > Preprocessor pane on the left.  In the list of
+       "Preprocessor Definitions", add "H5_USE_16_API". (Note: macros in
+       the list are separated by a semi-colon.)
+       
+    4. Repeat this for each project and project configuration that uses
+       HDF5 libraries.
+       
+    5. Continue to build and test your application normally.
+
+
+========================================================================
+                            Section XII: Misc.
 ========================================================================
 
 1. Helpful Pointers
@@ -1679,15 +1733,5 @@ using the Visual C++ Development Environment.
     Developer Studio project settings dialog.
 
     
-2. Backward compatibility with 1.6
-    If you are going to use 1.6 APIs with 1.8 branch, you may do the 
-    following two things:
-        3.1 Uncomment out /*#define H5_WANT_H5_V1_6_COMPAT 1*/ inside 
-        h5pubconf.h under windows\src.
-        3.2 Set up an environment variable H5_WANT_H5_V1_6_COMPAT to 1, 
-        this will be used to test compatibility of error APIs.
-    Remember to undo 1 and 2 after you test if you are not going to use 1.6 
-    backward compatibility option.
-
 ************************************************************************
  Please send email to help@hdfgroup.org for further assistance.
diff --git a/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT b/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT
deleted file mode 100755
index 0f5aa64..0000000
--- a/release_docs/INSTALL_Windows_Short_MSVS6.0.TXT
+++ /dev/null
@@ -1,127 +0,0 @@
-************************************************************************
-*  HDF5 Build and Install Instructions for Windows XP with MSVS 6.0    *
-*                       (Short Version)                                *
-************************************************************************
-
-Notes: To ease the building process for current versions of Visual
-      Studio, 6.0 is set to be depreciated in future releases.  This
-      means that project files are being converted to .Net format, and
-      will not be backwards-compatible with Visual Studio 6.0.  
-      
-      Users who wish to continue to use Visual Studio 6.0 may choose
-      not to upgrade to future versions of HDF5.  However, it is
-      recommended that all users consider making the switch to a
-      more current version of Visual Studio.  An express version of
-      Visual Studio 2005 is available free from Microsoft, and is
-      full compatible with HDF5.
-      
-      
-
-      This short instruction is written for users who want to quickly
-      build HDF5 library and tools from the HDF5 source code package
-      with Microsoft Visual Studio 6.0 but do not want to know HDF5 
-      building and installation details on Windows XP.
-         
-      For detailed HDF5 build and install information, or if you have
-      trouble following any steps in the instructions, please refer to
-      INSTALL_Windows.txt for further information.
-      
-      For users who would like to build and test HDF5 package from the
-      command line, please refer to
-      INSATLL_Windows_From_Command_Line.txt.
-        
-WARNINGS:
-
-Please read CAREFULLY about HDF5 build and install preconditions and 
-notes in INSTALL_Windows.txt before starting below procedures.
-
-========================================================================
-               STEP 1: Building HDF5 Libraries and Tools
-========================================================================
-    
-1. Run batch file copy_hdf.bat.
- 
-   Go to  c:\MyHDFstuff\hdf5\windows and run copy_hdf.bat. 
-
-2. Open all.dsw workspace
-     
-   Open the c:\MyHDFstuff\hdf5\windows_vs6\proj\all\all.dsw workspace. 
-
-3. (Optional) Disable C++ related projects
-    
-       Remove the following projects from project "all" dependencies 
-       ONLY if you prefer not to build HDF5 C++ libraries
-        
-          dsets_cpp
-          dsets_cppdll
-          hdf5_cpp
-          hdf5_cppdll
-          testhdf5_cpp
-          testhdf5_cppdll
-          hdf5_hl_cpp
-          hdf5_hl_cppdll
-          hl_test_table_cpp
-          hl_test_table_cppdll
-        
-4. Select "Build", then Select "Set Active Configuration".
-
-   In "Project configurations", select the active configuration
-
-	    "all -- Win32 Debug"
-               
-               or
-
-	    "all -- Win32 Release"
-	        
-   Then build project "all".
-
-
-========================================================================
-               STEP 2: Testing HDF5 Libraries and Tools 
-========================================================================
-
-HDF5 libraries and tools should be tested to make sure that they were
-built correctly.
-
-HDF5 libraries and tools can be tested with hdf5check.bat batch file 
-in c:\MyHDFstuff\hdf5 directory.
-
-hdf5check.bat has four options:
-   
-   hdf5check                     test HDF5 C library and tools only
-      
-   hdf5check enablecpp           test HDF5 C/C++ libraries and tools
-         
-   
-
-Invoke a command prompt and run hdf5check with appropriate
-options.
-
-Test results are saved in two files:
-
-   c:\MyHDFstuff\hdf5\tests_results.txt   
-
-   c:\MyHDFstuff\hdf5\check_results.txt.
-
-In general, you only need to check tests_results.txt.  If all the
-tests passed, then you do not have to check check_results.txt.  
-If some tests failed, check check_results.txt can help you
-figure out what was wrong.
-
-========================================================================
-                 STEP 3: Installing HDF5 Libraries
-========================================================================
-
-Run the batch file c:\MyHDFstuff\hdf5\installhdf5lib.bat to install 
-all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.
-
-========================================================================
-               STEP 4: Building HDF5 Examples (Optional)
-========================================================================
-
-Please read about building examples in the main document, INSTALL_Windows.txt.
-Note that these instructions use Visual Studio .Net project files.  However,
-similar 6.0 project files exist in the "windows_vs6" directory.
-
-************************************************************************
-Please send email to help@hdfgroup.org for further assistance
diff --git a/release_docs/INSTALL_Windows_Short_NET.TXT b/release_docs/INSTALL_Windows_Short_NET.TXT
index 8e6252e..c60021c 100755
--- a/release_docs/INSTALL_Windows_Short_NET.TXT
+++ b/release_docs/INSTALL_Windows_Short_NET.TXT
@@ -66,49 +66,12 @@ notes in INSTALL_Windows.txt before starting below procedures.
 
       Invoke Microsoft Visual Studio.  From the main menu, go to "File" and 
       select the "Open Solution" option. Then open the
-      c:\MyHDFstuff\hdf5\windows_vs6\proj\all\all.dsw workspace.  When prompted
-      to convert project files to Visual Studio .NET format, select "Yes to All".
+      c:\MyHDFstuff\hdf5\windows_vnet\proj\all\all.dsw workspace.
 
       You should find Windows project files listed as "all", "big", etc. on the
       left.
 
-   3. Disable Projects
-   
-      In Visual Studio .NET, we do not support building Fortran libraries.  If
-      you would like to build Fortran libraries, please read about Visual Studio
-      2005 with Intel Fortran 9.1 in the Install_Windows.txt document.
-      
-      The following projects must be disabled.  Go to "Build", "Configuration 
-      Manager", and uncheck the following for both Release and Debug builds:
-      
-        flush1_fortran
-        flush1_fortrandll
-        flush2_fortran
-        flush2_fortrandll
-        hdf5_f90cstub
-        hdf5_f90cstubdll
-        hdf5_fortran
-        hdf5_fortrandll
-        hdf5_hl_f90cstubdll
-        hdf5_hl_fortran
-        hdf5_hl_fortrandll
-        hl_test_image_fortran
-        hl_test_image_fortrandll
-        hl_test_lite_fortran
-        hl_test_lite_fortrandll
-        hl_test_table_fortran
-        hl_test_table_fortrandll
-        libtest_cstubdll
-        libtest_fortran
-        libtest_fortrandll
-        testhdf5_fortran
-        testhdf5_fortrandll
-        
-        If you don't plan on building threadsafe HDF5, disable project
-        "ttsafedll" as well.  If you would like to build threadsafe HDF5, please
-        see Install_Windows.txt.
-        
-   4. (Optional) Disable HDF5 C++ and High level C++
+   3. (Optional) Disable HDF5 C++ and High level C++
    
       In HDF5 1.8, C++ and HL C++ libraries are built by default.  To opt-out,
       you must explicitly disable them.
@@ -147,7 +110,7 @@ notes in INSTALL_Windows.txt before starting below procedures.
    Libraries.                                                                                           
              
 
-   5. Select "Build", then Select "Configuration Manager".
+   4. Select "Build", then Select "Configuration Manager".
 
       5.1 To build debug static libraries, debug multithreaded DLLs, and tests:
 
@@ -187,19 +150,9 @@ hdf5check.bat has four options:
 Notes: Users who only build HDF5 C/C++ libraries ONLY have the first 
        two options.
 
-Invoke a command prompt window and run hdf5check with appropriate
-options.
-
-Test results are saved in two files:
-
-   c:\MyHDFstuff\hdf5\tests_results.txt   
-
-   c:\MyHDFstuff\hdf5\check_results.txt.
-
-In general, you only need to check tests_results.txt.  If all the
-tests passed, then you do not have to check check_results.txt.  
-If some tests failed, check check_results.txt can help you
-figure out what was wrong.
+Invoke a command prompt window and run hdf5check with appropriate option.
+Users are encouraged to pipe the test output into a file.  You should find
+no "*FAILED*" marks.
 
 If you want to test HDF5 libraries and tools one by one, please refer to
 Section II, step 2 in INSTALL_Windows.txt.
diff --git a/release_docs/INSTALL_Windows_Short_VS2005.TXT b/release_docs/INSTALL_Windows_Short_VS2005.TXT
index 957e7c1..c205852 100755
--- a/release_docs/INSTALL_Windows_Short_VS2005.TXT
+++ b/release_docs/INSTALL_Windows_Short_VS2005.TXT
@@ -149,19 +149,9 @@ hdf5check.bat has four options:
 Notes: Users who only build HDF5 C/C++ libraries ONLY have the first 
        two options.
 
-Invoke a command prompt window and run hdf5check with appropriate
-options.
-
-Test results are saved in two files:
-
-   c:\MyHDFstuff\hdf5\tests_results.txt   
-
-   c:\MyHDFstuff\hdf5\check_results.txt.
-
-In general, you only need to check tests_results.txt.  If all the
-tests passed, then you do not have to check check_results.txt.  
-If some tests failed, check check_results.txt can help you
-figure out what was wrong.
+Invoke a command prompt window and run hdf5check with appropriate option.
+Users are encouraged to pipe the test output into a file.  You should find
+no "*FAILED*" marks.
 
 If you want to test HDF5 libraries and tools one by one, please refer to
 Section II, step 2 in INSTALL_Windows.txt.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index dcac848..489030c 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,16 +1,16 @@
-HDF5 version 1.8.0-beta4post1 currently under development
+HDF5 version 1.8.0 currently under development
 ================================================================================
 
 
 INTRODUCTION
 
 This document describes the differences between HDF5-1.6.* and
-HDF5-1.8.0-beta3, and contains information on the platforms tested and
-known problems in HDF5-1.8.0-beta3. For more details check the HISTORY.txt
-file in the HDF5 source.
+Hdf5 1.8.0 release candidate "HDF5-1.8.0-rc3", and contains information 
+on the platforms tested and known problems in HDF5-1.8.0-rc3. 
+For more details check the HISTORY.txt file in the HDF5 source.
 
 
-Links to HDF5 1.8.0-beta* source code, documentation, and additional materials
+Links to HDF5 1.8.0-rc3 source code, documentation, and additional materials
 can be found on THG's development server (www.hdfgroup.uiuc.edu) at the
 following location:
      http://www.hdfgroup.uiuc.edu/HDF5/release/beta/obtain518.html
@@ -41,7 +41,7 @@ CONTENTS
 
 - New Features
 - Support for new platforms and languages
-- Bug Fixes since HDF5-1.6.0
+- Bug Fixes since HDF5-1.8.0
 - Platforms Tested
 - Known Problems
 
@@ -50,922 +50,47 @@ New Features
 ============
 
     Configuration:
-    --------------
-        - Removed stream-vfd from the HDF5 library. - AKC 2007/11/19.
-        - Updated versions of autotools. HDF5 now uses automake 1.10.0, 
-          autoconf 2.61, and libtool 1.5.22. MAM - 2007/7/25.
-        - Changed default fortran compiler to g95 when gcc is used. - AKC
-          2007/2/17.
-        - 'make check-vfd' can now be run from the top level directory. Not all
-          tests that 'make check' invokes work with certain Virtual File Drivers,
-          so those tests have been skipped. - MAM 2006/7/17  
-        - Added the variable HDF5TestExpress to control how long tests run.
-          Setting it to a value between 0 and 3 controls how thoroughly the
-          library is tested, with 0 being an "exhaustive run" and 3 being a
-          very quick "smoke test."  1 (a "full run") is the default.
-          -JML 2006/6/21
-        - If both shared and static libraries are installed, now both will be
-          tested during 'make install'. -MAM 2006/06/21
-        - Added support to explicity enable stream_vfd or shared libraries
-          when using parallel via the '--enable-stream_vfd' and
-          '--enable-shared' options, respectively. If not explicity defined, 
-          These settings default to enabled when parallel is not used, 
-          and disabled when parallel is used. -MAM 2006/06/17
-        - Remove the flexible parallel code and the --enable-fphdf5
-          configure option, it was never up to production standards
-          anyway.  -QAK 2006/4/20
-        - Added a macro hdf5_mpi_special_collective_io_works to filter out
-          some mpi-io packages that don't support collective IO for no IO
-          contributions in some processes. -KY 2006/2/16
-	- Added -shlib option to link against installed shared libraries to
-	  h5c++ and h5fc.  -JML 2005/11/1
-	- Added --enable-build-all option to configure, which only developers
-	  should need to use.  -JML 2005/10/24
-	- Configure uses the 'TR' variable to let the user override the path
-          to the 'tr' utility. -JML 2005/10/17
-	- Configure can recognize -lmpich as a form of MPI library. -AKC-
-	  2005/9/28.
-        - MD5 checksumming has been added to snapshot releases.  Release
-          tarballs will be accompanied by .md5 checksum files, which can
-          be verified using the md5sum utility.  -JML 2005/9/6
-        - Some configure flags are incompatible (e.g., the C++ APIs cannot
-          be built using the parallel version of HDF5).  configure will now
-          output errors when some common incompatible features are used
-          together.  -JML 2005/9/6
-        - A new API function, H5Tis_hard(), was added to the library.  It
-          checks if a conversion function is a compiler (hard) conversion.
-          SLU - 2005/9/6
-	- t_mpi will run the test_mpio_derived_dtype by default unless it is
-	  known not working (indicated by macro H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-	  not defined.)  -AKC- 2005/8/23.
-	- Test execution has changed in a number of ways:
-	  When make is invoked in parallel (using -j), sequential tests
-	  are now executed as parallel make targets.  This should make them
-	  finish more quickly on machines with multiple processors.
-	  Since test output is garbled when they are executed by parallel make,
-	  tests now dump their output to foo.log files and foo.logsh files
-	  (for test scripts).  These logs are printed to the screen only
-	  when a test fails or when all tests in the current directory have
-	  completed successfully.
-	  When tests pass, they will create a foo.chkexe file.
-	  This prevents the test from executing again until the test or
-	  main library changes.
-	  All files generated by tests (*.chkexe, *.log, and any *.h5 files
-	  created) can be removed by invoking 'make check-clean'.
-	  Sequential and parallel library tests can now be invoked separately.
-	  'make check-s' will execute only sequential tests, and 'make check-p'
-	  will execute only parallel tests.  'make check' will still execute
-	  all tests.
-	    -JML 2005/08/03
-        - On windows, all.zip is deprecated. users should
-             read INSTALL_Windows.txt to know the details.
-             Reasons to deprecate all.zip:
-		1. Avoid confliction for windows programmers
-                2. Decrease size of CVS tree by adding all.zip
-	        3. Avoid using winzip as the intermediate step
-             --KY 2005/04/22
-	- When HDF5 is created as a shared library, it now uses libtool's
-	  shared library versioning scheme. -JML 2005/04/18
-	- HDF5 now uses automake 1.9.5 to generate Makefiles.in.
-	  This has a number of effects on users:
-          The Fortran compiler should be set using the environment
-          variable $FC, not $F9X.  F9X still works, but is depreciated.
-	  The output of make may be different.  This should be only a
-          cosmetic effect.
-	  make depened (or make dep) is no longer recognized, since automake
-	  handles dependency tracking.
-	  Some new configure options exist.  --enable-dependency-tracking
-          and --disable-dependency-tracking are used to control automake's
-	  dependency tracking.  Dependencies are on by default *on most
-	  platforms and compilers*.  If --enable-dependency-tracking is
-	  used, they will be enabled on any platform.  However, this can
-	  slow down builds or even cause build errors in some cases.
-	  Likewise, --disable-dependency-tracking can speed up builds and
-	  avoid some build errors.
-	  Some make targets have alternate names.  make check-install and
-	  make installcheck do the same thing, for instance.
-	  pmake on IRIX can be invoked from the root directory, but the
-	  -V flag must be used to invoke it in any subdirectory or it
-	  will give an error about undefined variables.
-	  JML 2005/01 - 2005/03
-        - Hardware conversion between long double and integers is also added.
-          SLU 2005/02/10
-        - Started to support software conversion between long double and 
-          integers.  Hardware conversion will come very soon.  SLU - 2005/1/6
-	- Intel v8.0 compiler would infinite loop when compiling some test
-	  code with -O3 option.  Changed enable-production default compiler
-	  option to -O2. AKC - 2004/12/06
-	- Long double is assumed to be a supported C data type.  It is a
-	  stanadard C89 type. AKC - 2004/10/22
-	- The IA64 will use ecc as the C++ compiler by default.
-        - Added some initial support for making valgrind/Purify (or similar
-            memory checking products) happier by initializing buffers to zero
-            and disabling the internal free list code.  To take advantage of
-            this, use the "--enable-using-memchecker" configure option when
-            building the library.  QAK - 2004/07/23
-        - Fixed the long compile time of H5detect.c when v7.x Intel Compiler
-	    is used with optimization NOT off.  AKC - 2004/05/20
-	- Fixed configure setting of C++ for OSF1 platform. AKC - 2004/01/06
-        - Prefix default is changed from /usr/local to `pwd`/hdf5.
-            AKC - 2003/07/09
+    -------------
 
     Library:
     --------
-       - Removed size restrictions on attributes, when using the "latest"
-            version of the file format. - QAK - 2007/02/21
-       - Relaxed restrictions on attribute operations to allow a file ID to
-            be used as the "location ID".  If a file ID is used, the attribute
-            operation will occur on the root group of the file.
-            - QAK - 2007/02/09
-       - Enabled the CORE driver to read an existing file depending on 
-            the setting of the backing_store for H5Pset_fapl_core and file 
-            open flags. - SLU - 2006/11/30
-       - Added new H5Gget_info_by_idx() routine to query the information about
-            a group according to the order within an index.
-            - QAK - 2006/11/27
-       - Added new H5Gget_info() routine to query the information about a
-            group by name.
-            - QAK - 2006/11/27
-       - Added new H5Oget_info_by_idx() routine to query the information about
-            an object in a group according to the order within an index.
-            - QAK - 2006/11/26
-       - Added new H5Oget_info() routine to query the information about an
-            object in a group by name.
-            - QAK - 2006/11/26
-       - Added new H5Oopen_by_idx() routine to open an object in a group
-            according to the order within an index.
-            - QAK - 2006/11/20
-       - Added new H5Literate() routine to iterate over links in a group
-            according to the order within an index.
-            - QAK - 2006/11/20
-       - Added new H5Ldelete_by_idx() routine to delete a link according to
-            the order within an index.
-            - QAK - 2006/11/13
-       - Added new H5Lget_val_by_idx() routine to query the value of a soft link
-            according to the order within an index.
-            - QAK - 2006/11/13
-       - Added new H5Lget_name_by_idx() routine to query the name of a link
-            according to the order within an index.
-            - QAK - 2006/11/12
-       - Added new H5Rget_name() routine to determine the name of the object
-            that a reference points to, as long as the object is still
-            reachable in the group hierarchy.
-            - QAK - 2006/11/10
-       - Added new H5Lget_info_by_idx() routine to query the link information
-            according to the order within an index.
-            - QAK - 2006/11/10
-       - Added feature to H5Iget_name to allow retrieving the name of any
-            object's ID, as long as the object is still reachable in the
-            group hierarchy.
-            - LA - 2006/11/01
-       - Added External and User-defined links.
-            External links are links from one HDF5 file to another; they
-            require both the name of the file and a path within that file.
-            User-defined links allow users to supply callback functions
-            for link traversals, allowing links to exhibit essentially
-            any behavior.
-            External links are a kind of user-defined link, so their default
-            behavior can be overridden by the user.
-            -JML 2006/8/23
-       - Added H5Oopen and H5Oclose for opening objects of unknown type
-            (as link callback functions do).
-            -JML 2006/8/23
-       - Added H5Oopen_by_addr, H5Oincr_refcount, and H5Odecr_refcount for
-            opening objects by address.  Be very careful with these!
-            -JML 2006/8/23
-       - Added H5Fget_intent to get the "intent" of a file (whether it
-            was opened with read-write access or read-only.
-            -JML 2006/8/23
-       - Added Link Access Property Lists. They currently contain two
-            properties, nlinks (H5Pget/set_nlinks) and elink_prefix
-            (H5Pget/set_elink_prefix). nlinks controls how many soft and
-            user-defined traversals are allowed before HDF5 assumes it has
-            found a cycle (previously this defaulted to 16).
-            The elink_prefix is a filesystem path that is prefixed to the
-            names of any external link files opened using this LAPL.
-            -JML 2006/8/23
-       - Add H5L link APIs.  Old APIs (H5Glink, H5Gmove, etc.) are still
-         supported but deprecated.
-         New APIs are:
-            H5Llink - create a link to an object given its ID
-            H5Lmove - just like H5Gmove2
-            H5Lcopy - copy a link without copying the underlying object
-            H5Lcreate_hard - like H5Glink2 for hard links
-            H5Lcreate_soft - like H5Glink2 for soft links
-            H5Ldelete - just like H5Gunlink
-            H5Lget_val - just like H5Gget_linkval
-            H5Lget_info - gets link-specific info (like H5Gget_objinfo)
-
-         In addition, H5Gcreate_anon, H5Tcommit_anon, and H5Dcreate_anon
-         no longer create links to objects; objects must be manually linked
-         using H5Llink or they will be deleted when the ID is closed.
-
-         Link Creation Property Lists can be used to pass character
-         encoding (ASCII or UTF-8) for link names and to set the Intermediate
-         Group Creation Flag:
-            H5Pset_char_encoding, H5Pget_char_encoding
-            H5Pset_copy_object, H5Pget_copy_object
-         -JML 2006/7/5
-       - Added managements of collective IO supports for chunking storage
-         inside parallel HDF5
-         1) Implemented One IO with collective mode for all chunks in the
-            application by building one MPI derived datatype accross all
-            chunks.
-         2) Implemented the decision-making support to do collective IO inside
-            MPI-IO per chunk. 
-         3) Added the decision-making support to do one IO accross all chunks
-            or to do multiple IOs with each IO per chunk.
-         4) Added the support to handle the case some processes won't do any IOs in 
-            collectively.
-         5) Some MPI-IO package(mpich 1.2.6 or lower, e.g.) cannot handle
-            collective IO correctly for the case when some processes have no
-            contributions to IOs, a special macro is added to change
-            collective IO mode to independent IO mode inside HDF5 library.
-
-            Currently we find that MPICH at Linux and vender MPI-IO package at NCSA
-            Altix cannot handle this case. 
-            
-             "hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}"
-              has been added at the end of file  and
-                                                 .
-
-             If MPI-IO packages at your Linux and Altix support this case,
-             please comment out the last line and report to us at
-             help@hdfgroup.org. We can tune in our configuration to
-             support this.                                                     
- 
-             KY - 2006/02/16
-       - Added character encoding to attribute creation property lists.
-            JML - 2006/01/02
-       - Added H5Gcopy() routine to copy objects between while keeping
-         data in compressed form.  QAK - 2005/11/06
-       - Added H5Sextent_equal() routine.  QAK - 2005/11/06
-       - Added HSYS_ERROR which retrieves the system error message and pushes
-         it to the error stack.  This gives more information of the failed
-	 system call. AKC - 2005/08/04
-       - Added H5F_OBJ_LOCAL flag to H5Fget_obj_count() & H5Fget_obj_ids(), to
-         allow querying for objects in file that were opened with a particular
-         file ID, instead of all objects opened in file with any file ID.
-         QAK - 2005/06/01
-       - Added H5T_CSET_UTF8 character set to mark datatypes that use the
-         UTF-8 Unicode character encoding.  Added tests to ensure that
-         library handles UTF-8 object names, attributes, etc. -JL 2005/05/13
-       - HDF5 supports collective MPI-IO for irregular selection with HDF5
-         dataset. Irregular selection is when users use H5Sselect_hyperslab
-         more than once for the same dataset.
-         Currently, not all MPI-IO packages support complicated MPI derived
-                     datatype used in the implementation of irregular
-                     selection INSIDE HDF5. 
-                     1) DEC 5.x is not supporting complicated derived datatype.
-                     2) For AIX 5.1,
-                     if your poe version number is 3.2.0.19 or lower,
-                     please edit powerpc-ibm-aix5.x under hdf5/config,
-                     Find the line with
-                            << hdf5_mpi_complex_derived_datatype_works>>
-                     and UNCOMMENT this line before the configure.
-                     check poe version with the following command:
-                     lpp -l all | grep ppe.poe
-                     3) For Linux cluster, 
-                        if mpich version is 1.2.5 or lower, collective irregular selection
-                        IO is not supported, internally independent IO is used.
-                     4) For IRIX 6.5,
-                        if C compiler version is 7.3 or lower, collective irregular selection
-                        IO is not supported, internally independent IO is used.
-                     5) For platforms which internally used mpich, if the
-                        mpich version is 1.2.5 or lower, please find the 
-                        corresponding config file and add
-                        hdf5_mpi_complex_derived_datatype_works='no' at the
-                        end of the configuration file. For example, at NCSA
-                        SGI Altix, the internal mpich library is 1.2.5. So 
-                        hdf5_mpi_complex_derived_datatype_works='no' should be
-                        added at the end of the config file ia64-linux-gnu.
-                     KY - 2005/09/12
-        We also found not all MPI-IO packages support collective IO with one
-                    or more processes to have no contributions to IO.
-                     For mpich version 1.2.6 or lower and all IRIX machine, 
-                     if the library  checks that there are no IO contributions for some
-                     processes, collective IO request is replaced with
-                     independent inside HDF5.
-                     KY - 2006/05/04
-                    
-        - HDF5 N-bit filter 
-          HDF5 support N-bit filter from this version,  
-          The N-Bit filter is used effectively for compressing data of N-Bit
-          datatype as well as compound and array datatype with N-Bit fields. 
-          KY - 2005/04/15
-        - HDF5 scaleoffset filter
-          HDF5 supports scaleoffset filter for users to do data
-          compression through HDF5 library. 
-          Scale-Offset compression performs a scale and/or offset operation
-          on each data value and truncates the resulting value to a minimum 
-          number of bits and then stores the data.
-          Scaleoffset filter supports floating-point and integer datatype.
-          Please check the HDF5 reference manual for this.
-          KY - 2005/06/06
-        - Retired SRB vfd (--with-srb). Functions H5Pset_fapl_srb and
-          H5Pget_fapl_srb were removed.  EIP - 2005/04/07
-	- Retired GASS vfd (--with-gass).  Functions H5Pset_fapl_gass and
-	  H5Pget_fapl_gass are removed too.  AKC - 2005/3/3
-        - Pablo was removed from the source code EIP - 2005/01/21
-        - Modified registration of SZIP to dynamically detect the presence
-            or absence of the encoder.  Changed configure and Makefiles,
-            and tests to dynamically detect encoder. BEM - 2004/11/02
-	- Added function H5Pget_data_transform, together with the previously
-	    added H5Pset_data_transform, to support the data transform
-	    feature. AKC - 2004/10/26
-        - Compound datatype has been enhanced with a new feature of size 
-            adjustment.  The size can be increased and decreased(without
-            cutting the last member) as long as it doesn't go down to zero.  
-            No API change is involved.  SLU - 2004/10/1
-        - Put back 6 old error API functions to be backward compatible with
-            version 1.6.  They are H5Epush, H5Eprint, H5Ewalk, H5Eclear,
-            H5Eset_auto, H5Eget_auto.  Their new equivalent functions are
-            called H5Epush_stack, H5Eprint_stack, H5Ewalk_stack,
-            H5Eclear_stack, H5Eset_auto_stack, H5Eget_auto_stack.  SLU -
-            2004/9/2
-        - 4 new API functions, H5Tencode, H5Tdecode, H5Sencode, H5Sdecode were
-            added to the library.  Given object ID, these functions encode and 
-            decode HDF5 objects(data type and space) information into and from 
-            binary buffer.        SLU - 2004/07/21
-        - Modified the way how HDF5 calculates 'pixels_per_scanline' parameter for 
-            SZIP compression. Now there is no restriction on the size and shape of the
-            chunk except that the total number of elements in the chunk cannot be 
-            bigger than 'pixels_per_block' parameter provided by the user.  
-                                                                     EIP - 2004/07/21  
-        - Added support for SZIP without encoder.  Added H5Zget_filter_info
-            and changed H5Pget_filter and H5Pget_filter_by_id to support this
-            change.  JL/NF - 2004/06/30
-        - SZIP always uses K13 compression.  This flag no longer needs to
-            be set when calling H5Pset_szip.  If the flag for CHIP
-            compression is set, it will be ignored (since the two are mutually
-            exclusive).  JL/NF - 2004/6/30
-        - A new API function H5Fget_name was added.  It returns the name
-            of the file by object(file, group, data set, named data type,
-            attribute) ID.  SLU - 2004/06/29
-        - Added support for user defined identifier types.  NF/JL - 2004/06/29
-        - A new API function H5Fget_filesize was added.  It returns the
-            actual file size of the opened file.  SLU - 2004/06/24
-	- New Feature of Data transformation is added.  AKC - 2004/05/03.
-        - New exception handler for datatype conversion is put in to 
-            replace the old overflow callback function.  This exception
-            handler is set through H5Pset_type_conv_cb function.
-            SLU - 2004/4/27
-        - Added option that if $HDF5_DISABLE_VERSION_CHECK is set to 2,
-	    will suppress all library version mismatch warning messages.
-	    AKC - 2004/4/14
-	- A new type of dataspace, null dataspace(dataspace without any 
-            element) was added.  SLU - 2004/3/24
-        - Data type conversion(software) from integer to float was added.
-            SLU - 2004/3/13 
-        - Data type conversion(software) from float to integer was added.
-            Conversion from integer to float will be added later.  
-            SLU -2004/2/4
-        - Added new H5Premove_filter routine to remove I/O pipeline filters
-            from dataset creation property lists.  PVN - 2004/01/26
-        - Added new 'compare' callback parameter to H5Pregister & H5Pinsert
-            routines.  QAK - 2004/01/07
-        - Data type conversion(hardware) between integers and floats was added.
-            SLU 2003/11/21
-        - New function H5Iget_file_id() was added.  It returns file ID given
-            an object(dataset, group, or attribute) ID.  SLU 2003/10/29
-        - Added new fields to the H5G_stat_t for more information about an
-            object's object header.  QAK 2003/10/06
-        - Added new H5Fget_freespace() routine to query the free space in a
-            given file.  QAK 2003/10/06
-        - Added backward compatability with v1.6 for new Error API. SLU - 
-            2003/09/24
-        - Changed 'objno' field in H5G_stat_t structure from 'unsigned long[2]'
-            to 'haddr_t'.  QAK - 2003/08/08
-        - Changed 'fileno' field in H5G_stat_t structure from 'unsigned long[2]'
-            to 'unsigned long'.  QAK - 2003/08/08
-        - Changed 'hobj_ref_t' type from structure with array field to 'haddr_t'.
-            QAK - 2003/08/08
-        - Object references (hobj_ref_t) can now be compared with the 'objno'
-            field in the H5G_stat_t struct for testing if two objects are the
-            same within a file.  QAK - 2003/08/08
-        - Switched over to new error API. SLU - 2003/07/25
 
     Parallel Library:
     -----------------
-	- Added mpich2 as a testing "platform" informally. AKC - 2005/9/28.
-	- A dataset created in serial mode with H5D_ALLOC_TIME_INCR allocation
-	  setting was not extendible, either explicitly by H5Dextend or
-	  implicitly by writing to unallocated chunks.	Library now allocates
-	  more space when needed or directed if the file is opened by parallel
-	  mode, independent of what the dataset allocation mode is.
-	  CC/AKC - 2005/08/29.
-        - Allow compressed, chunked datasets to be read in parallel.
-            QAK - 2004/10/04
-        - Add options of using atomicity and file-sync to test_mpio_1wMr.
-            AKC - 2003/11/13
-        - Added parallel test, test_mpio_1wMr, which tests if the
-            underlaying parallel I/O system is conforming to the POSIX
-            write/read requirement.  AKC - 2003/11/12
 
     Fortran Library:
     ----------------
-         - added support for shared Fortran libraries.  -JML 2005/09/20
-         - added missing h5tget_member_class_f function
-                                                 EIP 2005/04/06         
-         - added new functions h5fget_name_f and h5fget_filesize_f 
-                                                 EIP 2004/07/08
-         - h5dwrite/read_f and h5awrite/read_f functions only accept dims parameter
-            of the type INTEGER(HSIZE_T).
-         - added support for native integers of 8 bytes (i.e. when special
-           compiler flag is specified to set native fortran integers to 8 bytes,
-           for example, -i8 flag for PGI and Absoft Fortran compilers, 
-           -qintsize=8 flag for IBM xlf compiler).
-                                                 EIP 2005/06/20
-         - added support for "big" REAL and DOUBLE PRECISION types
-           (usually the size is specified by compilers flags like 
-            -r8, -r16, etc.)
-           Known problem: multi file test fails when REAL is 16 bytes.
-                                                EIP 2005/09/8
 
     C++ Library:
     ----------------
-         - added support for shared C++ libraries.  -JML 2005/09/20
-        - Added missing member functions
-                H5::CompType::getMemberArrayType
-                H5::CompType::getMemberVarLenType
-                H5::AbstractDs::getArrayType
-                H5::AbstractDs::getVarLenType
-                H5::CommonFG::openArrayType
-                H5::CommonFG::openVarLenType
-                H5::PropList::copyProp -- this will replace the current
-                        H5::PropList::copyProp in later releases due
-                        to incorrect prototype.
-                H5::IdComponent::getHDFObjType
-                BMR - 2005/08/08
 
 
     Tools:
     ------
-        - h5dump lists groups and attributes in requested orders (by name and 
-           creation order, both ascending and descending). PVN - 2007/10/5
-        - h5import imports string (text) data. PVN - 2007/10/5
-        - h52gif and gif2h5: Both these tools were revised to include the High
-          Level Image API support, and tests were added to /hl/tools/gif2h5.
-           PVN - 2007/04/13
-        - h5dump: added support for double long type H5T_NATIVE_LDOUBLE. PVN
-           2007/03/13
-        - h5dump: added support for binary output, see usage. PVN 2007/03/13
-        - h5repack: added support for the new nbit and scaleoffset filters.
-           PVN - 2007/05/07
-        - h5repack: now uses the API function H5Ocopy (of the tool h5copy) to
-           recreate objects if there is not a user input for changes. PVN -
-           2007/05/07
-        - h5repack: added support for reading and repacking  by hyperslabs for
-           large files. PVN - 2007/03/01
-        - h5repack: a new option allows the copy using the file type (default)
-           instead of the previous conversion to native type. PVN - 2007/03/01
-        - h5repack: output the percentage of compression used. PVN - 2007/03/01
-        - h5diff: added support for -p option for unsigned long_long data. PVN
-          - 2007/02/26
-        - h5diff: added support for comparing dataset regions. PVN - 2007/02/20
-        - h5diff: added support for reading and comparing by hyperslabs for large files.
-           PVN - 2007/02/20
-        - h5diff: printing of dataset dimensions along with dataset name. PVN -2007/02/19
-        - h5dump now uses the new API function H5Rget_name to display the name
-          of the dataset referenced instead of its ID. PVN - 2007/02/19
-        - Added new tool, h5mkgrp. QAK - 2007/02/14
-        - Added new tool, h5copy. PVN - 2006/7/15
-	- Removed obsolete pdb2hdf5 tool from tools/misc  -JML 2005/10/24
-	- Added build_h5perf_alone.sh that builds h5perf by standalone mode.
-	  AKC - 2005/09/18.
-        - Sped up h5dump on files with large numbers of objects.
-            QAK - 2005/08/25
-        - Added a standalone mode for building h5perf.  AKC - 2005/08/12
-        - new tool, h5jam. See reference manual.  2004/10/08
-        - h5repack.sh did not report errors encountered during tests.  It does
-            now.  AKC - 2004/04/02
-        - Added the MPI-I/O and MPI-POSIX drivers to the list of VFL drivers
-            available for h5dump and h5ls.  RPM & QAK - 2004/02/01
-        - Added option --vfd= to h5ls to allow a VFL driver to be selected
-            by a user.  RPM & QAK - 2004/02/01
-	- Added option -showconfig to compiler tools (h5cc,h5fc,h5c++).
-	    AKC - 2004/01/08
-        - Install the "h5cc" and "h5fc" tools as "h5pcc" and "h5pfc"
-            respectively if library is built in parallel mode.
-            WCW - 2003/11/04
-        - Added metadata benchmark (perform/perf_meta).  SLU - 2003/10/03
-        - Changed output of "OID"s from h5dump from "-" to
-            ":::" to ":"
-            QAK - 2003/08/08
 
     High-Level APIs:
     ------
-        - Fortran interfaces for the Image, Table and Lite APIs. PVN - 2007/5/1
-        - New HDF5 Dimension Scale API (H5DS) allows dimension scales to be
-          created in an HDF5 file and associated with specific datasets. PVN - 2007/5/1
-        - There are two new functions in the Lite library, H5LTtext_to_dtype
-            and H5LTdtype_to_text.  H5LTtext_to_dtype creates a HDF5 data type
-            given a text description; H5LTdtype_to_text converts a data type
-            to text description.  Only DDL definition is supported as text 
-            desciption now. SLU - 2006/05/17
-        - Added Packet Table API for creating tables with less overhead than
-            H5TB API.  Added C++ wrapper for Packet Tables.  See documentation.
-            JML - 2004/03/28
     
     Documentation 
     ------------- 
-        - The documentation for this release is largely complete, but 
-            trails the source code.  A few of the newer functions are 
-            not yet documented.                       FMB - 2007/04/18
-        - The user documents for this beta can be accessed directly at
-            this location:
-               http://www.hdfgroup.uiuc.edu/HDF5/doc_1.8pre/doc/
-            The most recent document versions (updated daily) in the 
-            1.8 development branch can be accessed at this location:
-               http://www.hdfgroup.uiuc.edu/HDF5/doc_dev_snapshot/H5_dev/
-                                                      FMB - 2007/04/18
-
 
 Support for new platforms, languages and compilers.
 =======================================
-        - Added support for Free-BSD on amd64 with GNU C and Fortran compilers
-          4.2.1
-                                                     EIP - 2007/06/25
-        - Added support for sequential and parallel libraries for Intel 64 Linux
-          cluster (abe.ncsa.uiuc.edu).  Among three MPICH packages available on
-          this machine, only Open MPI works.  The VMI has seg fault in hyperslab.c
-          and bittests.c tests.  The MVAPICH2 complained about mpd not running 
-          the parallel test.  (see Known Problems section for more info)
-                                                     EIP - 2007/06/25
-        - Added support for HPUX11.23 for both 32 and 64-bit; HDF5 C++
-        - Added support for 64-bit Windows with Visual Studio .NET and 2005.
-            SJW - 2007/06/25
-        - Added suport for HPUX11.23 for both 32 and 64-bit; HDF5 C++
-          shared library is not supported with +DD64 flag.
-                                                     EIP - 2006/06/22
-        - Added support for VAX floating numbers for Alpha Open VMS 7.3.2
-                                                     EIP - 2006/05/05
-        - Fixed broken make.com files in tools directories
-                                                     EIP - 2006/05/05
-        - Added support for Alpha Open VMS 7.3.2 EIP - 2006/04/15
-        - Added support for Cray X1.  JML - 2005/10/03
-        - PGI Fortran compiler is supported on Linux64 systems (x86_64)
-                            EIP - 2004/08/19
-        - Absoft compiler f95 v9.0 supported on Linux 2.4
-                            EIP - 2004/07/29
-        - HDF5 Fortran APIs are supported on Mac OSX with IBM XL Fortran
-            compiler version 8.1. This is a default compiler.
-        - HDF5 Fortran APIs are supported on MAC OSX with Absoft F95 compiler
-            version 8.2; set F9X environment varibale to f95, for example
-            setenv F9X f95
-            Use --disable-shared --enable-static configure flags when Absoft
-            compiler is used.
-                             EIP - 2004/07/27
-        - HDF5 Fortran APIs are supported on MAC OSX with IBM XL Fortran
-            Compiler version 8.1 Use "--disable-shared --enable-static"
-            configure flags along with the "--enable-fortran" flag to build
-            Fortran library.  EIP - 2004/01/07
-
-Bug Fixes since HDF5-1.6.0 release
+
+Bug Fixes since HDF5-1.8.0 release
 ==================================
 
     Library
     -------
-        - Fixed several bugs with writing fill values for datasets that have
-            a variable-length datatype or component datatype.  QAK - 2007/06/19
-        - STDIO driver didn't support files bigger than 2GB because the OFFSET
-            parameter of fseek is of type LONG INT, not big enough for big files.
-            Use fseeko instead for big files if it's available on the system.
-            SLU - 2007/4/5
-        - Fixed a bug in H5Sselect_valid() that caused an incorrect value to
-            be returned (0) instead of FAIL on error conditions such as the
-            selection or extent not being defined. CMC - 2007/01/17
-        - Fixed the MULTI driver problem (Bug #731) that corruptted the data.
-            SLU - 2007/1/12
-        - Fixed file corruption bug which could write an incorrect number of
-            messages to an object's header under certain circumstances.
-            Generally, the sequence of actions to generate this bug looks
-            like this:
-                - Create an object
-                - Close the file
-                - Re-open the file
-                - Add 2 (or more) attributes to the object
-                - Close the file
-                - Re-open the file
-                - Delete one of the attributes on the object
-                - Add a smaller attribute to the object
-                - Delete the smaller atttribute on the object
-                - Add a larger attribute on the object
-
-            After this, the number of header messages stored for the object
-            will be off by one.  Other sequences of modifying attributes on an
-            object could also trigger this bug.  If you are opening an
-            object and the bottom few messages of the HDF5 error stack
-            resembles this, the object has been affected by this bug:
-
-              #007: ../../hdf5_v1.6/src/H5C.c line 3887 in H5C_load_entry(): unable to load entry
-                major(08): Meta data cache layer
-                minor(40): Unable to load metadata into cache
-              #008: ../../hdf5_v1.6/src/H5Ocache.c line 332 in H5O_load(): corrupt object header - too few messages
-                major(12): Object header layer
-                minor(40): Unable to load metadata into cache
-
-            Specifically, "corrupt object header" is the best string to search
-            for in the HDF5 error stack output.
-
-            If your files have been affected by this bug, or you are concerned
-            that your files might have been, please contact the HDF Helpdesk
-            at help@hdfgroup.org for a tool to detect and repair files
-            affected by this problem.  QAK - 2006/6/16
-        - Fixed various problems with retrieving names of objects, especially
-            with mounted files.  QAK - 2005/12/25
-        - Fixed core dump when closing root groups opened through two different
-            file handles that operate on the same actual file.  QAK - 2005/10/02
-        - Corrected errors when performing various operations on a group opened
-            by dereferencing an object reference.  QAK - 2005/07/30
-        - Fixed a bug with named datatypes where a copy of a named datatype
-            used to create a dataset would accidentally use the original
-            named datatype for the dataset's datatype.  QAK - 2005/07/23
-        - Made H5Fget_name() be consistent and always return name of actual
-            file the ID is in.  (Instead of the name of the top file in a
-            file mounting hierarchy).  QAK - 2005/07/19
-        - Reworked internal file mounting semantics to hopefully eliminate
-            mounting problems.  We now require that files that are mounting
-            together all have the same "file close degree".  QAK - 2005/07/19
-        - More bug fixes on holding open files that are mounted and have
-            IDs open.  QAK - 2005/07/14
-        - Don't unmount child files until the parent file actually closes.
-            (Previously, if an object is holding open a file, the child files
-            would get unmounted too early).  QAK - 2005/07/05
-        - Fixed bug where unmounted files could cause the library to go into
-            an infinite loop when shutting down.  QAK - 2005/06/30
-        - The library didn't save the information of family driver in file.
-          The original file member size was lost after file was closed (see
-          bug #213).  This has been fixed by saving driver name and member
-          file size in the superblock.  SLU - 2005/6/24
-        - Fixed bug with hyperslab selections that use selection offsets and
-            operate on chunked datasets going into infinite loop or dumping
-            core.  QAK - 2005/06/17
-        - Corrected memory leak and possible corruption when opening a group.
-            QAK - 2005/06/17
-        - Added check for opaque datatype tags being too long (check against
-            H5T_OPAQUE_TAG_MAX, currently set to 256).  QAK - 2005/06/14
-        - Fixed various errors in maintaining names for open objects in the
-            face of unusual mount & unmount operations.  QAK - 2005/06/08
-        - "SEMI" and "STRONG" file close degree settings now apply only to the
-            particular file ID being closed, instead of operating on all open
-            file IDs for a given file.  QAK - 2005/06/01
-        - For family driver, the library didn't save member size in file.
-          When file is reopened, the size of 1st member file determine the 
-          member size.  Now member size is saved in file and is used to 
-          define member file size.  Wrong file access property of member size
-          will result in a failure.  Using any other driver except family 
-          will cause library to return error.  So is multi driver. SLU - 
-          2005/05/24  
-        - Fixed error in opening object in group that was opened in mounted
-          file which has been unmounted.  QAK - 2005/03/17
-        - Fixed a racing condition in MPIPOSIX virtual file drive close
-	  function.  Now all processes must completed the close before any
-	  of them is returned.  This prevents some "faster" processes start
-	  accessing the file for another purpose (e.g., open with truncate)
-	  while other "slower" processes have not closed the same file with
-	  the previous purpose.  AKC - 2005/03/01
-        - H5Tget_member_value calls for enum datatype didn't return correct 
-            value if H5Tenum_valueof was called first.  It's fixed.  SLU - 
-            2005/02/08
-        - For variable-length string, H5Tget_class returned H5T_STRING as its
-            class.  But H5Tdetect_class and H5Tget_member_class considered it
-            as H5T_VLEN.  This is fixed to let all these 3 functions treat it
-            as H5T_STRING.  SLU - 2005/02/08
-        - The byte order of 1-byte integer types was fixed as little endian
-            even on a big-endian machine.  This has been corrected.  SLU -
-            2005/02/07 
-        - Fix segmentation fault when calling H5Fflush with an attribute that
-            hasn't had a value written to it open.  QAK - 2004/10/18
-        - Back up supporting bitfield and time types in H5Tget_native_type.  
-            Leave it to future support.  The function simply returns error 
-            message of "not support" for bitfield and time types.  
-            SLU - 2004/10/5
-        - Fixed address check in Core VFL driver to avoid spurious address/size
-            overflows for odd valued addresses and/or sizes.  QAK - 2004/09/27
-	- Fixed parallel bug in which some processes attempted collective
-	    I/O while others did independent I/O.  Bug appeared when some
-	    processes used point selections, and others didn't.  JRM - 2004/9/15
-        - Corrected error where dataset region references were written in an
-            incorrect way on Cray machines.  PVN & QAK - 2004/09/13
-        - The H5Tget_native_type now determines the native type for integers 
-	    based on the precision. This is to avoid cases of wrongly converting 
-            an int to a short in machines that have a short of 8 bytes but with 
-	    32bit precision (e.g Cray SV1). PVN - 2004/09/07  
-        - Changed H5Dread() to not overwrite data in an application's buffer
-            with garbage when accessing a chunked dataset with an undefined
-            fill value and an unwritten chunk is uncountered.  QAK - 2004/08/25
-        - Fixed error which could cause a core dump when a type conversion
-            routine was registered after a compound datatype had been
-            converted and then an equivalment compound datatype was converted
-            again.  QAK - 2004/08/07
-        - Fixed memory overwrite when encoding "multi" file driver information
-            for file's superblock.  QAK - 2004/08/05
-        - Fixed obscure bug where a filter which failed during chunk allocation
-            could allow library to write uncompressed data to disk but think
-            the data was compressed.  QAK - 2004/07/29
-        - Fixed bug where I/O to an extendible chunked dataset with zero-sized
-            dimensions would cause library to fail an assertion.
-            QAK - 2004/07/27
-        - Fixed bug where chunked datasets which have filters defined,
-            allocation time set to "late" and whose chunks don't align with
-            the dataspace bounds could have incorrect data stored when
-            overwriting the entire dataset on the first write.  QAK - 2004/07/27
-        - Added check to ensure that dataspaces have extents set. JML-2004/07/26
-        - Fixed bug on some Solaris systems where HDF5 would try to use
-            gettimeofday() when that function didn't work properly.
-            JML - 2004/07/23
-        - Fixed bug in H5Sset_extent_simple where setting maximum size to
-            non-zero, then to zero would cause an error.  JML - 2004/07/20
-        - Allow NULL pointer for buffer parameter to H5Dread & H5Dwrite
-            when not writing data ("none" selection or hyperslab or point
-            selection with no elements defined).  QAK - 2004/07/20
-        - Calling H5Gcreate() on "/" or "." throws an error instead of
-            failing quietly. JML - 2004/07/19
-        - Fixed bug where setting file address size to be very small could
-            trigger an assert if the file grew to more than 64 KB.  Now throws
-            an error and data can be recovered. JL/NF - 2004/07/14
-        - Fixed bug where "resurrecting" a dataset was failing.
-            QAK - 2004/07/14
-        - Fixed bug where incorrect data could be read from a chunked dataset
-            after it was extended.  QAK - 2004/07/12
-        - Fixed failure to read data back from file of compound type with
-            variable-length string as field.  SLU - 2004/06/10
-        - Fixed potential file corruption bug when a block of metadata could
-            overlap the end of the internal metadata accumulator buffer and
-            the buffer would be extended correctly, but would incorrectly 
-            change it's starting address.  QAK - 2004/06/09
-        - Opaque datatype with no tag failed for some operations.  Fixed.
-            SLU - 2004/6/3 
-        - Fixed potential file corruption bug where dimensions that were
-            too large (a value greater than could be represented in 32-bits)
-            could cause the incorrect amount of space to be allocated in a
-            file for the raw data for the dataset.  QAK - 2004/06/01
-	- Fixed dtypes "sw long double -> double" failure in QSC class
-            machines.  AKC - 2004/4/16
-        - Fixed problem with fletcher32 filter when converting data of different
-	    endianess. PVN - 2004/03/10
-        - Fixed problem with H5Tget_native_type() not handling opaque fields
-            correctly.  QAK - 2004/01/31
-        - Fixed several errors in B-tree deletion code which could cause a
-            B-tree (used with groups and chunked datasets) to become corrupt
-            with the right sequence of deleted objects.  QAK - 2004/01/19
-        - Fixed small internal memory leaks of fill-value information.
-            QAK - 2004/01/13
-        - Fixed bug that caused variable-length datatypes (strings or sequences)
-            used for datasets in files with objects that were unlinked to
-            fail to be read/written to a file.  QAK - 2004/01/13
-        - Detect situation where szip 'pixels per block' is larger than the
-            fastest changing dimension of a dataset's chunk size and disallow
-            this (due to limits in szip library).  QAK - 2003/12/31
-        - Fixed bug with flattened hyperslab selections that would generate
-            incorrect hyperslab information with certain high-dimensionality
-            combinations of start/stride/count/block information.
-            QAK - 2003/12/31
-        - Fixed bug with variable-length datatypes used in compound datatypes.
-            SLU - 2003/12/29
-        - Fixed bug in parallel I/O routines that would cause reads from
-            "short datasets" (datasets which were only partially written out)
-            to return invalid data.  QAK & AKC - 2003/12/19
-        - Fixed bug where scalar dataspaces for attributes were reporting as
-            simple dataspaces.  QAK - 2003/12/13
-        - Fixed problem with selection offsets of hyperslab selections in
-            chunked datasets causing the library to go into an infinite loop.
-            QAK - 2003/12/13
-        - Fixed H5Giterate to avoid re-using index parameter after iteration
-            callback has been called (allows iteration callback to modify the
-            index parameter itself).  QAK - 2003/12/06
-        - Fixed various floating-point conversion problems, including a
-            change which could corrupt data when converting from double->float.
-            QAK - 2003/11/24
-        - Changed "single process" metadata writing in library to collective
-            I/O by all processes, in order to guarantee correct data being
-            written with MPI-I/O.  QAK - 2003/11/20
-        - Fixed problems with fill values and variable-length types and also
-            I/O on VL values that were set to NULL.  QAK - 2003/11/08
-        - Fixed problems with MPI datatypes that caused ASCI Q machine to
-            hang.  QAK - 2003/10/28
-        - Removed HDF5_MPI_PREFER_DERIVED_TYPES environment variable support,
-            since it had no benefit.  QAK - 2003/10/28
-        - Single hyperslab selections (which were set with only one call to
-            H5Sselect_hyperslab) that had dimensions that could be "flattened"
-            but were interspersed with dimensions that could not be flattened
-            were not correctly handled, causing core dumps.  QAK - 2003/10/25
-        - Fixed incorrect datatype of the third parameter to the Fortran90
-            h5pset(get)_cache_f subroutine (INTEGER to INTEGER(SIZE_T)) 
-            EIP - 2003/10/13
-        - Fixed problems with accessing variable-length data datatypes on
-            Crays.  QAK - 2003/10/10
-        - Fixed potential file corruption bug when too many object header
-            messages (probably attributes, from a user perspective) were
-            inserted into an object header and certain other conditions were
-            met.  QAK - 2003/10/08
-        - Changed implementation of internal ID searching algorithm to avoid
-            O(n) behavior for many common cases.  QAK - 2003/10/06
-        - Allow partial parallel writing to compact datasets.  QAK - 2003/10/06
-        - Correctly create reference to shared datatype in attribute, instead
-            of making a copy of the shared datatype in the attribute.
-            QAK - 2003/10/01
-        - Revert changes which caused files >2GB to fail when created with
-            MPI-I/O file driver on certain platforms.  QAK - 2003/09/16
-        - Allow compound datatypes to grow in size.  SLU - 2003/09/10
-        - Detect if a type is already packed before attempting to pack it
-            again or check if it is locked.  SLU - 2003/09/10
-        - Corrected bug when opening a file twice with read-only permission
-            for one open and then closing the read-only access file ID would
-            generate an error.  QAK - 2003/09/10
-        - Corrected bug in repeated calls to H5Pget_access_plist() which would
-            incorrectly manage reference counts of internal information and
-            eventually blow up.  QAK - 2003/09/02
-        - Return rank of the array datatype on successful call to
-            H5Tget_array_dims().  QAK - 2003/08/30
-        - Corrected bug in H5Tdetect_class which was not correctly detecting
-            datatype classes of fields in nested compound datatypes in some
-            circumstances.  QAK - 2003/08/30
-        - Corrected bug in sieve buffer code which could cause loss of data
-            when a small dataset was created and deleted in quick succession.
-            QAK - 2003/08/27
-        - Corrected bug in H5Gget_objname_by_idx which was not allowing NULL
-            for the name when just querying for the object name's length.
-            QAK - 2003/08/25
-        - Corrected bug in variable-length string handling which could
-            generate a core dump on writing variable-length strings as part
-            of a compound datatype on certain architectures.  QAK - 2003/08/25
-        - Corrected bug in H5Tget_native_type which would incorrectly compute
-            the size of certain compound datatypes and also incorrectly
-            compute the offset of the last field for those compound datatypes.
-            QAK - 2003/08/25
-        - Corrected bug in H5Tget_native_type which would drop string datatype
-            metadata (padding, etc.)  QAK - 2003/08/25
-        - Corrected bugs in H5Gget_num_objs, H5Gget_objname_by_idx and
-            H5Gget_objtype_by_idx to allow them to accept location IDs, not just
-            group IDs.  QAK - 2003/08/21
-        - Corrected bug when using scalar dataspace for memory selection and
-            operating on chunked dataset.  QAK - 2003/08/18
-        - Corrected bugs with multiple '/' characters in names for H5Glink
-            and H5Gunlink.  QAK - 2003/08/16
-        - Corrected bug with user blocks that didn't allow a user block to
-            be inserted in front of a file after the file was created.
-            QAK - 2003/08/13
-        - Corrected errors with using point selections to access data in
-            chunked datasets.  QAK - 2003/07/23
-        - Corrected error with variable-length datatypes and chunked datasets
-            caused H5Dwrite to fail sometimes.  QAK - 2003/07/19
-        - Modified library and file format to support storing indexed storage
-            (chunked dataset) B-tree's with non-default internal 'K' values.
-            QAK - 2003/07/15
-        - Returned H5T_BKG_TEMP support to library after it was accidentally
-            removed.  QAK - 2003/07/14
 
     Configuration
     -------------
-	- Configure can now use any tr command.  No more need for
-	  defining variable TR nor is it supported. -AKC 2006/05/19
-        - Parallel I/O with the MPI-I/O driver will no longer work if the
-            filesystem is not POSIX compliant.  The "HDF5_MPI_1_METAWRITE"
-            environment variable has been removed.  QAK - 2004/01/30
-        - Fixed the error that cause "make install" to fail because of the
-            macro definition syntax of "prefix?=..."  AKC - 2003/07/22
 
     Performance
     -------------
-        - Optimized I/O for enumerated datatypes that are a superset of source
-            enumerated datatype.  QAK - 2005/03/19
-        - More optimizations to inner loops of datatype conversions for
-            integers and floats which give a 10-50% speedup.  QAK - 2003/11/07
-        - Hoisted invariant 'if/else's out of inner datatype conversion loop for
-            integer and floating-point values, giving about a 20% speedup.
-            QAK - 2003/10/20
 
     Tools
     -----
-        - Fixed h5dump & h5ls to display attributes in "name" order, rather
-           than the order they are encountered in the object header.
-           QAK - 2007/10/04
-        - Fixed a bug on h5dump regarding the display of named datatypes
-           attributes. PVN 2007/03/13
-        - Fixed a bug on h5dump regarding the display of group comments. PVN
-           2007/03/13
-        - Fixed a bug on h5dump regarding the display of hardlinks pointing 
-           to the root group. PVN 2007/03/13
-        - Fixed a bug in the h5diff percentage option -p. PVN 2007/03/05
-        - Fixed a bug in h5dump that caused array indices greater than 2 ^32-1
-           not to be printed correctly - PVN 2007/2/19
-	- Fixed h5dump to print attributes data in ASCII if -r option is used.
-	    AKC - 2004/11/18
-        - Fixed space utilization reported in h5ls to correct error in formula
-            used.  QAK - 2004/10/22
-        - Fixed h5redeploy which sometimes complain too many argument for the
-            test command. (The complain did not hinder the h5redploy to
-            proceed correctly.) AKC - 2003/11/03
-        - Fixed a segmentation fault of h5diff when percentage option is used.
-            AKC - 2003/08/27
-        - Switched away from tools using internal "fixtype" function(s) to use
-            H5Tget_native_type() internally.  QAK - 2003/08/25
-
 
     Documentation 
     ------------- 
@@ -973,13 +98,10 @@ Bug Fixes since HDF5-1.6.0 release
 
     F90 APIs
     --------
-        - h5pget_driver_f was returning information that could not be
-          interpreted by fortran application program; fixed. EIP - 2005/04/10 
-
 
 Platforms Tested
 ================
-Platforms marked with * were not tested for hdf5-1.8.0-beta3 release
+Platforms marked with * were not tested for hdf5-1.8.0-rc* release
 (This information is somewhat out of date and may be inaccurate.  It will be
     updated for a later release)
 
@@ -988,36 +110,27 @@ Platforms marked with * were not tested for hdf5-1.8.0-beta3 release
                                   xlf 10.01.0000.0 
                                   mpcc_r 6.0.0.8
                                   mpxlf_r 8.1.1.7
-    AIX 5.3 (32/64 bit)           xlc 7.0.0.8
-                                  xlC 7.0.0.8
-                                  xlf  09.01.0000.0007
-*   Cray X1 water 3.0.35          Cray Standard C Version 5.4.0.7.4
-                                  Cray Fortran 5.4.0.7.3
-                                  Cray C++ 5.4.0.7.4
-    FreeBSD 6.2-STABLE            gcc 3.4.6 [FreeBSD] 20060305
-                                  g++ 3.4.6 [FreeBSD] 20060305
-                                  gcc 4.2.1 20070620
-                                  g++ 4.2.1 20070620
+    FreeBSD 6.2-STABLE i386       gcc 3.4.6 [FreeBSD] 20060305
+    (duty)                        g++ 3.4.6 [FreeBSD] 20060305
+                                  gcc 4.2.1 20080123
+                                  g++ 4.2.1 20080123
                                   gfortran 4.2.1 20070620
     FreeBSD 6.2-STABLE amd64      gcc 3.4.6 [FreeBSD] 20060305
-                                  g++ 3.4.6 [FreeBSD] 20060305
-                                  gcc 4.2.1 20070620
-                                  g++ 4.2.1 20070620
-                                  gfortran 4.2.1 20070620
+    (liberty)                     g++ 3.4.6 [FreeBSD] 20060305
+                                  gcc 4.2.1 20080123
+                                  g++ 4.2.1 20080123
+                                  gfortran 4.2.1 20080123
 
-    HP-UX B.11.23                 HP aC++/ANSI C B3910B A.06.00
-                                  HP F90 v2.9.2
-                                  HP aC++/ANSI C B3910B A.06.00
-*    IRIX64 6.5 (64 & n32)         MIPSpro cc 7.4.4m
+    IRIX64 6.5 (64 & n32)         MIPSpro cc 7.4.4m
                                   F90 MIPSpro 7.4.4m 
                                   C++ MIPSpro cc 7.4.4m
-				  mpt 1.6
+				 
     Linux 2.6.9 (RHEL4)           Intel 10.0 compilers
     (abe.ncsa.uiuc.edu)
-    Linux 2.4.21-40               gcc 3.2.3
+    Linux 2.4.21-47               gcc 3.2.3 20030502
     (osage)
-    Linux 2.6.9                   gcc 3.4.6
-    (kagiso)                      PGI 6.2-5 (pgcc, pgf90, pgCC)
+    Linux 2.6.9-42.0.10           gcc 3.4.6 20060404
+    (kagiso)                      PGI 7.0-7 (pgcc, pgf90, pgCC)
                                   Intel 9.1 (icc, ifort, icpc)
     Linux 2.6.16.27 x86_64 AMD    gcc 4.1.0 (SuSE Linux), g++ 4.1.0, g95 (GCC 4.0.3)
     (smirom)                      PGI 6.2-5 (pgcc, pgf90, pgCC)
@@ -1026,40 +139,37 @@ Platforms marked with * were not tested for hdf5-1.8.0-beta3 release
           SMP ia64                Intel(R) C++ Version 9.0
     (cobalt)                      Intel(R) Fortran Itanium(R) Version 9.0 
                                   SGI MPI
-    OSF1 V5.1 (QSC)               Compaq C V6.5-011 
-                                  HP Fortran V5.5A-3548
-				  Compaq C++ V6.5-036  
-				  MPIX200_64_r13.4
     SunOS 5.8 32,46               Sun WorkShop 6 update 2 C 5.3
-     (Solaris 2.8)                Sun WorkShop 6 update 2 Fortran 90
+     (Solaris 2.8)                Sun WorkShop 6 update 2 Fortran 95 6.2
                                   Sun WorkShop 6 update 2 C++ 5.3
-*    SunOS 5.10 i86pc              Sun C 5.7
-                                  Sun Fortran 95 8.1
-                                  Sun C++ 5.7
     SunOS 5.10                    cc: Sun C 5.8 
     (linew)                       f90: Sun Fortran 95 8.2 
                                   CC: Sun C++ 5.8 
     Xeon Linux 2.4.21-32.0.1.ELsmp-perfctr-lustre
-    (tungsten)	                  Intel(R) C++ Version 9.0
+    (tungsten)	                  gcc 3.2.2 20030222
+                                  Intel(R) C++ Version 9.0
                                   Intel(R) Fortran Compiler Version 9.0
     IA-64 Linux 2.4.21.SuSE_292.til1 ia64
-    (NCSA tg-login)               Intel(R) C++ Version 8.0
-                                  Intel(R) Fortran Compiler Version 8.0
+    (NCSA tg-login)               gcc 3.2.2
+                                  Intel(R) C++ Version 8.1
+                                  Intel(R) Fortran Compiler Version 8.1
 				  mpich-gm-1.2.5..10-intel-r2
-    Windows XP                    Visual Studio 6.0
-                                  Visual Studio .NET w/ Intel Fortran 9.0
-                                  Visual Studio 2005 w/ Intel Fortran 9.0
-                                  cygwin
-    Windows 64                    Visual Studio .NET w/ Intel Fortran 9.0
-                                  Visual Studio 2005 w/ Intel Fortran 9.0
+    Windows XP                    
+				  Visual Studio .NET
+                                  Visual Studio 2005 w/ Intel Fortran 9.1
+                                  Cygwin(native gcc compiler and g95)
+				  MinGW(native gcc compiler and g95)
+    Windows XP x64                
+			          Visual Studio 2005 w/ Intel Fortran 9.1
+    Windows Vista			
+			          Visual Studio 2005
 
     MAC OS  10.4 (Intel)          gcc i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 
                                   G95 (GCC 4.0.3 (g95 0.91!) Nov 21 2006)
-*    Alpha Open VMS 7.3
+    Alpha Open VMS 7.3
 
 
 Supported Configuration Features Summary
-(This table was not modified for 1.8.0-beta3 release; for information contact help@hdfgroup.org)
 ========================================
 
     In the tables below
@@ -1072,93 +182,83 @@ Supported Configuration Features Summary
 
 Platform                 C        F90    F90      C++   zlib  SZIP
                          parallel        parallel
-Solaris2.8 64-bit        y        y      y(1)     y     y     y
-Solaris2.8 32-bit        y        y      y(1)     y     y     y
-Solaris2.10 64-bit       y(1)     y      n        y     y     y
-Solaris2.10 32-bit       y(1)     y      n        y     y     y
-IRIX64_6.5 64-bit        y(2)     y      y        y     y     y
-IRIX64_6.5 32-bit        y(2)     n      n        n     y     y
-HPUX11.00                y(1)     y      y        y     y     y
-HPUX11.23-32bit          n        y      n        y     y     y
-HPUX11.23-64bit          n        y      n        y     y     y
-OSF1 v5.1                y        y      y        y     y     y
-Cray X1                  y        y      y        y     y     n
-Cray XT3           (16)  n        y      n        y     y     n
-AIX-5.2 & 5.3 32-bit     y        y      y        y     y     y
-AIX-5.2 & 5.3 64-bit     y        y      y        y     y     y
-WinXP .Net 2003          y        y(16)  n        y(8)  y     y               
-WinXP 64bit 
-    Visual Studio 2005   n        n      n        y     n     n
-Cygwin                   n        y      n        y     y     y
+SunOS5.8 64-bit          n        y      n        y     y     y
+SunOS5.8 32-bit          n        y      n        y     y     y
+SunOS5.10 64-bit         y(1)     y      n        y     y     y
+SunOS5.10 32-bit         y(1)     y      n        y     y     y
+IRIX64_6.5 64-bit        n        y      y        y     y     y
+IRIX64_6.5 32-bit        n        n      n        n     y     y
+AIX-5.2  32-bit          y        y      y        y     y     y
+AIX-5.2  64-bit          y        y      y        y     y     y
+Windows XP               n        y(15)  n(15)    y     y     y
+Windows XP x64           n        y(15)  n(15)    y     y     y
+Windows Vista            n        n      n        y     y     y
 Mac OS X 10.4 PowerPC    n               n
+Mac OS X 10.4 Intel      n        y      n        y     y     y
 FreeBSD 4.11             n        n      n        y     y     y
-RedHat EL3  W       (3)  y(1)     y(10)  n        y     y     y
-RedHat EL3  W Intel (3)  n        y      n        y     y     y
-RedHat EL3  W PGI   (3)  n        y      n        y     y     y
-SuSe x86_64 gcc  (3,12)  n        y(11)  n        y     y     y
-SuSe x86_64 icc  (3,12)  n        y(13)  n        y     y     y
+RedHat EL3  W       (3)  y(1a)    y(10)  y(1a)    y     y     y
+RedHat EL3  W Intel (3)  n        y      n        y     y     n
+RedHat EL3  W PGI   (3)  n        y      n        y     y     n
+SuSe x86_64 gcc  (3,12)  y(1a)    y(11)  n        y     y     y
+SuSe x86_64 Int  (3,12)  n        y(13)  n        y     y     n
+SuSe x86_64 PGI  (3,12)  n        y(8)   n        y     y     y
 Linux 2.4 Xeon C 
-    Lustre Intel  (3,6)  n        y      n        y     y     y
+    Lustre Intel  (3,6)  n        y      n        y     y     n
 Linux 2.6 SuSE ia64 C 
-    Intel         (3,7)  y        y      y        y     y     y
+    Intel         (3,7)  y        y      y        y     y     n
 Linux 2.6 SGI Altix 
     ia64 Intel      (3)  y        y      y        y     y     y
 Alpha OpenVMS 7.3.2      n        y      n        y     n     n
 
 
 
-Platform                 Shared  Shared    Shared    static-  Thread-  STREAM-
-                         C libs  F90 libs  C++ libs  exec     safe     VFD
-Solaris2.8 64-bit        y       y         n         x        y        y
-Solaris2.8 32-bit        y       y         y         x        y        y
-Solaris2.10 64-bit       y                           x        y        y
-Solaris2.10 32-bit       y                           x        y        y
-IRIX64_6.5 64-bit        y       y         n         y        y        y
-IRIX64_6.5 32-bit        y       dna       y         y        y        y
-HPUX11.00                y       n         y         x        n        y
-HPUX11.23-32bit          y       n         n         y        n        y
-HPUX11.23-64bit          y       dna       n         y        n        y
-OSF1 v5.1                y                           y        n        y
-Cray X1                  n                           y        n        y
-Cray XT3           (16)  n                           y        n        y
-AIX-5.2 & 5.3 32-bit     n       n         n         y        n        y
-AIX-5.2 & 5.3 64-bit     n       n         n         y        n        y
-WinXP .Net 2003          y       y         y         y        y        n
-WinXP 64bit 
-    Visual Studio 2005   y       y         y         y        n        n
-Cygwin                   n       dna       n         n        n        n
-Mac OS X 10.3            y                           y        n        y
-Mac OS X 10.4 PowerPC
-FreeBSD 4.11             y       n         y         y        y        y
-RedHat EL3  W       (3)  y       n(10)     y         y        y        y
-RedHat EL3  W Intel (3)  n       n         n         y        n        y
-RedHat EL3  W PGI   (3)  n       n         n         y        n        y
-SuSe x86_64 gcc  (3,12)  y       y         y         y        n        y
-SuSe x86_64 icc  (3,12)  y       y         y         y(14)    n        y
+Platform                 Shared  Shared    Shared    static-  Thread-  
+                         C libs  F90 libs  C++ libs  exec     safe     
+Solaris2.8 64-bit        y       y         y         x        y        
+Solaris2.8 32-bit        y       y         y         x        y        
+Solaris2.10 64-bit       y                           x        y        
+Solaris2.10 32-bit       y                           x        y        
+IRIX64_6.5 64-bit        y       y         n         y        y        
+IRIX64_6.5 32-bit        y       dna       y         y        y        
+AIX-5.2 & 5.3 32-bit     n       n         n         y        n        
+AIX-5.2 & 5.3 64-bit     n       n         n         y        n        
+Windows XP               y       y(15)     y         y        y        
+Windows XP x64           y       y(15)     y         y        y        
+Windows Vista            y       n         n         y        y        
+Mac OS X 10.3            y                           y        n        
+FreeBSD 4.11             y       n         y         y        y        
+RedHat EL3  W       (3)  y       y(10)     y         y        y        
+RedHat EL3  W Intel (3)  y       y         y         y        n        
+RedHat EL3  W PGI   (3)  y       y         y         y        n        
+SuSe x86_64 W GNU (3,12) y       y         y         y        y        
+SuSe x86_64 W Int (3,12) y       y         y         y(14)    n        
+SuSe x86_64 W PGI (3,12) y       y         y         y(14)    n        
 Linux 2.4 Xeon C 
-    Lustre Intel  (3,6)  y       y         y         y        n        y
+    Lustre Intel    (6)  y       y         y         y        n        
 Linux 2.4 SuSE 
-    ia64 C Intel  (3,7)  y       y         y         y        n        n
+    ia64 C Intel    (7)  y       y         y         y        n        
 Linux 2.4 SGI Altix 
-    ia64 Intel      (3)  y                           y        n        y
-Alpha OpenVMS 7.3.2      n       n         n         y        n        n
+    ia64 Intel           y                           y        n        
+Alpha OpenVMS 7.3.2      n       n         n         y        n        
 
     Notes: (1)  Using mpich 1.2.6.
+           (1a) Using mpich2 1.0.6.
            (2)  Using mpt and mpich 1.2.6.
-           (3)  Linux 2.4 with GNU, Intel, and PGI compilers, as indicated.  
+           (3)  Linux 2.6 with GNU, Intel, and PGI compilers, as indicated.  
                   W or C indicates workstation or cluster, respectively.
-           (4)  IBM XLF and Absoft
-           (5)  Using mpt.
+
            (6)  Linux 2.4.21-32.0.1.  Xeon cluster with ELsmp_perfctr_lustre 
                   and Intel compilers
            (7)  Linux 2.4.21, SuSE_292.till.  Ia64 cluster with Intel compilers
-           (8)  Intel 8.1
+           (8)  pgf90
            (9)  With Compaq Visual Fortran 6.6c compiler.
            (10) With PGI and Absoft compilers.
            (11) PGI and Intel compilers for both C and Fortran
            (12) AMD Opteron x86_64
            (13) ifort
            (14) Yes with C and Fortran, but not with C++
+	   (15) Using Visual Studio 2005 or Cygwin
+           (16) Not tested for this release.
     Compiler versions for each platform are listed in the preceding
     "Platforms Tested" table.
 
@@ -1251,12 +351,7 @@ Known Problems
   workaround until the problem is correctly handled is to use the 
   flag "--instantiate=local" prior to the configure and build steps, as:
         setenv CXX "pgCC --instantiate=local"  for pgCC 5.02 and higher
-        setenv CXX "pgCC -tlocal" for others
 
-* The h5dump tests may fail to match the expected output on some platforms
-  (e.g. parallel jobs, Windows) where the error messages directed to
-  "stderr" do not appear in the "right order" with output from stdout.
-  This is not an error.
 
 * The stream-vfd test uses ip port 10007 for testing. If another
   application is already using that port address, the test will hang
@@ -1300,12 +395,6 @@ Known Problems
       the different precision in the values displayed and h5ls appears to
       be dumping floating-point numbers correctly.
 
-* Before building HDF5 F90 Library from source on Crays 
-  replace H5Aff.f90, H5Dff.f90 and H5Pff.f90 files in the fortran/src
-  subdirectory in the top level directory with the Cray-specific files
-  from this site:
-       ftp://www.hdfgroup.uiuc.edu/pub/outgoing/hdf5/hdf5-1.8.0-pre/PATCH/
-
 * Not all platforms behave correctly with szip's shared libraries. Szip is
   disabled in these cases, and a message is relayed at configure time. Static
   libraries should be working on all systems that support szip, and should be
@@ -1318,23 +407,6 @@ Known Problems
   complaining about exit subroutine. Comment out the line 
   IF (total_error .ne. 0) CALL exit (total_error)
 
-* On IA32 and IA64 systems, if you use a compiler other than GCC (such as
-  Intel's ecc or icc compilers), you will need to modify the generated
-  "libtool" program after configuration is finished. On or around line 104 of
-  the libtool file, there are lines which look like:
-
-      # How to pass a linker flag through the compiler.
-      wl=""
-
-  change these lines to this:
-
-      # How to pass a linker flag through the compiler.
-      wl="-Wl,"
-
-  UPDATE: This is now done automatically by the configure script. However, if
-  you still experience a problem, you may want to check this line in the
-  libtool file and make sure that it has the correct value.
-
 * Information about building with PGI and Intel compilers is available in
   INSTALL file sections 5.7 and 5.8
 
diff --git a/src/H5C2journal.c b/src/H5C2journal.c
index a481e4d..84dcd8f 100644
--- a/src/H5C2journal.c
+++ b/src/H5C2journal.c
@@ -3517,7 +3517,7 @@ H5Pset_journal(hid_t fapl_id, const char *journal_file)
     HDstrcpy(mdj_config.journal_file_path, journal_file);
 
     /* set latest format */
-    if (H5Pset_latest_format(fapl_id, TRUE) < 0)
+    if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'latest format'")
 
     /* set cache config struct information */
diff --git a/src/H5D.c b/src/H5D.c
index b120736..9cd9330 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -990,7 +990,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dset_extent(hid_t dset_id, const hsize_t *size)
+H5Dset_extent(hid_t dset_id, const hsize_t size[])
 {
     H5D_t *dset;                /* Dataset for this operation */
     herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 8a081c3..5cb1df9 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -661,7 +661,7 @@ H5D_contig_writevv(const H5D_io_info_t *io_info,
     H5F_t *file = io_info->dset->oloc.file;        /* File for dataset */
     H5D_rdcdc_t *dset_contig=&(io_info->dset->shared->cache.contig); /* Cached information about contiguous data */
     const H5D_contig_storage_t *store_contig=&(io_info->store->contig);    /* Contiguous storage info for this I/O operation */
-    const unsigned char *buf=_buf;      /* Pointer to buffer to fill */
+    const unsigned char *buf=(const unsigned char *)_buf;      /* Pointer to buffer to fill */
     haddr_t addr;               /* Actual address to read */
     size_t total_size=0;        /* Size of sequence in bytes */
     size_t size;                /* Size of sequence in bytes */
@@ -1204,11 +1204,11 @@ done:
         if(H5I_dec_ref(tid_mem) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "Can't decrement temporary datatype ID")
     if(buf)
-        H5FL_BLK_FREE(type_conv, buf);
+        (void)H5FL_BLK_FREE(type_conv, buf);
     if(reclaim_buf)
-        H5FL_BLK_FREE(type_conv, reclaim_buf);
+        (void)H5FL_BLK_FREE(type_conv, reclaim_buf);
     if(bkg)
-        H5FL_BLK_FREE(type_conv, bkg);
+        (void)H5FL_BLK_FREE(type_conv, bkg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_contig_copy() */
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 2810f5a..9fcf367 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -280,7 +280,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Dextend(hid_t dset_id, const hsize_t *size)
+H5Dextend(hid_t dset_id, const hsize_t size[])
 {
     H5D_t	*dset;
     herr_t       ret_value = SUCCEED;  /* Return value */
@@ -346,10 +346,6 @@ H5D_extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 
     /* Updated the dataset's info if the dataspace was successfully extended */
     if(changed) {
-	/* Save the new dataspace in the file if necessary */
-	if(H5S_write(&(dataset->oloc), space, TRUE, dxpl_id) < 0)
-	    HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update file with new dataspace")
-
         /* Update the index values for the cached chunks for this dataset */
         if(H5D_CHUNKED == dataset->shared->layout.type)
             if(H5D_istore_update_cache(dataset, dxpl_id) < 0)
@@ -358,8 +354,11 @@ H5D_extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 	/* Allocate space for the new parts of the dataset, if appropriate */
         fill = &dataset->shared->dcpl_cache.fill;
         if(fill->alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_EXTEND, TRUE, FALSE) < 0)
+            if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_EXTEND, FALSE) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
+
+        /* Mark the dataspace as dirty, for later writing to the file */
+        dataset->shared->space_dirty = TRUE;
     } /* end if */
 
 done:
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 94b53d3..a5ea398 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -65,6 +65,7 @@ static herr_t H5D_init_type(H5F_t *file, const H5D_t *dset, hid_t type_id,
 static herr_t H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space);
 static herr_t H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset);
 static herr_t H5D_open_oid(H5D_t *dataset, hid_t dxpl_id);
+static herr_t H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags);
 
 
 /*********************/
@@ -97,6 +98,9 @@ H5FL_DEFINE_STATIC(H5D_shared_t);
 /* Declare the external PQ free list for the sieve buffer information */
 H5FL_BLK_EXTERN(sieve_buf);
 
+/* Declare the external free list to manage the H5D_chunk_info_t struct */
+H5FL_EXTERN(H5D_chunk_info_t);
+
 /* Define a static "default" dataset structure to use to initialize new datasets */
 static H5D_shared_t H5D_def_dset;
 
@@ -567,7 +571,7 @@ done:
 static herr_t
 H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
 {
-    struct H5O_t       *oh = NULL;      /* Pointer to dataset's object header */
+    H5O_t              *oh = NULL;      /* Pointer to dataset's object header */
     size_t              ohdr_size = H5D_MINHDR_SIZE;    /* Size of dataset's object header */
     H5O_loc_t          *oloc = NULL;    /* Dataset's object location */
     H5O_layout_t       *layout;         /* Dataset's layout information */
@@ -653,10 +657,10 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
 
     /* Get a pointer to the object header itself */
     if((oh = H5O_protect(oloc, dxpl_id)) == NULL)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to protect dataset object header")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect dataset object header")
 
     /* Write new fill value message */
-    if(H5O_msg_append(file, dxpl_id, oh, H5O_FILL_NEW_ID, H5O_MSG_FLAG_CONSTANT, 0, fill_prop) < 0)
+    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_NEW_ID, H5O_MSG_FLAG_CONSTANT, 0, fill_prop) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update new fill value header message")
 
     /* If there is valid information for the old fill value struct, add it */
@@ -672,12 +676,12 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
         H5O_msg_reset_share(H5O_FILL_ID, &old_fill_prop);
 
         /* Write old fill value */
-        if(H5O_msg_append(file, dxpl_id, oh, H5O_FILL_ID, H5O_MSG_FLAG_CONSTANT, 0, &old_fill_prop) < 0)
+        if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_FILL_ID, H5O_MSG_FLAG_CONSTANT, 0, &old_fill_prop) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update old fill value header message")
     } /* end if */
 
     /* Update the datatype and dataspace header messages */
-    if(H5O_msg_append(file, dxpl_id, oh, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT, 0, type) < 0)
+    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_DTYPE_ID, H5O_MSG_FLAG_CONSTANT, 0, type) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update datatype header message")
     if(H5S_append(file, dxpl_id, oh, dset->shared->space) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update dataspace header message")
@@ -687,7 +691,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
         H5O_pline_t     *pline;         /* Dataset's I/O pipeline information */
 
         pline = &dset->shared->dcpl_cache.pline;
-        if(pline->nused > 0 && H5O_msg_append(file, dxpl_id, oh, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, pline) < 0)
+        if(pline->nused > 0 && H5O_msg_append_oh(file, dxpl_id, oh, H5O_PLINE_ID, H5O_MSG_FLAG_CONSTANT, 0, pline) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update filter header message")
     } /* end if */
 
@@ -696,7 +700,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
      * allocation until later.
      */
     if(fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY)
-        if(H5D_alloc_storage(file, dxpl_id, dset, H5D_ALLOC_CREATE, FALSE, FALSE) < 0)
+        if(H5D_alloc_storage(file, dxpl_id, dset, H5D_ALLOC_CREATE, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
 
     /* Update external storage message, if it's used */
@@ -716,7 +720,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
 
         /* Pin the heap down in memory */
         if(NULL == (heap = H5HL_protect(file, dxpl_id, efl->heap_addr, H5AC_WRITE)))
-            HGOTO_ERROR(H5E_DATASET, H5E_PROTECT, FAIL, "unable to protect EFL file name heap")
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect EFL file name heap")
 
         /* Insert "empty" name first */
         if((size_t)(-1) == H5HL_insert(file, dxpl_id, heap, (size_t)1, "")) {
@@ -741,18 +745,18 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
 
         /* Release the heap */
         if(H5HL_unprotect(file, dxpl_id, heap, efl->heap_addr) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_PROTECT, FAIL, "unable to unprotect EFL file name heap")
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect EFL file name heap")
         heap = NULL;
 
         /* Insert EFL message into dataset object header */
-        if(H5O_msg_append(file, dxpl_id, oh, H5O_EFL_ID, H5O_MSG_FLAG_CONSTANT, 0, efl) < 0)
+        if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_EFL_ID, H5O_MSG_FLAG_CONSTANT, 0, efl) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update external file list message")
     } /* end if */
 
     /* Create layout message */
     /* (Don't make layout message constant unless allocation time is early, since space may not be allocated) */
     /* (Note: this is relying on H5D_alloc_storage not calling H5O_msg_write during dataset creation) */
-    if(H5O_msg_append(file, dxpl_id, oh, H5O_LAYOUT_ID, ((fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY && H5D_COMPACT != layout->type) ? H5O_MSG_FLAG_CONSTANT : 0), 0, layout) < 0)
+    if(H5O_msg_append_oh(file, dxpl_id, oh, H5O_LAYOUT_ID, ((fill_prop->alloc_time == H5D_ALLOC_TIME_EARLY && H5D_COMPACT != layout->type) ? H5O_MSG_FLAG_CONSTANT : 0), 0, layout) < 0)
          HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout")
 
 #ifdef H5O_ENABLE_BOGUS
@@ -778,15 +782,16 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
 }
 #endif /* H5O_ENABLE_BOGUS */
 
-    /* Add a modification time message. */
-    if(H5O_touch_oh(file, dxpl_id, oh, TRUE) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update modification time message")
+    /* Add a modification time message, if using older format. */
+    if(!use_latest_format)
+        if(H5O_touch_oh(file, dxpl_id, oh, TRUE) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update modification time message")
 
 done:
     /* Release pointer to object header itself */
     if(oloc != NULL && oh != NULL)
         if(H5O_unprotect(oloc, oh) < 0)
-            HDONE_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to unprotect dataset object header")
+            HDONE_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect dataset object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_update_oh_info() */
@@ -1428,7 +1433,7 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
             && ((dataset->shared->layout.type == H5D_CONTIGUOUS && !H5F_addr_defined(dataset->shared->layout.u.contig.addr))
                 || (dataset->shared->layout.type == H5D_CHUNKED && !H5F_addr_defined(dataset->shared->layout.u.chunk.addr)))
             && IS_H5FD_MPI(dataset->oloc.file)) {
-        if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_OPEN, TRUE, FALSE) < 0)
+        if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_OPEN, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize file storage")
     } /* end if */
 
@@ -1491,28 +1496,14 @@ H5D_close(H5D_t *dataset)
 
     dataset->shared->fo_count--;
     if(dataset->shared->fo_count == 0) {
-        /* Update the dataspace on disk, if it's been changed */
-        if(dataset->shared->space_dirty) {
-            if(H5S_write(&(dataset->oloc), dataset->shared->space, TRUE, H5AC_dxpl_id) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update file with new dataspace")
-            dataset->shared->space_dirty = FALSE;
-        } /* end if */
+        /* Flush the dataset's information */
+        if(H5D_flush_real(dataset, H5AC_dxpl_id, H5F_FLUSH_NONE) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
 
         /* Free the data sieve buffer, if it's been allocated */
         if(dataset->shared->cache.contig.sieve_buf) {
             HDassert(dataset->shared->layout.type != H5D_COMPACT);      /* We should never have a sieve buffer for compact storage */
 
-            /* Flush the raw data buffer, if its dirty */
-            if(dataset->shared->cache.contig.sieve_dirty) {
-                /* Write dirty data sieve buffer to file */
-                if(H5F_block_write(dataset->oloc.file, H5FD_MEM_DRAW, dataset->shared->cache.contig.sieve_loc,
-                        dataset->shared->cache.contig.sieve_size, H5AC_dxpl_id, dataset->shared->cache.contig.sieve_buf) < 0)
-                    HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
-
-                /* Reset sieve buffer dirty flag */
-                dataset->shared->cache.contig.sieve_dirty = FALSE;
-            } /* end if */
-
             dataset->shared->cache.contig.sieve_buf = (unsigned char *)H5FL_BLK_FREE(sieve_buf,dataset->shared->cache.contig.sieve_buf);
         } /* end if */
 
@@ -1522,19 +1513,31 @@ H5D_close(H5D_t *dataset)
                 break;
 
             case H5D_CHUNKED:
+                /* Check for skip list for iterating over chunks during I/O to close */
+                if(dataset->shared->cache.chunk.sel_chunks) {
+                    HDassert(H5SL_count(dataset->shared->cache.chunk.sel_chunks) == 0);
+                    H5SL_close(dataset->shared->cache.chunk.sel_chunks);
+                    dataset->shared->cache.chunk.sel_chunks = NULL;
+                } /* end if */
+
+                /* Check for cached single chunk dataspace */
+                if(dataset->shared->cache.chunk.single_space) {
+                    (void)H5S_close(dataset->shared->cache.chunk.single_space);
+                    dataset->shared->cache.chunk.single_space = NULL;
+                } /* end if */
+
+                /* Check for cached single element chunk info */
+                if(dataset->shared->cache.chunk.single_chunk_info) {
+                    (void)H5FL_FREE(H5D_chunk_info_t, dataset->shared->cache.chunk.single_chunk_info);
+                    dataset->shared->cache.chunk.single_chunk_info = NULL;
+                } /* end if */
+
                 /* Flush and destroy chunks in the cache */
-                if(H5D_istore_dest(dataset,H5AC_dxpl_id) < 0)
+                if(H5D_istore_dest(dataset, H5AC_dxpl_id) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
                 break;
 
             case H5D_COMPACT:
-                /* Update header message of layout for compact dataset. */
-                if(dataset->shared->layout.u.compact.dirty) {
-                    if(H5O_msg_write(&(dataset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dataset->shared->layout), H5AC_dxpl_id) < 0)
-                        HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to update layout message")
-                    dataset->shared->layout.u.compact.dirty = FALSE;
-                } /* end if */
-
                 /* Free the buffer for the raw data for compact datasets */
                 dataset->shared->layout.u.compact.buf = H5MM_xfree(dataset->shared->layout.u.compact.buf);
                 break;
@@ -1716,7 +1719,7 @@ H5D_get_file(const H5D_t *dset)
  */
 herr_t
 H5D_alloc_storage(H5F_t *f, hid_t dxpl_id, H5D_t *dset/*in,out*/, H5D_time_alloc_t time_alloc,
-    hbool_t update_time, hbool_t full_overwrite)
+    hbool_t full_overwrite)
 {
     struct H5O_layout_t *layout;        /* The dataset's layout information */
     hbool_t must_init_space = FALSE;    /* Flag to indicate that space should be initialized */
@@ -1771,7 +1774,7 @@ H5D_alloc_storage(H5F_t *f, hid_t dxpl_id, H5D_t *dset/*in,out*/, H5D_time_alloc
                  */
 		if(dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY
                         && time_alloc == H5D_ALLOC_EXTEND)
-		    must_init_space = 1;
+		    must_init_space = TRUE;
                 break;
 
             case H5D_COMPACT:
@@ -1833,12 +1836,15 @@ H5D_alloc_storage(H5F_t *f, hid_t dxpl_id, H5D_t *dset/*in,out*/, H5D_time_alloc
             } /* end else */
         } /* end if */
 
-        /* Also update header message for layout with new address, if we
-         * set the address.  (this is improves forward compatibility).
+        /* If we set the address (and aren't in the middle of creating the
+         *      dataset), mark the layout header message for later writing to
+         *      the file.  (this improves forward compatibility).
+         */
+        /* (The layout message is already in the dataset's object header, this
+         *      operation just sets the address and makes it constant)
          */
         if(time_alloc != H5D_ALLOC_CREATE && addr_set)
-            if(H5O_msg_write(&dset->oloc, H5O_LAYOUT_ID, H5O_MSG_FLAG_CONSTANT, update_time, &dset->shared->layout, dxpl_id) < 0)
-                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout message")
+            dset->shared->layout_dirty = TRUE;
     } /* end if */
 
 done:
@@ -2171,7 +2177,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, unsigned UNUSED ndim, co
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't resize tbuf")
 
     /* Select point to read in */
-    if(H5Sselect_elements(vlen_bufsize->fspace_id, H5S_SELECT_SET, (size_t)1, (const hsize_t **)point) < 0)
+    if(H5Sselect_elements(vlen_bufsize->fspace_id, H5S_SELECT_SET, (size_t)1, point) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't select point")
 
     /* Read in the point (with the custom VL memory allocator) */
@@ -2309,7 +2315,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
 
 	/* Allocate space for the new parts of the dataset, if appropriate */
         if(expand && dset->shared->dcpl_cache.fill.alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D_alloc_storage(dset->oloc.file, dxpl_id, dset, H5D_ALLOC_EXTEND, TRUE, FALSE) < 0)
+            if(H5D_alloc_storage(dset->oloc.file, dxpl_id, dset, H5D_ALLOC_EXTEND, FALSE) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset storage")
 
 
@@ -2349,7 +2355,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5D_flush_cb
+ * Function:    H5D_flush_real
  *
  * Purpose:     Flush any dataset information cached in memory
  *
@@ -2357,69 +2363,132 @@ done:
  *		Failure:	Negative
  *
  * Programmer:  Quincey Koziol
- *              November 8, 2007
+ *              December 6, 2007
  *
  *-------------------------------------------------------------------------
  */
-static int
-H5D_flush_cb(void *_dataset, hid_t UNUSED id, void *_udata)
+static herr_t
+H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
 {
-    H5D_t       *dataset = (H5D_t *)_dataset;   /* Dataset pointer */
-    H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata;   /* User data for callback */
-    int         ret_value = H5_ITER_CONT;       /* Return value */
+    H5O_t *oh = NULL;                   /* Pointer to dataset's object header */
+    herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5D_flush_cb)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_flush_real)
 
     /* Check args */
     HDassert(dataset);
 
-    /* Check for dataset in same file */
-    if(udata->f == dataset->oloc.file) {
+    /* Check for metadata changes that will require updating the object's modification time */
+    if(dataset->shared->layout_dirty || dataset->shared->space_dirty) {
+        unsigned update_flags = H5O_UPDATE_TIME;        /* Modification time flag */
+
+        /* Get a pointer to the dataset's object header */
+        if((oh = H5O_protect(&dataset->oloc, dxpl_id)) == NULL)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect dataset object header")
+
+        /* Update the layout on disk, if it's been changed */
+        if(dataset->shared->layout_dirty) {
+            if(H5O_msg_write_oh(dataset->oloc.file, dxpl_id, oh, H5O_LAYOUT_ID, H5O_MSG_FLAG_CONSTANT, update_flags, &dataset->shared->layout) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update layout message")
+            dataset->shared->layout_dirty = FALSE;
+
+            /* Reset the "update the modification time" flag, so we only do it once */
+            update_flags = 0;
+        } /* end if */
+
         /* Update the dataspace on disk, if it's been changed */
         if(dataset->shared->space_dirty) {
-            if(H5S_write(&(dataset->oloc), dataset->shared->space, TRUE, udata->dxpl_id) < 0)
+            if(H5S_write(dataset->oloc.file, dxpl_id, oh, update_flags, dataset->shared->space) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update file with new dataspace")
             dataset->shared->space_dirty = FALSE;
+
+            /* Reset the "update the modification time" flag, so we only do it once */
+            update_flags = 0;
         } /* end if */
 
-        /* Flush the raw data buffer, if we have a dirty one */
-        if(dataset->shared->cache.contig.sieve_buf && dataset->shared->cache.contig.sieve_dirty) {
-            HDassert(dataset->shared->layout.type != H5D_COMPACT);      /* We should never have a sieve buffer for compact storage */
+        /* _Somebody_ should have update the modification time! */
+        HDassert(update_flags == 0);
+    } /* end if */
 
-            /* Write dirty data sieve buffer to file */
-            if(H5F_block_write(udata->f, H5FD_MEM_DRAW, dataset->shared->cache.contig.sieve_loc,
-                    dataset->shared->cache.contig.sieve_size, udata->dxpl_id, dataset->shared->cache.contig.sieve_buf) < 0)
-                HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
+    /* Flush the raw data buffer, if we have a dirty one */
+    if(dataset->shared->cache.contig.sieve_buf && dataset->shared->cache.contig.sieve_dirty) {
+        HDassert(dataset->shared->layout.type != H5D_COMPACT);      /* We should never have a sieve buffer for compact storage */
 
-            /* Reset sieve buffer dirty flag */
-            dataset->shared->cache.contig.sieve_dirty = FALSE;
-        } /* end if */
+        /* Write dirty data sieve buffer to file */
+        if(H5F_block_write(dataset->oloc.file, H5FD_MEM_DRAW, dataset->shared->cache.contig.sieve_loc,
+                dataset->shared->cache.contig.sieve_size, dxpl_id, dataset->shared->cache.contig.sieve_buf) < 0)
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "block write failed")
 
-        /* Flush cached information for each kind of dataset */
-        switch(dataset->shared->layout.type) {
-            case H5D_CONTIGUOUS:
-                break;
+        /* Reset sieve buffer dirty flag */
+        dataset->shared->cache.contig.sieve_dirty = FALSE;
+    } /* end if */
 
-            case H5D_CHUNKED:
-                /* Flush the raw data cache */
-                if(H5D_istore_flush(dataset, udata->dxpl_id, udata->flags & H5F_FLUSH_INVALIDATE) < 0)
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush raw data cache")
-                break;
+    /* Flush cached information for each kind of dataset */
+    switch(dataset->shared->layout.type) {
+        case H5D_CONTIGUOUS:
+            break;
 
-            case H5D_COMPACT:
-                if(dataset->shared->layout.u.compact.dirty) {
-                    if(H5O_msg_write(&(dataset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dataset->shared->layout), udata->dxpl_id) < 0)
-                        HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update layout message")
-                    dataset->shared->layout.u.compact.dirty = FALSE;
-                } /* end if */
-                break;
+        case H5D_CHUNKED:
+            /* Flush the raw data cache */
+            if(H5D_istore_flush(dataset, dxpl_id, flags & H5F_FLUSH_INVALIDATE) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush raw data cache")
+            break;
 
-            default:
-                HDassert("not implemented yet" && 0);
+        case H5D_COMPACT:
+            if(dataset->shared->layout.u.compact.dirty) {
+                if(H5O_msg_write(&(dataset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dataset->shared->layout), dxpl_id) < 0)
+                    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update layout message")
+                dataset->shared->layout.u.compact.dirty = FALSE;
+            } /* end if */
+            break;
+
+        default:
+            HDassert("not implemented yet" && 0);
 #ifdef NDEBUG
-                HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
+            HGOTO_ERROR(H5E_IO, H5E_UNSUPPORTED, FAIL, "unsupported storage layout")
 #endif /* NDEBUG */
-        } /* end switch */ /*lint !e788 All appropriate cases are covered */
+    } /* end switch */ /*lint !e788 All appropriate cases are covered */
+
+done:
+    /* Release pointer to object header */
+    if(oh != NULL)
+        if(H5O_unprotect(&(dataset->oloc), oh) < 0)
+            HDONE_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect dataset object header")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_flush_real() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5D_flush_cb
+ *
+ * Purpose:     Flush any dataset information cached in memory
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              November 8, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+H5D_flush_cb(void *_dataset, hid_t UNUSED id, void *_udata)
+{
+    H5D_t       *dataset = (H5D_t *)_dataset;   /* Dataset pointer */
+    H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata;   /* User data for callback */
+    int         ret_value = H5_ITER_CONT;       /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5D_flush_cb)
+
+    /* Check args */
+    HDassert(dataset);
+
+    /* Check for dataset in same file */
+    if(udata->f == dataset->oloc.file) {
+        /* Flush the dataset's information */
+        if(H5D_flush_real(dataset, udata->dxpl_id, udata->flags) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to flush cached dataset info")
     } /* end if */
 
 done:
@@ -2460,7 +2529,6 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id, unsigned flags)
     H5I_search(H5I_DATASET, H5D_flush_cb, &udata);
 
 done:
-
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_flush() */
 
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 78140e0..cef34ee 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -45,6 +45,12 @@
 
 #define H5D_DEFAULT_SKIPLIST_HEIGHT     8
 
+/* Macros for iterating over chunks to operate on */
+#define H5D_CHUNK_GET_FIRST_NODE(map) (map.use_single ? (H5SL_node_t *)(1) : H5SL_first(map.sel_chunks))
+#define H5D_CHUNK_GET_NODE_INFO(map, node)  (map.use_single ? map.single_chunk_info : (H5D_chunk_info_t *)H5SL_item(node))
+#define H5D_CHUNK_GET_NEXT_NODE(map, node)  (map.use_single ? (H5SL_node_t *)NULL : H5SL_next(node))
+
+
 /******************/
 /* Local Typedefs */
 /******************/
@@ -120,7 +126,7 @@ static herr_t H5D_chunk_mem_cb(void *elem, hid_t type_id, unsigned ndims,
 H5FL_BLK_DEFINE(type_conv);
 
 /* Declare a free list to manage the H5D_chunk_info_t struct */
-H5FL_DEFINE_STATIC(H5D_chunk_info_t);
+H5FL_DEFINE(H5D_chunk_info_t);
 
 /* Declare a free list to manage sequences of size_t */
 H5FL_SEQ_DEFINE_STATIC(size_t);
@@ -161,7 +167,7 @@ H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
     assert(cache);
 
     /* Get the dataset transfer property list */
-    if (NULL == (dx_plist = H5I_object(dxpl_id)))
+    if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
     /* Get maximum temporary buffer size */
@@ -302,12 +308,12 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
              plist_id, buf);
 
     /* check arguments */
-    if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET)))
+    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
     if(NULL == dset->oloc.file)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
     if(H5S_ALL != mem_space_id) {
-	if(NULL == (mem_space = H5I_object_verify(mem_space_id, H5I_DATASPACE)))
+	if(NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
@@ -315,7 +321,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection+offset not within extent")
     } /* end if */
     if(H5S_ALL != file_space_id) {
-	if(NULL == (file_space = H5I_object_verify(file_space_id, H5I_DATASPACE)))
+	if(NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
@@ -394,12 +400,12 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
              plist_id, buf);
 
     /* check arguments */
-    if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET)))
+    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
     if(NULL == dset->oloc.file)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
     if(H5S_ALL != mem_space_id) {
-	if(NULL == (mem_space = H5I_object_verify(mem_space_id, H5I_DATASPACE)))
+	if(NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
@@ -407,7 +413,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "memory selection+offset not within extent")
     } /* end if */
     if(H5S_ALL != file_space_id) {
-	if(NULL == (file_space = H5I_object_verify(file_space_id, H5I_DATASPACE)))
+	if(NULL == (file_space = (const H5S_t *)H5I_object_verify(file_space_id, H5I_DATASPACE)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
 	/* Check for valid selection */
@@ -475,7 +481,7 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     HDassert(dataset && dataset->oloc.file);
 
     /* Get memory datatype */
-    if(NULL == (mem_type = H5I_object_verify(mem_type_id, H5I_DATATYPE)))
+    if(NULL == (mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     if(!file_space)
@@ -617,7 +623,7 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
     HDassert(dataset && dataset->oloc.file);
 
     /* Get the memory datatype */
-    if(NULL == (mem_type = H5I_object_verify(mem_type_id, H5I_DATATYPE)))
+    if(NULL == (mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE)))
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* All filters in the DCPL must have encoding enabled. */
@@ -701,7 +707,7 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
             full_overwrite = (hsize_t)file_nelmts==nelmts ? TRUE : FALSE;
 
  	/* Allocate storage */
-        if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_WRITE, TRUE, full_overwrite) < 0)
+        if(H5D_alloc_storage(dataset->oloc.file, dxpl_id, dataset, H5D_ALLOC_WRITE, full_overwrite) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize storage")
     } /* end if */
 
@@ -918,15 +924,15 @@ H5D_contig_read(H5D_io_info_t *io_info, hsize_t nelmts,
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
-    if (NULL==(tconv_buf=dxpl_cache->tconv_buf)) {
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
         /* Allocate temporary buffer */
-        if((tconv_buf=H5FL_BLK_MALLOC(type_conv,target_size))==NULL)
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
     } /* end if */
-    if (need_bkg && NULL==(bkg_buf=dxpl_cache->bkgr_buf)) {
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
         /* Allocate background buffer */
         /* (Need calloc()-like call since memory needs to be initialized) */
-        if((bkg_buf=H5FL_BLK_CALLOC(type_conv,(request_nelmts*dst_type_size)))==NULL)
+        if(NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (request_nelmts * dst_type_size))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
     } /* end if */
 
@@ -1035,9 +1041,9 @@ done:
     } /* end if */
 
     if (tconv_buf && NULL==dxpl_cache->tconv_buf)
-        H5FL_BLK_FREE(type_conv,tconv_buf);
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
     if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
-        H5FL_BLK_FREE(type_conv,bkg_buf);
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_contig_read() */
@@ -1196,15 +1202,15 @@ H5D_contig_write(H5D_io_info_t *io_info, hsize_t nelmts,
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
-    if (NULL==(tconv_buf=dxpl_cache->tconv_buf)) {
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
         /* Allocate temporary buffer */
-        if((tconv_buf=H5FL_BLK_MALLOC(type_conv,target_size))==NULL)
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
     } /* end if */
-    if (need_bkg && NULL==(bkg_buf=dxpl_cache->bkgr_buf)) {
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
         /* Allocate background buffer */
         /* (Don't need calloc()-like call since file data is already initialized) */
-        if((bkg_buf=H5FL_BLK_MALLOC(type_conv,(request_nelmts*dst_type_size)))==NULL)
+        if(NULL == (bkg_buf = H5FL_BLK_MALLOC(type_conv, (request_nelmts * dst_type_size))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
     } /* end if */
 
@@ -1303,9 +1309,9 @@ done:
     } /* end if */
 
     if (tconv_buf && NULL==dxpl_cache->tconv_buf)
-        H5FL_BLK_FREE(type_conv,tconv_buf);
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
     if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
-        H5FL_BLK_FREE(type_conv,bkg_buf);
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_contig_write() */
@@ -1378,6 +1384,11 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
     /* Set dataset storage for I/O info */
     io_info->store=&store;
 
+    /* Compute element sizes */
+    src_type_size = H5T_get_size(dataset->shared->type);
+    dst_type_size = H5T_get_size(mem_type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+
     /*
      * If there is no type conversion then read directly into the
      * application's buffer.  This saves at least one mem-to-mem copy.
@@ -1408,13 +1419,13 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
 	else {/* sequential or independent read */
 #endif
             /* Get first node in chunk skip list */
-            chunk_node = H5SL_first(fm.fsel);
+            chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
 
             while(chunk_node) {
                 H5D_chunk_info_t *chunk_info;   /* chunk information */
 
                 /* Get the actual chunk information from the skip list node */
-                chunk_info = H5SL_item(chunk_node);
+                chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
                 /* Pass in chunk's coordinates in a union. */
                 store.chunk.offset = chunk_info->coords;
@@ -1430,19 +1441,19 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
 
                 /* Perform the actual read operation */
                 if((io_info->ops.read)(io_info, chunk_info->chunk_points,
-                        H5T_get_size(dataset->shared->type), chunk_info->fspace,
+                        src_type_size, chunk_info->fspace,
                         chunk_info->mspace, chunk_addr, chunk, buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, " chunked read failed")
   
                 /* Release the cache lock on the chunk. */
                 if(chunk) {
-                    accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+                    accessed_bytes = chunk_info->chunk_points * src_type_size;
 		    if(H5D_istore_unlock(io_info, FALSE, idx_hint, chunk, accessed_bytes) < 0)
 			HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
 		} /* end if */
 
                 /* Advance to next chunk in list */
-                chunk_node = H5SL_next(chunk_node);
+                chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
             } /* end while */
 #ifdef H5_HAVE_PARALLEL
 	}
@@ -1451,7 +1462,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
 
 #ifdef H5S_DEBUG
         H5_timer_end(&(io_info->stats->stats[1].read_timer), &timer);
-        io_info->stats->stats[1].read_nbytes += nelmts * H5T_get_size(dataset->shared->type);
+        io_info->stats->stats[1].read_nbytes += nelmts * src_type_size;
         io_info->stats->stats[1].read_ncalls++;
 #endif
 
@@ -1465,10 +1476,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
     if(nelmts==0)
         HGOTO_DONE(SUCCEED)
 
-    /* Compute element sizes and other parameters */
-    src_type_size = H5T_get_size(dataset->shared->type);
-    dst_type_size = H5T_get_size(mem_type);
-    max_type_size = MAX(src_type_size, dst_type_size);
+    /* Compute buffer  sizes and other parameters */
     target_size = dxpl_cache->max_temp_buf;
     /* XXX: This could cause a problem if the user sets their buffer size
      * to the same size as the default, and then the dataset elements are
@@ -1505,29 +1513,29 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
-    if (NULL==(tconv_buf=dxpl_cache->tconv_buf)) {
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
         /* Allocate temporary buffer */
-        if((tconv_buf=H5FL_BLK_MALLOC(type_conv,target_size))==NULL)
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
     } /* end if */
-    if (need_bkg && NULL==(bkg_buf=dxpl_cache->bkgr_buf)) {
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
         /* Allocate background buffer */
         /* (Need calloc()-like call since memory needs to be initialized) */
-        if((bkg_buf=H5FL_BLK_CALLOC(type_conv,(request_nelmts*dst_type_size)))==NULL)
+        if(NULL == (bkg_buf = H5FL_BLK_CALLOC(type_conv, (request_nelmts * dst_type_size))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
     } /* end if */
 
     /* Loop over all the chunks, performing I/O on each */
 
     /* Get first node in chunk skip list */
-    chunk_node=H5SL_first(fm.fsel);
+    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
 
     /* Iterate through chunks to be operated on */
     while(chunk_node) {
         H5D_chunk_info_t *chunk_info;   /* chunk information */
 
         /* Get the actual chunk information from the skip list nodes */
-        chunk_info=H5SL_item(chunk_node);
+        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
         /* initialize selection iterator */
         if (H5S_select_iter_init(&file_iter, chunk_info->fspace, src_type_size) < 0)
@@ -1647,7 +1655,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
 
         /* Release the cache lock on the chunk. */
         if(chunk) {
-            accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+            accessed_bytes = chunk_info->chunk_points * src_type_size;
             if(H5D_istore_unlock(io_info, FALSE, idx_hint, chunk, accessed_bytes) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
         } /* end if */
@@ -1670,7 +1678,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts,
         } /* end if */
 
         /* Get the next chunk node in the skip list */
-        chunk_node=H5SL_next(chunk_node);
+        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
     } /* end while */
 
 done:
@@ -1689,9 +1697,9 @@ done:
     } /* end if */
 
     if(tconv_buf && NULL == dxpl_cache->tconv_buf)
-        H5FL_BLK_FREE(type_conv, tconv_buf);
+        (void)H5FL_BLK_FREE(type_conv, tconv_buf);
     if(bkg_buf && NULL == dxpl_cache->bkgr_buf)
-        H5FL_BLK_FREE(type_conv, bkg_buf);
+        (void)H5FL_BLK_FREE(type_conv, bkg_buf);
 
     /* Release chunk mapping information */
     if(H5D_destroy_chunk_map(&fm) < 0)
@@ -1779,6 +1787,11 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
     } /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
+    /* Compute element sizes and other parameters */
+    src_type_size = H5T_get_size(mem_type);
+    dst_type_size = H5T_get_size(dataset->shared->type);
+    max_type_size = MAX(src_type_size, dst_type_size);
+
     /*
      * If there is no type conversion then write directly from the
      * application's buffer.  This saves at least one mem-to-mem copy.
@@ -1804,13 +1817,13 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
 	else {/* sequential or independent write */
 #endif /* H5_HAVE_PARALLEL */
             /* Get first node in chunk skip list */
-            chunk_node=H5SL_first(fm.fsel);
+            chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
 
             while(chunk_node) {
                 H5D_chunk_info_t *chunk_info;       /* Chunk information */
 
                 /* Get the actual chunk information from the skip list node */
-                chunk_info=H5SL_item(chunk_node);
+                chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
                 /* Pass in chunk's coordinates in a union. */
                 store.chunk.offset = chunk_info->coords;
@@ -1821,7 +1834,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
                 chunk_addr = H5D_istore_get_addr(io_info, &udata);
 
                 if(H5D_istore_if_load(io_info, chunk_addr)) {
-                    accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+                    accessed_bytes = chunk_info->chunk_points * dst_type_size;
                     if(accessed_bytes != dataset->shared->layout.u.chunk.size)
                         relax = FALSE;
 
@@ -1832,7 +1845,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
 
                 /* Perform the actual read operation */
                 if((io_info->ops.write)(io_info, chunk_info->chunk_points,
-                        H5T_get_size(dataset->shared->type), chunk_info->fspace,
+                        dst_type_size, chunk_info->fspace,
                         chunk_info->mspace, chunk_addr, chunk, buf) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, " chunked write failed")
 
@@ -1844,7 +1857,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
                 relax = TRUE;
 
                 /* Advance to next chunk in list */
-                chunk_node = H5SL_next(chunk_node);
+                chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
             } /* end while */
 #ifdef H5_HAVE_PARALLEL
 	}
@@ -1852,7 +1865,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
 
 #ifdef H5S_DEBUG
 	H5_timer_end(&(io_info->stats->stats[0].write_timer), &timer);
-	io_info->stats->stats[0].write_nbytes += nelmts * H5T_get_size(mem_type);
+	io_info->stats->stats[0].write_nbytes += nelmts * src_type_size;
 	io_info->stats->stats[0].write_ncalls++;
 #endif
 
@@ -1866,10 +1879,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
     if(nelmts==0)
         HGOTO_DONE(SUCCEED)
 
-    /* Compute element sizes and other parameters */
-    src_type_size = H5T_get_size(mem_type);
-    dst_type_size = H5T_get_size(dataset->shared->type);
-    max_type_size = MAX(src_type_size, dst_type_size);
+    /* Compute buffer sizes and other parameters */
     target_size = dxpl_cache->max_temp_buf;
     /* XXX: This could cause a problem if the user sets their buffer size
      * to the same size as the default, and then the dataset elements are
@@ -1910,29 +1920,29 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
-    if (NULL==(tconv_buf=dxpl_cache->tconv_buf)) {
+    if(NULL == (tconv_buf = (uint8_t *)dxpl_cache->tconv_buf)) {
         /* Allocate temporary buffer */
-        if((tconv_buf=H5FL_BLK_MALLOC(type_conv,target_size))==NULL)
+        if(NULL == (tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
     } /* end if */
-    if (need_bkg && NULL==(bkg_buf=dxpl_cache->bkgr_buf)) {
+    if(need_bkg && NULL == (bkg_buf = (uint8_t *)dxpl_cache->bkgr_buf)) {
         /* Allocate background buffer */
         /* (Don't need calloc()-like call since file data is already initialized) */
-        if((bkg_buf=H5FL_BLK_MALLOC(type_conv,(request_nelmts*dst_type_size)))==NULL)
+        if(NULL == (bkg_buf = H5FL_BLK_MALLOC(type_conv, (request_nelmts * dst_type_size))))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion")
     } /* end if */
 
     /* Loop over all the chunks, performing I/O on each */
 
     /* Get first node in chunk skip list */
-    chunk_node=H5SL_first(fm.fsel);
+    chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm);
 
     /* Iterate through chunks to be operated on */
     while(chunk_node) {
         H5D_chunk_info_t *chunk_info;   /* chunk information */
 
         /* Get the actual chunk information from the skip list node */
-        chunk_info=H5SL_item(chunk_node);
+        chunk_info = H5D_CHUNK_GET_NODE_INFO(fm, chunk_node);
 
         /* initialize selection iterator */
         if (H5S_select_iter_init(&file_iter, chunk_info->fspace, dst_type_size) < 0)
@@ -1954,11 +1964,11 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
         chunk_addr = H5D_istore_get_addr(io_info, &udata);
 
         if(H5D_istore_if_load(io_info, chunk_addr)) {
-            accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+            accessed_bytes = chunk_info->chunk_points * dst_type_size;
             if(accessed_bytes != dataset->shared->layout.u.chunk.size)
                 relax=FALSE;
             if(relax) {
-                accessed_bytes = H5S_GET_SELECT_NPOINTS(chunk_info->mspace)*H5T_get_size(mem_type);
+                accessed_bytes = H5S_GET_SELECT_NPOINTS(chunk_info->mspace) * src_type_size;
                 if(accessed_bytes != dataset->shared->layout.u.chunk.size)
                     relax = FALSE;
             }
@@ -2056,7 +2066,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
 
         /* Release the cache lock on the chunk. */
         if(chunk) {
-            accessed_bytes = chunk_info->chunk_points * H5T_get_size(dataset->shared->type);
+            accessed_bytes = chunk_info->chunk_points * dst_type_size;
 	    if(H5D_istore_unlock(io_info, TRUE, idx_hint, chunk, accessed_bytes) < 0)
 		HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk")
 	} /* end if */
@@ -2080,7 +2090,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts,
         } /* end if */
 
         /* Get the next chunk node in the skip list */
-        chunk_node=H5SL_next(chunk_node);
+        chunk_node = H5D_CHUNK_GET_NEXT_NODE(fm, chunk_node);
     } /* end while */
 
 done:
@@ -2099,9 +2109,9 @@ done:
     } /* end if */
 
     if (tconv_buf && NULL==dxpl_cache->tconv_buf)
-        H5FL_BLK_FREE(type_conv,tconv_buf);
+        (void)H5FL_BLK_FREE(type_conv,tconv_buf);
     if (bkg_buf && NULL==dxpl_cache->bkgr_buf)
-        H5FL_BLK_FREE(type_conv,bkg_buf);
+        (void)H5FL_BLK_FREE(type_conv,bkg_buf);
 
     /* Release chunk mapping information */
     if(H5D_destroy_chunk_map(&fm) < 0)
@@ -2193,7 +2203,7 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
         off=_off;
     } /* end else */
 
-    if (NULL == (src = H5I_object(src_id)) || NULL == (dst = H5I_object(dst_id)))
+    if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
     src_stride = H5T_get_size(src);
@@ -2299,7 +2309,7 @@ H5D_compound_opt_write(size_t nelmts, hid_t src_id, hid_t dst_id, void *data_buf
     assert (data_buf);
     assert (nelmts>0);
 
-    if (NULL == (src = H5I_object(src_id)) || NULL == (dst = H5I_object(dst_id)))
+    if (NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
     src_stride = H5T_get_size(src);
@@ -2344,7 +2354,7 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
     H5D_t *dataset=io_info->dset;       /* Local pointer to dataset info */
     H5S_t *tmp_mspace = NULL;     /* Temporary memory dataspace */
     hssize_t old_offset[H5O_LAYOUT_NDIMS];  /* Old selection offset */
-    hbool_t file_space_normalized = FALSE;  /* File dataspace was normalized */
+    htri_t file_space_normalized = FALSE;   /* File dataspace was normalized */
     hid_t f_tid = (-1);           /* Temporary copy of file datatype for iteration */
     hbool_t iter_init = FALSE;  /* Selection iteration info has been initialized */
     unsigned f_ndims;           /* The number of dimensions of the file's dataspace */
@@ -2379,9 +2389,8 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
      * speed up hyperslab calculations by removing the extra checks and/or
      * additions involving the offset and the hyperslab selection -QAK)
      */
-    if(H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset) < 0)
+    if((file_space_normalized = H5S_hyper_normalize_offset((H5S_t *)file_space, old_offset)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to normalize dataspace by offset")
-    file_space_normalized = TRUE;
 
     /* Decide the number of chunks in each dimension*/
     for(u=0; ufsel = H5SL_create(H5SL_TYPE_HSIZE, 0.5, (size_t)H5D_DEFAULT_SKIPLIST_HEIGHT))==NULL)
-        HGOTO_ERROR(H5E_DATASET,H5E_CANTCREATE,FAIL,"can't create skip list for chunk selections")
-
     /* Initialize "last chunk" information */
     fm->last_index = (hsize_t)-1;
     fm->last_chunk_info = NULL;
@@ -2424,7 +2429,40 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
 
     /* Special case for only one element in selection */
     /* (usually appending a record) */
-    if(nelmts == 1) {
+    if(nelmts == 1
+#ifdef H5_HAVE_PARALLEL
+            && !(io_info->using_mpi_vfd)
+#endif /* H5_HAVE_PARALLEL */
+        ) {
+        /* Initialize skip list for chunk selections */
+        fm->sel_chunks = NULL;
+        fm->use_single = TRUE;
+
+        /* Initialize single chunk dataspace */
+        if(NULL == dataset->shared->cache.chunk.single_space) {
+            /* Make a copy of the dataspace for the dataset */
+            if((dataset->shared->cache.chunk.single_space = H5S_copy(file_space, TRUE, FALSE)) == NULL)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file space")
+
+            /* Resize chunk's dataspace dimensions to size of chunk */
+            if(H5S_set_extent_real(dataset->shared->cache.chunk.single_space, fm->chunk_dim) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't adjust chunk dimensions")
+
+            /* Set the single chunk dataspace to 'all' selection */
+            if(H5S_select_all(dataset->shared->cache.chunk.single_space, TRUE) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to set all selection")
+        } /* end if */
+        fm->single_space = dataset->shared->cache.chunk.single_space;
+        HDassert(fm->single_space);
+
+        /* Allocate the single chunk information */
+        if(NULL == dataset->shared->cache.chunk.single_chunk_info) {
+            if(NULL == (dataset->shared->cache.chunk.single_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
+        } /* end if */
+        fm->single_chunk_info = dataset->shared->cache.chunk.single_chunk_info;
+        HDassert(fm->single_chunk_info);
+
         /* Reset chunk template information */
         fm->mchunk_tmpl = NULL;
 
@@ -2433,6 +2471,17 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create chunk selections for single element")
     } /* end if */
     else {
+        /* Initialize skip list for chunk selections */
+        if(NULL == dataset->shared->cache.chunk.sel_chunks) {
+            if(NULL == (dataset->shared->cache.chunk.sel_chunks = H5SL_create(H5SL_TYPE_HSIZE, 0.5, (size_t)H5D_DEFAULT_SKIPLIST_HEIGHT)))
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't create skip list for chunk selections")
+        } /* end if */
+        fm->sel_chunks = dataset->shared->cache.chunk.sel_chunks;
+        HDassert(fm->sel_chunks);
+
+        /* We are not using single element mode */
+        fm->use_single = FALSE;
+
         /* Get type of selection on disk & in memory */
         if((fsel_type = H5S_GET_SELECT_TYPE(file_space)) < H5S_SEL_NONE)
             HGOTO_ERROR(H5E_DATASET, H5E_BADSELECT, FAIL, "unable to get type of selection")
@@ -2452,12 +2501,12 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create file chunk selections")
 
             /* Clean file chunks' hyperslab span "scratch" information */
-            curr_node=H5SL_first(fm->fsel);
+            curr_node=H5SL_first(fm->sel_chunks);
             while(curr_node) {
                 H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
 
                 /* Get pointer to chunk's information */
-                chunk_info=H5SL_item(curr_node);
+                chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
                 assert(chunk_info);
 
                 /* Clean hyperslab span's "scratch" information */
@@ -2527,12 +2576,12 @@ H5D_create_chunk_map(H5D_chunk_map_t *fm, const H5D_io_info_t *io_info,
             /* Clean up hyperslab stuff, if necessary */
             if(fm->msel_type != H5S_SEL_POINTS) {
                 /* Clean memory chunks' hyperslab span "scratch" information */
-                curr_node=H5SL_first(fm->fsel);
+                curr_node=H5SL_first(fm->sel_chunks);
                 while(curr_node) {
                     H5D_chunk_info_t *chunk_info;   /* Pointer chunk information */
 
                     /* Get pointer to chunk's information */
-                    chunk_info=H5SL_item(curr_node);
+                    chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
                     assert(chunk_info);
 
                     /* Clean hyperslab span's "scratch" information */
@@ -2590,7 +2639,7 @@ done:
  RETURNS
     No return value
  DESCRIPTION
-    Releases all the memory for a chunk info node.  Called by H5SL_iterate
+    Releases all the memory for a chunk info node.  Called by H5SL_free
  GLOBAL VARIABLES
  COMMENTS, BUGS, ASSUMPTIONS
  EXAMPLES
@@ -2599,21 +2648,24 @@ done:
 static herr_t
 H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
 {
-    H5D_chunk_info_t *chunk_info=(H5D_chunk_info_t *)item;
+    H5D_chunk_info_t *chunk_info = (H5D_chunk_info_t *)item;
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
 
-    assert(chunk_info);
+    HDassert(chunk_info);
 
-    /* Close the chunk's file dataspace */
-    (void)H5S_close(chunk_info->fspace);
+    /* Close the chunk's file dataspace, if it's not shared */
+    if(!chunk_info->fspace_shared)
+        (void)H5S_close(chunk_info->fspace);
+    else
+        H5S_select_all(chunk_info->fspace, TRUE);
 
     /* Close the chunk's memory dataspace, if it's not shared */
     if(!chunk_info->mspace_shared)
         (void)H5S_close(chunk_info->mspace);
 
     /* Free the actual chunk info */
-    H5FL_FREE(H5D_chunk_info_t,chunk_info);
+    H5FL_FREE(H5D_chunk_info_t, chunk_info);
 
     FUNC_LEAVE_NOAPI(0);
 }   /* H5D_free_chunk_info() */
@@ -2638,14 +2690,23 @@ H5D_destroy_chunk_map(const H5D_chunk_map_t *fm)
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_destroy_chunk_map)
 
-    /* Free the chunk info skip list */
-    if(fm->fsel) {
-        if(H5SL_count(fm->fsel)>0)
-            if(H5SL_iterate(fm->fsel,H5D_free_chunk_info,NULL) < 0)
-                HGOTO_ERROR(H5E_PLIST,H5E_CANTNEXT,FAIL,"can't iterate over chunks")
+    /* Single element I/O vs. multiple element I/O cleanup */
+    if(fm->use_single) {
+        /* Sanity checks */
+        HDassert(fm->sel_chunks == NULL);
+        HDassert(fm->single_chunk_info);
+        HDassert(fm->single_chunk_info->fspace_shared);
+        HDassert(fm->single_chunk_info->mspace_shared);
 
-        H5SL_close(fm->fsel);
+        /* Reset the selection for the single element I/O */
+        H5S_select_all(fm->single_space, TRUE);
     } /* end if */
+    else {
+        /* Release the nodes on the list of selected chunks */
+        if(fm->sel_chunks)
+            if(H5SL_free(fm->sel_chunks, H5D_free_chunk_info, NULL) < 0)
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTNEXT, FAIL, "can't iterate over chunks")
+    } /* end else */
 
     /* Free the memory chunk dataspace template */
     if(fm->mchunk_tmpl)
@@ -2680,8 +2741,7 @@ H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
 #endif /* H5_HAVE_PARALLEL */
     *io_info)
 {
-    H5S_t *tmp_fchunk = NULL;               /* Temporary file dataspace */
-    H5D_chunk_info_t *new_chunk_info = NULL; /* chunk information to insert into skip list */
+    H5D_chunk_info_t *chunk_info;           /* Chunk information to insert into skip list */
     hsize_t     sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
     hsize_t     sel_end[H5O_LAYOUT_NDIMS];  /* Offset of high bound of file selection */
     unsigned    u;                          /* Local index variable */
@@ -2696,62 +2756,49 @@ H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
     if(H5S_SELECT_BOUNDS(fm->file_space, sel_start, sel_end) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection bound info")
 
-    /* Allocate the file & memory chunk information */
-    if(NULL == (new_chunk_info = H5FL_MALLOC(H5D_chunk_info_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate chunk info")
-    new_chunk_info->chunk_points = 1;
+    /* Initialize the 'single chunk' file & memory chunk information */
+    chunk_info = fm->single_chunk_info;
+    chunk_info->chunk_points = 1;
 
     /* Set chunk location & hyperslab size */
     for(u = 0; u < fm->f_ndims; u++) {
         HDassert(sel_start[u] == sel_end[u]);
-        new_chunk_info->coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
+        chunk_info->coords[u] = (sel_start[u] / fm->layout->u.chunk.dim[u]) * fm->layout->u.chunk.dim[u];
     } /* end for */
-    new_chunk_info->coords[fm->f_ndims] = 0;
+    chunk_info->coords[fm->f_ndims] = 0;
 
     /* Calculate the index of this chunk */
-    if(H5V_chunk_index(fm->f_ndims, new_chunk_info->coords, fm->layout->u.chunk.dim, fm->down_chunks, &new_chunk_info->index) < 0)
+    if(H5V_chunk_index(fm->f_ndims, chunk_info->coords, fm->layout->u.chunk.dim, fm->down_chunks, &chunk_info->index) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
-    /* Create chunk dataspace for selection operations (copy file space) */
-    if((tmp_fchunk = H5S_copy(fm->file_space, FALSE, FALSE)) == NULL)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space")
-
-    /* Resize chunk's dataspace dimensions to size of chunk */
-    if(H5S_set_extent_real(tmp_fchunk, fm->chunk_dim) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk dimensions")
+    /* Copy selection for file's dataspace into chunk dataspace */
+    if(H5S_select_copy(fm->single_space, fm->file_space, FALSE) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy file selection")
 
     /* Move selection back to have correct offset in chunk */
-    if(H5S_SELECT_ADJUST_U(tmp_fchunk, new_chunk_info->coords) < 0)
+    if(H5S_SELECT_ADJUST_U(fm->single_space, chunk_info->coords) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't adjust chunk selection")
 
 #ifdef H5_HAVE_PARALLEL
     /* store chunk selection information */
     if(io_info->using_mpi_vfd)
-        fm->select_chunk[new_chunk_info->index] = TRUE;
+        fm->select_chunk[chunk_info->index] = TRUE;
 #endif /* H5_HAVE_PARALLEL */
 
-    /* Set the file chunk dataspace */
-    new_chunk_info->fspace = tmp_fchunk;
+    /* Set the file dataspace for the chunk to the shared 'single' dataspace */
+    chunk_info->fspace = fm->single_space;
+
+    /* Indicate that the chunk's file dataspace is shared */
+    chunk_info->fspace_shared = TRUE;
 
     /* Just point at the memory dataspace & selection */
     /* (Casting away const OK -QAK) */
-    new_chunk_info->mspace = (H5S_t *)fm->mem_space;
-
-    /* Indicate that the chunk's memory space is shared */
-    new_chunk_info->mspace_shared = 1;
+    chunk_info->mspace = (H5S_t *)fm->mem_space;
 
-    /* Insert the new chunk into the skip list */
-    if(H5SL_insert(fm->fsel, new_chunk_info, &new_chunk_info->index) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert chunk into skip list")
+    /* Indicate that the chunk's memory dataspace is shared */
+    chunk_info->mspace_shared = TRUE;
 
 done:
-    if(ret_value < 0) {
-        if(new_chunk_info)
-            (void)H5D_free_chunk_info(new_chunk_info, NULL, NULL);
-        if(tmp_fchunk)
-            (void)H5S_close(tmp_fchunk);
-    } /* end if */
-
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_create_chunk_map_single() */
 
@@ -2868,11 +2915,12 @@ H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
 #endif /* H5_HAVE_PARALLEL */
 
             /* Set the file chunk dataspace */
-            new_chunk_info->fspace=tmp_fchunk;
+            new_chunk_info->fspace = tmp_fchunk;
+            new_chunk_info->fspace_shared = FALSE;
 
             /* Set the memory chunk dataspace */
             new_chunk_info->mspace=NULL;
-            new_chunk_info->mspace_shared=0;
+            new_chunk_info->mspace_shared = FALSE;
 
             /* Copy the chunk's coordinates */
             for(u=0; uf_ndims; u++)
@@ -2880,7 +2928,7 @@ H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
             new_chunk_info->coords[fm->f_ndims]=0;
 
             /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->fsel,new_chunk_info,&new_chunk_info->index) < 0) {
+            if(H5SL_insert(fm->sel_chunks,new_chunk_info,&new_chunk_info->index) < 0) {
                 H5D_free_chunk_info(new_chunk_info,NULL,NULL);
                 HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
             } /* end if */
@@ -2971,14 +3019,14 @@ H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
     assert(fm->f_ndims>0);
 
     /* Check for all I/O going to a single chunk */
-    if(H5SL_count(fm->fsel)==1) {
+    if(H5SL_count(fm->sel_chunks)==1) {
         H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
 
         /* Get the node */
-        curr_node=H5SL_first(fm->fsel);
+        curr_node=H5SL_first(fm->sel_chunks);
 
         /* Get pointer to chunk's information */
-        chunk_info=H5SL_item(curr_node);
+        chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
         assert(chunk_info);
 
         /* Just point at the memory dataspace & selection */
@@ -2986,7 +3034,7 @@ H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
         chunk_info->mspace=(H5S_t *)fm->mem_space;
 
         /* Indicate that the chunk's memory space is shared */
-        chunk_info->mspace_shared=1;
+        chunk_info->mspace_shared = TRUE;
     } /* end if */
     else {
         /* Get bounding box for file selection */
@@ -3006,12 +3054,12 @@ H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
         } /* end for */
 
         /* Iterate over each chunk in the chunk list */
-        curr_node=H5SL_first(fm->fsel);
+        curr_node=H5SL_first(fm->sel_chunks);
         while(curr_node) {
             H5D_chunk_info_t *chunk_info;   /* Pointer to chunk information */
 
             /* Get pointer to chunk's information */
-            chunk_info=H5SL_item(curr_node);
+            chunk_info = (H5D_chunk_info_t *)H5SL_item(curr_node);
             assert(chunk_info);
 
             /* Copy the information */
@@ -3089,7 +3137,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
          * find the chunk in the skip list.
          */
         /* Get the chunk node from the skip list */
-        if((chunk_info=H5SL_search(fm->fsel,&chunk_index))==NULL) {
+        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index))) {
             H5S_t *fspace;                      /* Memory chunk's dataspace */
 
             /* Allocate the file & memory chunk information */
@@ -3115,11 +3163,12 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
             } /* end if */
 
             /* Set the file chunk dataspace */
-            chunk_info->fspace=fspace;
+            chunk_info->fspace = fspace;
+            chunk_info->fspace_shared = FALSE;
 
             /* Set the memory chunk dataspace */
             chunk_info->mspace=NULL;
-            chunk_info->mspace_shared=0;
+            chunk_info->mspace_shared = FALSE;
 
             /* Set the number of selected elements in chunk to zero */
             chunk_info->chunk_points=0;
@@ -3132,7 +3181,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
             chunk_info->coords[fm->f_ndims]=0;
 
             /* Insert the new chunk into the skip list */
-            if(H5SL_insert(fm->fsel,chunk_info,&chunk_info->index) < 0) {
+            if(H5SL_insert(fm->sel_chunks,chunk_info,&chunk_info->index) < 0) {
                 H5D_free_chunk_info(chunk_info,NULL,NULL);
                 HGOTO_ERROR(H5E_DATASPACE,H5E_CANTINSERT,FAIL,"can't insert chunk into skip list")
             } /* end if */
@@ -3148,7 +3197,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
         coords_in_chunk[u]=coords[u]%fm->layout->u.chunk.dim[u];
 
     /* Add point to file selection for chunk */
-    if(H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, (const hsize_t **)coords_in_chunk) < 0)
+    if(H5S_select_elements(chunk_info->fspace, H5S_SELECT_APPEND, (size_t)1, coords_in_chunk) < 0)
         HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
 
     /* Increment the number of elemented selected in chunk */
@@ -3200,8 +3249,8 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
          * find the chunk in the skip list.
          */
         /* Get the chunk node from the skip list */
-        if((chunk_info=H5SL_search(fm->fsel,&chunk_index))==NULL)
-            HGOTO_ERROR(H5E_DATASPACE,H5E_NOTFOUND,FAIL,"can't locate chunk in skip list")
+        if(NULL == (chunk_info = (H5D_chunk_info_t *)H5SL_search(fm->sel_chunks, &chunk_index)))
+            HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, FAIL, "can't locate chunk in skip list")
 
         /* Check if the chunk already has a memory space */
         if(chunk_info->mspace==NULL) {
@@ -3221,7 +3270,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
 
     /* Add point to memory selection for chunk */
     if(fm->msel_type==H5S_SEL_POINTS) {
-        if(H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, (const hsize_t **)coords_in_mem) < 0)
+        if(H5S_select_elements(chunk_info->mspace, H5S_SELECT_APPEND, (size_t)1, coords_in_mem) < 0)
             HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element")
     } /* end if */
     else {
@@ -3331,7 +3380,7 @@ H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
                 H5P_genplist_t *dx_plist;           /* Data transer property list */
 
                 /* Get the dataset transfer property list */
-                if (NULL == (dx_plist = H5I_object(dxpl_id)))
+                if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
 
                 /* Change the xfer_mode to independent for handling the I/O */
@@ -3395,7 +3444,7 @@ H5D_ioinfo_term(H5D_io_info_t *io_info)
         H5P_genplist_t *dx_plist;           /* Data transer property list */
 
         /* Get the dataset transfer property list */
-        if (NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
+        if (NULL == (dx_plist = (H5P_genplist_t *)H5I_object(io_info->dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset transfer property list")
 
         /* Restore the original parallel I/O mode */
@@ -3409,3 +3458,4 @@ done:
 } /* end H5D_ioinfo_term() */
 
 #endif
+
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 8a3c1b0..3b8fba7 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -540,22 +540,20 @@ H5D_istore_cmp3(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, void *_uda
     /* slightly odd way the library initializes the right-most node in the */
     /* indexed storage B-tree... */
     /* (Dump the B-tree with h5debug to look at it) -QAK */
-    if(udata->mesg->u.chunk.ndims==2) {
-        if(udata->key.offset[0]>rt_key->offset[0])
-            ret_value=1;
-        else if(udata->key.offset[0]==rt_key->offset[0] &&
-                udata->key.offset[1]>=rt_key->offset[1])
-            ret_value=1;
-        else if(udata->key.offset[0]offset[0])
-            ret_value=(-1);
+    if(udata->mesg->u.chunk.ndims == 2) {
+        if(udata->offset[0] > rt_key->offset[0])
+            ret_value = 1;
+        else if(udata->offset[0] == rt_key->offset[0] &&
+                udata->offset[1] >= rt_key->offset[1])
+            ret_value = 1;
+        else if(udata->offset[0] < lt_key->offset[0])
+            ret_value = (-1);
     } /* end if */
     else {
-        if (H5V_vector_ge_u(udata->mesg->u.chunk.ndims, udata->key.offset,
-                                 rt_key->offset))
+        if(H5V_vector_ge_u(udata->mesg->u.chunk.ndims, udata->offset, rt_key->offset))
             ret_value = 1;
-        else if (H5V_vector_lt_u(udata->mesg->u.chunk.ndims, udata->key.offset,
-                            lt_key->offset))
-            ret_value = -1;
+        else if(H5V_vector_lt_u(udata->mesg->u.chunk.ndims, udata->offset, lt_key->offset))
+            ret_value = (-1);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -602,9 +600,9 @@ H5D_istore_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
     HDassert(addr_p);
 
     /* Allocate new storage */
-    HDassert(udata->common.key.nbytes > 0);
-    H5_CHECK_OVERFLOW(udata->common.key.nbytes ,size_t, hsize_t);
-    if(HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->common.key.nbytes)))
+    HDassert(udata->nbytes > 0);
+    H5_CHECK_OVERFLOW(udata->nbytes, size_t, hsize_t);
+    if(HADDR_UNDEF == (*addr_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
         HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "couldn't allocate new file storage")
     udata->addr = *addr_p;
 
@@ -612,24 +610,24 @@ H5D_istore_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
      * The left key describes the storage of the UDATA chunk being
      * inserted into the tree.
      */
-    lt_key->nbytes = udata->common.key.nbytes;
-    lt_key->filter_mask = udata->common.key.filter_mask;
-    for (u=0; ucommon.mesg->u.chunk.ndims; u++)
-        lt_key->offset[u] = udata->common.key.offset[u];
+    lt_key->nbytes = udata->nbytes;
+    lt_key->filter_mask = udata->filter_mask;
+    for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++)
+        lt_key->offset[u] = udata->common.offset[u];
 
     /*
      * The right key might already be present.  If not, then add a zero-width
      * chunk.
      */
-    if (H5B_INS_LEFT != op) {
+    if(H5B_INS_LEFT != op) {
         rt_key->nbytes = 0;
         rt_key->filter_mask = 0;
-        for (u=0; ucommon.mesg->u.chunk.ndims; u++) {
-            HDassert(udata->common.key.offset[u]+udata->common.mesg->u.chunk.dim[u] >
-                udata->common.key.offset[u]);
-            rt_key->offset[u] = udata->common.key.offset[u] + udata->common.mesg->u.chunk.dim[u];
-        }
-    }
+        for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++) {
+            HDassert(udata->common.offset[u] + udata->common.mesg->u.chunk.dim[u] >
+                udata->common.offset[u]);
+            rt_key->offset[u] = udata->common.offset[u] + udata->common.mesg->u.chunk.dim[u];
+        } /* end if */
+    } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -680,16 +678,14 @@ H5D_istore_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void
 
     /* Is this *really* the requested chunk? */
     for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++)
-        if(udata->common.key.offset[u] >= lt_key->offset[u] + udata->common.mesg->u.chunk.dim[u])
+        if(udata->common.offset[u] >= lt_key->offset[u] + udata->common.mesg->u.chunk.dim[u])
             HGOTO_DONE(FAIL)
 
     /* Initialize return values */
+    HDassert(lt_key->nbytes > 0);
     udata->addr = addr;
-    udata->common.key.nbytes = lt_key->nbytes;
-    udata->common.key.filter_mask = lt_key->filter_mask;
-    HDassert(lt_key->nbytes>0);
-    for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++)
-        udata->common.key.offset[u] = lt_key->offset[u];
+    udata->nbytes = lt_key->nbytes;
+    udata->filter_mask = lt_key->filter_mask;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -755,18 +751,18 @@ H5D_istore_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
     cmp = H5D_istore_cmp3(f, dxpl_id, lt_key, udata, rt_key);
     HDassert(cmp <= 0);
 
-    if (cmp < 0) {
+    if(cmp < 0) {
         /* Negative indices not supported yet */
         HGOTO_ERROR(H5E_STORAGE, H5E_UNSUPPORTED, H5B_INS_ERROR, "internal error")
 
-    } else if (H5V_vector_eq_u (udata->common.mesg->u.chunk.ndims,
-				udata->common.key.offset, lt_key->offset) &&
-	       lt_key->nbytes>0) {
+    } else if(H5V_vector_eq_u(udata->common.mesg->u.chunk.ndims,
+				udata->common.offset, lt_key->offset) &&
+	       lt_key->nbytes > 0) {
         /*
          * Already exists.  If the new size is not the same as the old size
          * then we should reallocate storage.
          */
-        if (lt_key->nbytes != udata->common.key.nbytes) {
+        if(lt_key->nbytes != udata->nbytes) {
 /* Currently, the old chunk data is "thrown away" after the space is reallocated,
  * so avoid data copy in H5MF_realloc() call by just free'ing the space and
  * allocating new space.
@@ -778,18 +774,18 @@ H5D_istore_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
  */
 #ifdef OLD_WAY
             if(HADDR_UNDEF == (*new_node_p = H5MF_realloc(f, H5FD_MEM_DRAW, addr,
-                      (hsize_t)lt_key->nbytes, (hsize_t)udata->common.key.nbytes)))
+                      (hsize_t)lt_key->nbytes, (hsize_t)udata->nbytes)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "unable to reallocate chunk storage")
 #else /* OLD_WAY */
             H5_CHECK_OVERFLOW( lt_key->nbytes ,size_t, hsize_t);
             if(H5MF_xfree(f, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes)<0)
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, H5B_INS_ERROR, "unable to free chunk")
-            H5_CHECK_OVERFLOW(udata->common.key.nbytes ,size_t, hsize_t);
-            if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->common.key.nbytes)))
+            H5_CHECK_OVERFLOW(udata->nbytes ,size_t, hsize_t);
+            if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "unable to reallocate chunk")
 #endif /* OLD_WAY */
-            lt_key->nbytes = udata->common.key.nbytes;
-            lt_key->filter_mask = udata->common.key.filter_mask;
+            lt_key->nbytes = udata->nbytes;
+            lt_key->filter_mask = udata->filter_mask;
             *lt_key_changed = TRUE;
             udata->addr = *new_node_p;
             ret_value = H5B_INS_CHANGE;
@@ -800,26 +796,26 @@ H5D_istore_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
 
     } else if (H5V_hyper_disjointp(udata->common.mesg->u.chunk.ndims,
 				   lt_key->offset, udata->common.mesg->u.chunk.dim,
-				   udata->common.key.offset, udata->common.mesg->u.chunk.dim)) {
+				   udata->common.offset, udata->common.mesg->u.chunk.dim)) {
         HDassert(H5V_hyper_disjointp(udata->common.mesg->u.chunk.ndims,
 				   rt_key->offset, udata->common.mesg->u.chunk.dim,
-				   udata->common.key.offset, udata->common.mesg->u.chunk.dim));
+				   udata->common.offset, udata->common.mesg->u.chunk.dim));
         /*
          * Split this node, inserting the new new node to the right of the
          * current node.  The MD_KEY is where the split occurs.
          */
-        md_key->nbytes = udata->common.key.nbytes;
-        md_key->filter_mask = udata->common.key.filter_mask;
+        md_key->nbytes = udata->nbytes;
+        md_key->filter_mask = udata->filter_mask;
         for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++) {
-            HDassert(0 == udata->common.key.offset[u] % udata->common.mesg->u.chunk.dim[u]);
-            md_key->offset[u] = udata->common.key.offset[u];
-        }
+            HDassert(0 == udata->common.offset[u] % udata->common.mesg->u.chunk.dim[u]);
+            md_key->offset[u] = udata->common.offset[u];
+        } /* end for */
 
         /*
          * Allocate storage for the new chunk
          */
-        H5_CHECK_OVERFLOW(udata->common.key.nbytes ,size_t, hsize_t);
-        if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->common.key.nbytes)))
+        H5_CHECK_OVERFLOW(udata->nbytes, size_t, hsize_t);
+        if(HADDR_UNDEF == (*new_node_p = H5MF_alloc(f, H5FD_MEM_DRAW, dxpl_id, (hsize_t)udata->nbytes)))
             HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, H5B_INS_ERROR, "file allocation failed")
         udata->addr = *new_node_p;
         ret_value = H5B_INS_RIGHT;
@@ -898,7 +894,7 @@ H5D_istore_iter_chunkmap (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_lt
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5D_istore_iter_allocated() */
+} /* H5D_istore_iter_chunkmap() */
 
 
 /*-------------------------------------------------------------------------
@@ -1082,17 +1078,19 @@ H5D_istore_iter_copy(H5F_t *f_src, hid_t dxpl_id, const void *_lt_key,
         HDmemcpy(buf, bkg, buf_size);
     } /* end if */
 
-    /* Copy source chunk callback information for insertion */
-    HDmemset(&udata_dst, 0, sizeof(udata_dst));
-    HDmemcpy(&(udata_dst.common.key), lt_key, sizeof(H5D_istore_key_t));
+    /* Set up destination chunk callback information for insertion */
     udata_dst.common.mesg = udata->common.mesg;     /* Share this pointer for a short while */
+    udata_dst.common.offset = lt_key->offset;
+    udata_dst.nbytes = lt_key->nbytes;
+    udata_dst.filter_mask = lt_key->filter_mask;
+    udata_dst.addr = HADDR_UNDEF;
 
     /* Need to compress variable-length & reference data elements before writing to file */
     if(is_compressed && (is_vlen || fix_ref) ) {
-        if(H5Z_pipeline(pline, 0, &(udata_dst.common.key.filter_mask), edc_read,
+        if(H5Z_pipeline(pline, 0, &(udata_dst.filter_mask), edc_read,
                 cb_struct, &nbytes, &buf_size, &buf) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, H5_ITER_ERROR, "output pipeline failed")
-        udata_dst.common.key.nbytes = nbytes;
+        udata_dst.nbytes = nbytes;
 	udata->buf = buf;
 	udata->buf_size = buf_size;
     } /* end if */
@@ -1112,6 +1110,120 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5D_istore_cinfo_cache_reset
+ *
+ * Purpose:	Reset the cached chunk info
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              November 27, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_istore_cinfo_cache_reset(H5D_chunk_cached_t *last)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_cinfo_cache_reset)
+
+    /* Sanity check */
+    HDassert(last);
+
+    /* Indicate that the cached info is not valid */
+    last->valid = FALSE;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5D_istore_cinfo_cache_reset() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_istore_cinfo_cache_update
+ *
+ * Purpose:	Update the cached chunk info
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              November 27, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_istore_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_istore_ud1_t *udata)
+{
+    unsigned    u;                              /* Local index variable */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_cinfo_cache_update)
+
+    /* Sanity check */
+    HDassert(last);
+    HDassert(udata);
+    HDassert(udata->common.mesg);
+    HDassert(udata->common.offset);
+
+    /* Stored the information to cache */
+    for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++)
+        last->offset[u] = udata->common.offset[u];
+    last->nbytes = udata->nbytes;
+    last->filter_mask = udata->filter_mask;
+    last->addr = udata->addr;
+
+    /* Indicate that the cached info is valid */
+    last->valid = TRUE;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5D_istore_cinfo_cache_update() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_istore_cinfo_cache_found
+ *
+ * Purpose:	Look for chunk info in cache
+ *
+ * Return:	TRUE/FALSE/FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              November 27, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static hbool_t
+H5D_istore_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_istore_ud1_t *udata)
+{
+    hbool_t ret_value = FALSE;          /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_cinfo_cache_found)
+
+    /* Sanity check */
+    HDassert(last);
+    HDassert(udata);
+    HDassert(udata->common.mesg);
+    HDassert(udata->common.offset);
+
+    /* Check if the cached information is what is desired */
+    if(last->valid) {
+        unsigned    u;                      /* Local index variable */
+
+        /* Check that the offset is the same */
+        for(u = 0; u < udata->common.mesg->u.chunk.ndims; u++)
+            if(last->offset[u] != udata->common.offset[u])
+                HGOTO_DONE(FALSE)
+
+        /* Retrieve the information from the cache */
+        udata->nbytes = last->nbytes;
+        udata->filter_mask = last->filter_mask;
+        udata->addr = last->addr;
+
+        /* Indicate that the data was found */
+        HGOTO_DONE(TRUE)
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5D_istore_cinfo_cache_found() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5D_istore_init
  *
  * Purpose:	Initialize the raw data chunk cache for a dataset.  This is
@@ -1125,23 +1237,26 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_istore_init (const H5F_t *f, const H5D_t *dset)
+H5D_istore_init(const H5F_t *f, const H5D_t *dset)
 {
     H5D_rdcc_t	*rdcc = &(dset->shared->cache.chunk);
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_istore_init, FAIL)
 
-    if (H5F_RDCC_NBYTES(f)>0 && H5F_RDCC_NELMTS(f)>0) {
-        rdcc->nbytes=H5F_RDCC_NBYTES(f);
+    if(H5F_RDCC_NBYTES(f) > 0 && H5F_RDCC_NELMTS(f) > 0) {
+        rdcc->nbytes = H5F_RDCC_NBYTES(f);
 	rdcc->nslots = H5F_RDCC_NELMTS(f);
 	rdcc->slot = H5FL_SEQ_CALLOC (H5D_rdcc_ent_ptr_t,rdcc->nslots);
-	if (NULL==rdcc->slot)
+	if(NULL==rdcc->slot)
 	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+
+        /* Reset any cached chunk info for this dataset */
+        H5D_istore_cinfo_cache_reset(&(rdcc->last));
     } /* end if */
 
     /* Allocate the shared structure */
-    if(H5D_istore_shared_create(f, &dset->shared->layout)<0)
+    if(H5D_istore_shared_create(f, &dset->shared->layout) < 0)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info")
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1166,11 +1281,10 @@ done:
 static herr_t
 H5D_istore_flush_entry(const H5D_io_info_t *io_info, H5D_rdcc_ent_t *ent, hbool_t reset)
 {
-    herr_t		ret_value=SUCCEED;	/*return value			*/
-    unsigned		u;		/*counters			*/
-    void		*buf=NULL;	/*temporary buffer		*/
+    void		*buf = NULL;	/*temporary buffer		*/
     size_t		alloc;		/*bytes allocated for BUF	*/
     hbool_t		point_of_no_return = FALSE;
+    herr_t		ret_value = SUCCEED;	/*return value			*/
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_istore_flush_entry)
 
@@ -1180,30 +1294,33 @@ H5D_istore_flush_entry(const H5D_io_info_t *io_info, H5D_rdcc_ent_t *ent, hbool_
     assert(!ent->locked);
 
     buf = ent->chunk;
-    if (ent->dirty) {
+    if(ent->dirty) {
         H5D_istore_ud1_t 	udata;		/*pass through B-tree		*/
 
+        /* Initial buffer size */
+        alloc = ent->alloc_size;
+
+        /* Set up user data for B-tree callbacks */
         udata.common.mesg = &io_info->dset->shared->layout;
-        udata.common.key.filter_mask = 0;
+        udata.common.offset = ent->offset;
+        udata.filter_mask = 0;
+        udata.nbytes = ent->chunk_size;
         udata.addr = HADDR_UNDEF;
-        udata.common.key.nbytes = ent->chunk_size;
-        for (u=0; udset->shared->layout.u.chunk.ndims; u++)
-            udata.common.key.offset[u] = ent->offset[u];
-        alloc = ent->alloc_size;
 
         /* Should the chunk be filtered before writing it to disk? */
-        if (io_info->dset->shared->dcpl_cache.pline.nused) {
-            if (!reset) {
+        if(io_info->dset->shared->dcpl_cache.pline.nused) {
+            if(!reset) {
                 /*
                  * Copy the chunk to a new buffer before running it through
                  * the pipeline because we'll want to save the original buffer
                  * for later.
                  */
                 alloc = ent->chunk_size;
-                if (NULL==(buf = H5MM_malloc(alloc)))
+                if(NULL == (buf = H5MM_malloc(alloc)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for pipeline")
                 HDmemcpy(buf, ent->chunk, ent->chunk_size);
-            } else {
+            } /* end if */
+            else {
                 /*
                  * If we are reseting and something goes wrong after this
                  * point then it's too late to recover because we may have
@@ -1213,11 +1330,11 @@ H5D_istore_flush_entry(const H5D_io_info_t *io_info, H5D_rdcc_ent_t *ent, hbool_
                  */
                 point_of_no_return = TRUE;
                 ent->chunk = NULL;
-            }
-            if (H5Z_pipeline(&(io_info->dset->shared->dcpl_cache.pline), 0, &(udata.common.key.filter_mask), io_info->dxpl_cache->err_detect,
-                     io_info->dxpl_cache->filter_cb, &(udata.common.key.nbytes), &alloc, &buf)<0)
+            } /* end else */
+            if(H5Z_pipeline(&(io_info->dset->shared->dcpl_cache.pline), 0, &(udata.filter_mask), io_info->dxpl_cache->err_detect,
+                     io_info->dxpl_cache->filter_cb, &(udata.nbytes), &alloc, &buf) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "output pipeline failed")
-        }
+        } /* end if */
 
         /*
          * Create the chunk it if it doesn't exist, or reallocate the chunk if
@@ -1225,9 +1342,12 @@ H5D_istore_flush_entry(const H5D_io_info_t *io_info, H5D_rdcc_ent_t *ent, hbool_
          */
         if(H5B_insert(io_info->dset->oloc.file, io_info->dxpl_id, H5B_ISTORE, io_info->dset->shared->layout.u.chunk.addr, &udata)<0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to allocate chunk")
-        if(H5F_block_write(io_info->dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.common.key.nbytes, io_info->dxpl_id, buf) < 0)
+        if(H5F_block_write(io_info->dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, io_info->dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
+        /* Cache the chunk's info, in case it's accessed again shortly */
+        H5D_istore_cinfo_cache_update(&io_info->dset->shared->cache.chunk.last, &udata);
+
         /* Mark cache entry as clean */
         ent->dirty = FALSE;
 #ifdef H5D_ISTORE_DEBUG
@@ -1236,17 +1356,17 @@ H5D_istore_flush_entry(const H5D_io_info_t *io_info, H5D_rdcc_ent_t *ent, hbool_
     } /* end if */
 
     /* Reset, but do not free or removed from list */
-    if (reset) {
+    if(reset) {
         point_of_no_return = FALSE;
-        if(buf==ent->chunk)
+        if(buf == ent->chunk)
             buf = NULL;
-        if(ent->chunk!=NULL)
-            ent->chunk = H5D_istore_chunk_xfree(ent->chunk,&(io_info->dset->shared->dcpl_cache.pline));
+        if(ent->chunk != NULL)
+            ent->chunk = (uint8_t *)H5D_istore_chunk_xfree(ent->chunk, &(io_info->dset->shared->dcpl_cache.pline));
     } /* end if */
 
 done:
     /* Free the temp buffer only if it's different than the entry chunk */
-    if (buf!=ent->chunk)
+    if(buf != ent->chunk)
         H5MM_xfree(buf);
 
     /*
@@ -1255,9 +1375,9 @@ done:
      * output pipeline failed.  Do not free the entry or remove it from the
      * list.
      */
-    if (ret_value<0 && point_of_no_return) {
+    if(ret_value < 0 && point_of_no_return) {
         if(ent->chunk)
-            ent->chunk = H5D_istore_chunk_xfree(ent->chunk,&(io_info->dset->shared->dcpl_cache.pline));
+            ent->chunk = (uint8_t *)H5D_istore_chunk_xfree(ent->chunk, &(io_info->dset->shared->dcpl_cache.pline));
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1294,12 +1414,12 @@ H5D_istore_preempt(const H5D_io_info_t *io_info, H5D_rdcc_ent_t * ent, hbool_t f
 	/* Flush */
 	if(H5D_istore_flush_entry(io_info, ent, TRUE) < 0)
 	    HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "cannot flush indexed storage buffer")
-    }
+    } /* end if */
     else {
         /* Don't flush, just free chunk */
 	if(ent->chunk != NULL)
-	    ent->chunk = H5D_istore_chunk_xfree(ent->chunk,&(io_info->dset->shared->dcpl_cache.pline));
-    }
+	    ent->chunk = (uint8_t *)H5D_istore_chunk_xfree(ent->chunk, &(io_info->dset->shared->dcpl_cache.pline));
+    } /* end else */
 
     /* Unlink from list */
     if(ent->prev)
@@ -1520,13 +1640,13 @@ H5D_istore_shared_free (void *_shared)
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_shared_free)
 
     /* Free the raw B-tree node buffer */
-    H5FL_BLK_FREE(chunk_page,shared->page);
+    (void)H5FL_BLK_FREE(chunk_page, shared->page);
 
     /* Free the B-tree native key offsets buffer */
-    H5FL_SEQ_FREE(size_t,shared->nkey);
+    H5FL_SEQ_FREE(size_t, shared->nkey);
 
     /* Free the shared B-tree info */
-    H5FL_FREE(H5B_shared_t,shared);
+    H5FL_FREE(H5B_shared_t, shared);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D_istore_shared_free() */
@@ -1770,15 +1890,15 @@ H5D_istore_lock(const H5D_io_info_t *io_info, H5D_istore_ud1_t *udata,
              */
             /* Chunk size on disk isn't [likely] the same size as the final chunk
              * size in memory, so allocate memory big enough. */
-            chunk_alloc = udata->common.key.nbytes;
+            chunk_alloc = udata->nbytes;
             if(NULL == (chunk = H5D_istore_chunk_alloc (chunk_alloc, pline)))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk")
-            if(H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, chunk_addr, udata->common.key.nbytes, io_info->dxpl_id, chunk) < 0)
+            if(H5F_block_read(dset->oloc.file, H5FD_MEM_DRAW, chunk_addr, udata->nbytes, io_info->dxpl_id, chunk) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, NULL, "unable to read raw data chunk")
 
             if(pline->nused)
-                if(H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &(udata->common.key.filter_mask), io_info->dxpl_cache->err_detect,
-                        io_info->dxpl_cache->filter_cb, &(udata->common.key.nbytes), &chunk_alloc, &chunk) < 0)
+                if(H5Z_pipeline(pline, H5Z_FLAG_REVERSE, &(udata->filter_mask), io_info->dxpl_cache->err_detect,
+                        io_info->dxpl_cache->filter_cb, &(udata->nbytes), &chunk_alloc, &chunk) < 0)
                     HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, NULL, "data pipeline read failed")
 #ifdef H5D_ISTORE_DEBUG
             rdcc->nmisses++;
@@ -2336,7 +2456,7 @@ HDfprintf(stderr,"%s: mem_offset_arr[%Zu]=%Hu\n",FUNC,*mem_curr_seq,mem_offset_a
         H5D_BUILD_IO_INFO(&chk_io_info,dset,io_info->dxpl_cache,io_info->dxpl_id,&chk_store);
 
         /* Do I/O directly on chunk without reading it into the cache */
-        if ((ret_value=H5D_contig_writevv(&chk_io_info, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_offset_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, (haddr_t)0, NULL, buf))<0)
+        if((ret_value = H5D_contig_writevv(&chk_io_info, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_offset_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, (haddr_t)0, NULL, buf)) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
     } /* end if */
     else {
@@ -2524,7 +2644,6 @@ H5D_istore_get_addr(const H5D_io_info_t *io_info, H5D_istore_ud1_t *_udata)
 {
     H5D_istore_ud1_t	tmp_udata;      /* Information about a chunk */
     H5D_istore_ud1_t	*udata;         /* Pointer to information about a chunk */
-    unsigned	u;
     haddr_t	ret_value;		/* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_istore_get_addr)
@@ -2538,28 +2657,39 @@ H5D_istore_get_addr(const H5D_io_info_t *io_info, H5D_istore_ud1_t *_udata)
     udata = (_udata != NULL ? _udata : &tmp_udata);
 
     /* Initialize the information about the chunk we are looking for */
-    for(u = 0; u < io_info->dset->shared->layout.u.chunk.ndims; u++)
-	udata->common.key.offset[u] = io_info->store->chunk.offset[u];
     udata->common.mesg = &(io_info->dset->shared->layout);
+    udata->common.offset = io_info->store->chunk.offset;
+    udata->nbytes = 0;
+    udata->filter_mask = 0;
     udata->addr = HADDR_UNDEF;
 
-    /* Go get the chunk information */
-    if (H5B_find (io_info->dset->oloc.file, io_info->dxpl_id, H5B_ISTORE, io_info->dset->shared->layout.u.chunk.addr, udata)<0) {
-        /* Note: don't push error on stack, leave that to next higher level,
-         *      since many times the B-tree is searched in order to determine
-         *      if a chunk exists in the B-tree or not. -QAK
-         */
+    /* Check for cached information */
+    if(!H5D_istore_cinfo_cache_found(&io_info->dset->shared->cache.chunk.last, udata)) {
+        /* Go get the chunk information */
+        if(H5B_find(io_info->dset->oloc.file, io_info->dxpl_id, H5B_ISTORE, io_info->dset->shared->layout.u.chunk.addr, udata) < 0) {
+            /* Note: don't push error on stack, leave that to next higher level,
+             *      since many times the B-tree is searched in order to determine
+             *      if a chunk exists in the B-tree or not. -QAK
+             */
 #ifdef OLD_WAY
-        H5E_clear_stack(NULL);
+            H5E_clear_stack(NULL);
 
-	HGOTO_ERROR(H5E_BTREE,H5E_NOTFOUND,HADDR_UNDEF,"Can't locate chunk info")
+            HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, HADDR_UNDEF, "Can't locate chunk info")
 #else /* OLD_WAY */
-	HGOTO_DONE(HADDR_UNDEF)
+            /* Cache the fact that the chunk is not in the B-tree */
+            H5D_istore_cinfo_cache_update(&io_info->dset->shared->cache.chunk.last, udata);
+
+            HGOTO_DONE(HADDR_UNDEF)
 #endif /* OLD_WAY */
-    } /* end if */
+        } /* end if */
+
+        /* Cache the information retrieved */
+        HDassert(H5F_addr_defined(udata->addr));
+        H5D_istore_cinfo_cache_update(&io_info->dset->shared->cache.chunk.last, udata);
+    } /* end else */
 
     /* Success!  Set the return value */
-    ret_value=udata->addr;
+    ret_value = udata->addr;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2624,7 +2754,7 @@ H5D_istore_chunk_xfree(void *chk, const H5O_pline_t *pline)
         if(pline->nused > 0)
             H5MM_xfree(chk);
         else
-            H5FL_BLK_FREE(chunk, chk);
+            (void)H5FL_BLK_FREE(chunk, chk);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(NULL)
@@ -2834,11 +2964,10 @@ H5D_istore_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
 
                 /* Initialize the chunk information */
                 udata.common.mesg = layout;
-                udata.common.key.filter_mask = filter_mask;
+                udata.common.offset = chunk_offset;
+                udata.nbytes = chunk_size;
+                udata.filter_mask = filter_mask;
                 udata.addr = HADDR_UNDEF;
-                udata.common.key.nbytes = chunk_size;
-                for(u = 0; u < layout->u.chunk.ndims; u++)
-                    udata.common.key.offset[u] = chunk_offset[u];
 
                 /* Allocate the chunk with all processes */
                 if(H5B_insert(dset->oloc.file, dxpl_id, H5B_ISTORE, layout->u.chunk.addr, &udata) < 0)
@@ -2855,7 +2984,7 @@ H5D_istore_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
                         /* Write the chunks out from only one process */
                         /* !! Use the internal "independent" DXPL!! -QAK */
                         if(H5_PAR_META_WRITE == mpi_rank)
-                            if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.common.key.nbytes, data_dxpl_id, fb_info.fill_buf) < 0)
+                            if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, data_dxpl_id, fb_info.fill_buf) < 0)
                                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
                         /* Indicate that blocks are being written */
@@ -2863,7 +2992,7 @@ H5D_istore_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
                     } /* end if */
                     else {
 #endif /* H5_HAVE_PARALLEL */
-                        if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.common.key.nbytes, data_dxpl_id, fb_info.fill_buf) < 0)
+                        if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, udata.nbytes, data_dxpl_id, fb_info.fill_buf) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 #ifdef H5_HAVE_PARALLEL
                     } /* end else */
@@ -2902,6 +3031,9 @@ H5D_istore_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
     } /* end if */
 #endif /* H5_HAVE_PARALLEL */
 
+    /* Reset any cached chunk info for this dataset */
+    H5D_istore_cinfo_cache_reset(&dset->shared->cache.chunk.last);
+
 done:
     /* Release the fill buffer info, if it's been initialized */
     if(fb_info_init && H5D_fill_term(&fb_info) < 0)
@@ -3002,9 +3134,8 @@ H5D_istore_prune_remove(void *item, void UNUSED *key, void *op_data)
     HDassert(rm_info);
 
     /* Initialize the user data for the B-tree callback */
-    HDmemset(&bt_udata, 0, sizeof bt_udata);
-    bt_udata.key = sl_node->key;
     bt_udata.mesg = rm_info->mesg;
+    bt_udata.offset = sl_node->key.offset;
 
     /* Remove */
     if(H5B_remove(rm_info->f, rm_info->dxpl_id, H5B_ISTORE, rm_info->mesg->u.chunk.addr, &bt_udata) < 0)
@@ -3212,6 +3343,9 @@ H5D_istore_prune_by_extent(const H5D_io_info_t *io_info, const hsize_t *old_dims
     /* Destroy the skip list, deleting the chunks in the callback */
     H5SL_destroy(udata.outside, H5D_istore_prune_remove, &rm_info);
 
+    /* Reset any cached chunk info for this dataset */
+    H5D_istore_cinfo_cache_reset(&dset->shared->cache.chunk.last);
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_istore_prune_by_extent() */
@@ -3406,7 +3540,7 @@ H5D_istore_initialize_by_extent(H5D_io_info_t *io_info)
 
             /* Lock the chunk into the cache, to get a pointer to the chunk buffer */
             store.chunk.offset = chunk_offset;
-	    if(NULL == (chunk = H5D_istore_lock(io_info, NULL, FALSE, &idx_hint)))
+	    if(NULL == (chunk = (uint8_t *)H5D_istore_lock(io_info, NULL, FALSE, &idx_hint)))
 		HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to read raw data chunk")
 
 
@@ -3546,39 +3680,46 @@ H5D_istore_update_cache(H5D_t *dset, hid_t dxpl_id)
     H5D_rdcc_ent_t     *ent, *next;	/*cache entry  */
     H5D_rdcc_ent_t     *old_ent;	/* Old cache entry  */
     H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
-    H5D_dxpl_cache_t *dxpl_cache=&_dxpl_cache;   /* Data transfer property cache */
-    unsigned            rank;	/*current # of dimensions */
+    H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache;   /* Data transfer property cache */
+    unsigned            rank;	        /*current # of dimensions */
     hsize_t             curr_dims[H5O_LAYOUT_NDIMS];	/*current dataspace dimensions */
     hsize_t             chunks[H5O_LAYOUT_NDIMS];	        /*current number of chunks in each dimension */
     hsize_t             down_chunks[H5O_LAYOUT_NDIMS];   /* "down" size of number of elements in each dimension */
-    unsigned            u;	/*counters  */
-    herr_t      ret_value=SUCCEED;      /* Return value */
+    unsigned            u;	        /*counters  */
+    herr_t              ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5D_istore_update_cache, FAIL)
 
     /* Check args */
-    assert(dset && H5D_CHUNKED == dset->shared->layout.type);
-    assert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
+    HDassert(dset && H5D_CHUNKED == dset->shared->layout.type);
+    HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
 
-    /* Go get the rank & dimensions */
+    /* Get the rank */
     rank = dset->shared->layout.u.chunk.ndims-1;
+    HDassert(rank > 0);
+
+    /* 1-D dataset's chunks can't have their index change */
+    if(rank == 1)
+        HGOTO_DONE(SUCCEED)
+
+    /* Go get the dimensions */
     if(H5S_get_simple_extent_dims(dset->shared->space, curr_dims, NULL) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
 
     /* Round up to the next integer # of chunks, to accomodate partial chunks */
     for(u = 0; u < rank; u++)
-        chunks[u] = ((curr_dims[u]+dset->shared->layout.u.chunk.dim[u])-1) / dset->shared->layout.u.chunk.dim[u];
+        chunks[u] = ((curr_dims[u] + dset->shared->layout.u.chunk.dim[u]) - 1) / dset->shared->layout.u.chunk.dim[u];
 
     /* Get the "down" sizes for each dimension */
-    if(H5V_array_down(rank,chunks,down_chunks) < 0)
+    if(H5V_array_down(rank, chunks, down_chunks) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't compute 'down' sizes")
 
     /* Fill the DXPL cache values for later use */
-    if (H5D_get_dxpl_cache(dxpl_id,&dxpl_cache) < 0)
+    if(H5D_get_dxpl_cache(dxpl_id, &dxpl_cache) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache")
 
     /* Construct dataset I/O info */
-    H5D_BUILD_IO_INFO(&io_info,dset,dxpl_cache,dxpl_id,NULL);
+    H5D_BUILD_IO_INFO(&io_info, dset, dxpl_cache, dxpl_id, NULL);
 
     /* Recompute the index for each cached chunk that is in a dataset */
     for(ent = rdcc->head; ent; ent = next) {
@@ -3596,26 +3737,26 @@ H5D_istore_update_cache(H5D_t *dset, hid_t dxpl_id)
         old_idx=ent->idx;   /* Save for later */
         ent->idx=H5D_HASH(dset->shared,idx);
 
-        if(old_idx!=ent->idx) {
+        if(old_idx != ent->idx) {
             /* Check if there is already a chunk at this chunk's new location */
             old_ent = rdcc->slot[ent->idx];
-            if(old_ent!=NULL) {
-                assert(old_ent->locked==0);
+            if(old_ent != NULL) {
+                HDassert(old_ent->locked == 0);
 
                 /* Check if we are removing the entry we would walk to next */
-                if(old_ent==next)
-                    next=old_ent->next;
+                if(old_ent == next)
+                    next = old_ent->next;
 
                 /* Remove the old entry from the cache */
-                if (H5D_istore_preempt(&io_info, old_ent, TRUE )<0)
+                if(H5D_istore_preempt(&io_info, old_ent, TRUE) < 0)
                     HGOTO_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks")
             } /* end if */
 
             /* Insert this chunk into correct location in hash table */
-            rdcc->slot[ent->idx]=ent;
+            rdcc->slot[ent->idx] = ent;
 
             /* Null out previous location */
-            rdcc->slot[old_idx]=NULL;
+            rdcc->slot[old_idx] = NULL;
         } /* end if */
     } /* end for */
 
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index ccfaac9..22f32ab 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -550,7 +550,7 @@ H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info,
     FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_min_chunk);
 
     /* Get the number of chunks to perform I/O on */
-    num_chunkf = H5SL_count(fm->fsel);
+    num_chunkf = H5SL_count(fm->sel_chunks);
 
     /* Determine the minimum # of chunks for all processes */
     if (MPI_SUCCESS != (mpi_code = MPI_Allreduce(&num_chunkf, min_chunkf, 1, MPI_INT, MPI_MIN, io_info->comm)))
@@ -586,7 +586,7 @@ H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info,
 
     /* Get the number of chunks to perform I/O on */
     num_chunkf = 0;
-    ori_num_chunkf = H5SL_count(fm->fsel);
+    ori_num_chunkf = H5SL_count(fm->sel_chunks);
     H5_ASSIGN_OVERFLOW(num_chunkf,ori_num_chunkf,size_t,int);
 
     /* Determine the summation of number of chunks for all processes */
@@ -856,7 +856,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const vo
         H5D_chunk_info_t *chunk_info;
         H5D_storage_t  store;
  
-        chunk_node = H5SL_first(fm->fsel);
+        chunk_node = H5SL_first(fm->sel_chunks);
 	if(chunk_node == NULL) {
             if(H5D_istore_chunkmap(io_info, &chunk_base_addr, fm->down_chunks) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
@@ -884,7 +884,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const vo
       }
 
       /* Allocate chunking information */
-      ori_num_chunk        = H5SL_count(fm->fsel);
+      ori_num_chunk        = H5SL_count(fm->sel_chunks);
       H5_ASSIGN_OVERFLOW(num_chunk,ori_num_chunk,size_t,int);
 
 #ifdef H5D_DEBUG
@@ -1114,7 +1114,7 @@ H5D_multi_chunk_collective_io(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,const v
 #endif
 	select_chunk = fm->select_chunk[i];
 	if(select_chunk == 1){/* Have selection elements in this chunk. Find the chunk info. */
-	   if(NULL ==(chunk_node = H5SL_first(fm->fsel)))
+	   if(NULL ==(chunk_node = H5SL_first(fm->sel_chunks)))
 	    HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list");
 
 	    while(chunk_node){
@@ -1313,7 +1313,7 @@ H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,H5D_chunk_map_t *fm,
       count_chunk = 0;
   
       /* Get first node in chunk skip list */
-      chunk_node=H5SL_first(fm->fsel);
+      chunk_node=H5SL_first(fm->sel_chunks);
  
        /* Iterate through chunks to be operated on */
       while(chunk_node) {
@@ -1618,7 +1618,7 @@ H5D_sort_chunk(H5D_io_info_t * io_info,
   
     FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk)
 
-    num_chunks =  H5SL_count(fm->fsel);
+    num_chunks =  H5SL_count(fm->sel_chunks);
 #ifdef H5D_DEBUG
   if(H5DEBUG(D)) 
     HDfprintf(H5DEBUG(D),"many_chunk_opt= %d\n",many_chunk_opt);
@@ -1657,7 +1657,7 @@ H5D_sort_chunk(H5D_io_info_t * io_info,
     } /* end if */
 
     /* Get first node in chunk skip list */
-    if(NULL ==(chunk_node = H5SL_first(fm->fsel)))
+    if(NULL ==(chunk_node = H5SL_first(fm->sel_chunks)))
 	  HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk node from skipped list");
     /* Set dataset storage for I/O info */
     io_info->store = &store;
@@ -1843,7 +1843,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info,
   
   mem_cleanup       = 1;
 
-  chunk_node        = H5SL_first(fm->fsel);
+  chunk_node        = H5SL_first(fm->sel_chunks);
 
   /*Obtain the regularity and selection information for all chunks in this process. */
   while(chunk_node){
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 4fbec67..aec5e19 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -119,6 +119,26 @@ typedef struct H5D_io_info_t {
 #endif /* H5S_DEBUG */
 } H5D_io_info_t;
 
+/* Structure holding information about a chunk's selection for mapping */
+typedef struct H5D_chunk_info_t {
+    hsize_t index;              /* "Index" of chunk in dataset */
+    size_t chunk_points;        /* Number of elements selected in chunk */
+    hsize_t coords[H5O_LAYOUT_NDIMS];   /* Coordinates of chunk in file dataset's dataspace */
+    H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
+    unsigned fspace_shared;     /* Indicate that the file space for a chunk is shared and shouldn't be freed */
+    H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
+    unsigned mspace_shared;     /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
+} H5D_chunk_info_t;
+
+/* Cached information about a particular chunk */
+typedef struct {
+    hbool_t     valid;                          /*whether cache info is valid*/
+    hsize_t	offset[H5O_LAYOUT_NDIMS];	/*logical offset to start*/
+    size_t	nbytes;				/*size of stored data	*/
+    unsigned	filter_mask;			/*excluded filters	*/
+    haddr_t	addr;				/*file address of chunk */
+} H5D_chunk_cached_t;
+
 /* The raw data chunk cache */
 typedef struct H5D_rdcc_t {
 #ifdef H5D_ISTORE_DEBUG
@@ -132,7 +152,11 @@ typedef struct H5D_rdcc_t {
     struct H5D_rdcc_ent_t *head; /* Head of doubly linked list		*/
     struct H5D_rdcc_ent_t *tail; /* Tail of doubly linked list		*/
     int		nused;	/* Number of chunk slots in use		*/
+    H5D_chunk_cached_t last;    /* Cached copy of last chunk information */
     struct H5D_rdcc_ent_t **slot; /* Chunk slots, each points to a chunk*/
+    H5SL_t *sel_chunks;     /* Skip list containing information for each chunk selected */
+    H5S_t  *single_space;    /* Dataspace for single element I/O on chunks */
+    H5D_chunk_info_t *single_chunk_info;  /* Pointer to single chunk's info */
 } H5D_rdcc_t;
 
 /* The raw data contiguous data cache */
@@ -156,6 +180,7 @@ typedef struct H5D_shared_t {
     H5T_t              *type;           /* datatype of this dataset     */
     H5S_t              *space;          /* dataspace of this dataset    */
     hbool_t             space_dirty;    /* Whether the dataspace info needs to be flushed to the file */
+    hbool_t             layout_dirty;   /* Whether the layout info needs to be flushed to the file */
     hid_t               dcpl_id;        /* dataset creation property id */
     H5D_dcpl_cache_t    dcpl_cache;     /* Cached DCPL values */
     H5D_io_ops_t        io_ops;         /* I/O operations */
@@ -188,16 +213,6 @@ typedef enum {
 } H5D_time_alloc_t;
 
 
-/* Structure holding information about a chunk's selection for mapping */
-typedef struct H5D_chunk_info_t {
-    hsize_t index;              /* "Index" of chunk in dataset */
-    size_t chunk_points;        /* Number of elements selected in chunk */
-    H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
-    hsize_t coords[H5O_LAYOUT_NDIMS];   /* Coordinates of chunk in file dataset's dataspace */
-    H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
-    unsigned mspace_shared;     /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
-} H5D_chunk_info_t;
-
 /* Main structure holding the mapping between file chunks and memory */
 typedef struct H5D_chunk_map_t {
     H5O_layout_t *layout;       /* Dataset layout information*/
@@ -213,7 +228,10 @@ typedef struct H5D_chunk_map_t {
     unsigned m_ndims;           /* Number of dimensions for memory dataspace */
     H5S_sel_type msel_type;     /* Selection type in memory */
 
-    H5SL_t *fsel;               /* Skip list containing file dataspaces for all chunks */
+    H5SL_t *sel_chunks;         /* Skip list containing information for each chunk selected */
+    H5S_t  *single_space;       /* Dataspace for single chunk */
+    H5D_chunk_info_t *single_chunk_info;  /* Pointer to single chunk's info */
+    hbool_t use_single;         /* Whether I/O is on a single element */
     hsize_t last_index;         /* Index of last chunk operated on */
     H5D_chunk_info_t *last_chunk_info;  /* Pointer to last chunk's info */
     hsize_t chunks[H5O_LAYOUT_NDIMS];   /* Number of chunks in each dimension */
@@ -289,14 +307,18 @@ typedef struct H5D_istore_key_t {
  */
 typedef struct H5D_istore_bt_ud_common_t {
     /* downward */
-    H5D_istore_key_t	key;	                /*key values		*/
-    const H5O_layout_t	*mesg;		        /*layout message	*/
+    const H5O_layout_t *mesg;		        /*layout message	*/
+    const hsize_t *offset;	                /*logical offset of chunk*/
 } H5D_istore_bt_ud_common_t;
 
 /* B-tree callback info for various operations */
 typedef struct H5D_istore_ud1_t {
     H5D_istore_bt_ud_common_t common;           /* Common info for B-tree user data (must be first) */
-    haddr_t		addr;			/*file address of chunk */
+
+    /* Upward */
+    size_t	nbytes;				/*size of stored data	*/
+    unsigned	filter_mask;			/*excluded filters	*/
+    haddr_t	addr;				/*file address of chunk */
 } H5D_istore_ud1_t; 
 
 /* Internal data structure for computing variable-length dataset's total size */
@@ -329,7 +351,7 @@ H5_DLL H5D_t *H5D_create_named(const H5G_loc_t *loc, const char *name,
 H5_DLL herr_t H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation,
     hid_t dxpl_id);
 H5_DLL herr_t H5D_alloc_storage(H5F_t *f, hid_t dxpl_id, H5D_t *dset, H5D_time_alloc_t time_alloc,
-    hbool_t update_time, hbool_t full_overwrite);
+    hbool_t full_overwrite);
 H5_DLL hsize_t H5D_get_storage_size(H5D_t *dset, hid_t dxpl_id);
 H5_DLL haddr_t H5D_get_offset(const H5D_t *dset);
 H5_DLL herr_t H5D_iterate(void *buf, hid_t type_id, const H5S_t *space,
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index d7f6574..0d8b63f 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -113,7 +113,7 @@ H5_DLL herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, voi
 H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size);
 H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf,
         hid_t buf_type, hid_t space);
-H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t *size);
+H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]);
 H5_DLL herr_t H5Ddebug(hid_t dset_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
@@ -132,7 +132,7 @@ H5_DLL herr_t H5Ddebug(hid_t dset_id);
 H5_DLL hid_t H5Dcreate1(hid_t file_id, const char *name, hid_t type_id,
     hid_t space_id, hid_t dcpl_id);
 H5_DLL hid_t H5Dopen1(hid_t file_id, const char *name);
-H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t *size);
+H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t size[]);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
diff --git a/src/H5Dselect.c b/src/H5Dselect.c
index 105b4e5..f08672f 100644
--- a/src/H5Dselect.c
+++ b/src/H5Dselect.c
@@ -46,6 +46,18 @@
 /* Local Prototypes */
 /********************/
 
+/* Struct for holding the vectorized I/O operation buffers "loosely" */
+typedef struct {
+    enum {
+        H5S_SELECT_READ,                /* Read selection */
+        H5S_SELECT_WRITE                /* Write selection */
+    } op_type;
+    union {
+        void *rbuf;                          /* Buffer for read */
+        const void *wbuf;                    /* Buffer to write */
+    } u;
+} H5D_select_buf_t;
+
 /*********************/
 /* Package Variables */
 /*********************/
@@ -419,153 +431,199 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_select_read
+ * Function:	H5D_select_io
  *
- * Purpose:	Reads directly from file into application memory.
+ * Purpose:	Perform I/O directly from application memory and a file
  *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *              Tuesday, July 23, 2002
+ *              Tuesday, November 27, 2007
  *
  *-------------------------------------------------------------------------
  */
-herr_t
-H5D_select_read(H5D_io_info_t *io_info,
+static herr_t
+H5D_select_io(H5D_io_info_t *io_info,
     size_t nelmts, size_t elmt_size,
     const H5S_t *file_space, const H5S_t *mem_space,
     haddr_t addr, void *chunk/*in*/,
-    void *buf/*out*/)
+    const H5D_select_buf_t *io_buf)
 {
     H5S_sel_iter_t mem_iter;    /* Memory selection iteration info */
-    hbool_t mem_iter_init=0;    /* Memory selection iteration info has been initialized */
+    hbool_t mem_iter_init = 0;  /* Memory selection iteration info has been initialized */
     H5S_sel_iter_t file_iter;   /* File selection iteration info */
-    hbool_t file_iter_init=0;	/* File selection iteration info has been initialized */
+    hbool_t file_iter_init = 0;	/* File selection iteration info has been initialized */
     hsize_t _mem_off[H5D_IO_VECTOR_SIZE];      /* Array to store sequence offsets in memory */
-    hsize_t *mem_off=NULL;      /* Pointer to sequence offsets in memory */
+    hsize_t *mem_off = NULL;    /* Pointer to sequence offsets in memory */
     hsize_t _file_off[H5D_IO_VECTOR_SIZE];     /* Array to store sequence offsets in the file */
-    hsize_t *file_off=NULL;     /* Pointer to sequence offsets in the file */
+    hsize_t *file_off = NULL;   /* Pointer to sequence offsets in the file */
     size_t _mem_len[H5D_IO_VECTOR_SIZE];       /* Array to store sequence lengths in memory */
-    size_t *mem_len=NULL;       /* Pointer to sequence lengths in memory */
+    size_t *mem_len = NULL;     /* Pointer to sequence lengths in memory */
     size_t _file_len[H5D_IO_VECTOR_SIZE];      /* Array to store sequence lengths in the file */
-    size_t *file_len=NULL;      /* Pointer to sequence lengths in the file */
-    size_t mem_nseq;            /* Number of sequences generated in the file */
-    size_t file_nseq;           /* Number of sequences generated in memory */
-    size_t mem_nelem;           /* Number of elements used in memory sequences */
-    size_t file_nelem;          /* Number of elements used in file sequences */
+    size_t *file_len = NULL;    /* Pointer to sequence lengths in the file */
     size_t curr_mem_seq;        /* Current memory sequence to operate on */
     size_t curr_file_seq;       /* Current file sequence to operate on */
+    size_t mem_nseq;            /* Number of sequences generated in the file */
+    size_t file_nseq;           /* Number of sequences generated in memory */
     ssize_t tmp_file_len;       /* Temporary number of bytes in file sequence */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5D_select_read, FAIL);
+    FUNC_ENTER_NOAPI(H5D_select_io, FAIL)
 
     /* Check args */
-    assert(io_info);
-    assert(io_info->dset);
-    assert(io_info->dxpl_cache);
-    assert(io_info->store);
-    assert(buf);
-    assert(TRUE==H5P_isa_class(io_info->dxpl_id,H5P_DATASET_XFER));
-
-    /* Initialize file iterator */
-    if (H5S_select_iter_init(&file_iter, file_space, elmt_size)<0)
-        HGOTO_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator");
-    file_iter_init=1;	/* File selection iteration info has been initialized */
-
-    /* Initialize memory iterator */
-    if (H5S_select_iter_init(&mem_iter, mem_space, elmt_size)<0)
-        HGOTO_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator");
-    mem_iter_init=1;	/* Memory selection iteration info has been initialized */
+    HDassert(io_info);
+    HDassert(io_info->dset);
+    HDassert(io_info->store);
+    HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER));
+    HDassert(io_buf->u.rbuf);
 
     /* Allocate the vector I/O arrays */
     if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
-        if((mem_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
-        if((mem_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
-        if((file_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
-        if((file_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
+        if(NULL == (mem_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
+        if(NULL == (mem_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
+        if(NULL == (file_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array")
+        if(NULL == (file_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array")
     } /* end if */
     else {
-        mem_len=_mem_len;
-        mem_off=_mem_off;
-        file_len=_file_len;
-        file_off=_file_off;
+        mem_len = _mem_len;
+        mem_off = _mem_off;
+        file_len = _file_len;
+        file_off = _file_off;
     } /* end else */
 
-    /* Initialize sequence counts */
-    curr_mem_seq=curr_file_seq=0;
-    mem_nseq=file_nseq=0;
-
-    /* Loop, until all bytes are processed */
-    while(nelmts>0) {
-        /* Check if more file sequences are needed */
-        if(curr_file_seq>=file_nseq) {
-            /* Get sequences for file selection */
-            if(H5S_SELECT_GET_SEQ_LIST(file_space,H5S_GET_SEQ_LIST_SORTED,&file_iter,io_info->dxpl_cache->vec_size,nelmts,&file_nseq,&file_nelem,file_off,file_len)<0)
-                HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed");
-
-            /* Start at the beginning of the sequences again */
-            curr_file_seq=0;
+    /* Check for only one element in selection */
+    if(nelmts == 1) {
+        /* Get offset of first element in selections */
+        if(H5S_SELECT_OFFSET(file_space, file_off) < 0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "can't retrieve file selection offset")
+        if(H5S_SELECT_OFFSET(mem_space, mem_off) < 0)
+            HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "can't retrieve memory selection offset")
+
+        /* Set up necessary information for I/O operation */
+        file_nseq = mem_nseq = 1;
+        curr_mem_seq = curr_file_seq = 0;
+        *file_off *= elmt_size;
+        *mem_off *= elmt_size;
+        *file_len = *mem_len = elmt_size;
+
+        /* Perform I/O on memory and file sequences */
+        if(io_buf->op_type == H5S_SELECT_READ) {
+            if((tmp_file_len = (*io_info->ops.readvv)(io_info,
+                    file_nseq, &curr_file_seq, file_len, file_off,
+                    mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                    addr, chunk, io_buf->u.rbuf)) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
         } /* end if */
-
-        /* Check if more memory sequences are needed */
-        if(curr_mem_seq>=mem_nseq) {
-            /* Get sequences for memory selection */
-            if(H5S_SELECT_GET_SEQ_LIST(mem_space,0,&mem_iter,io_info->dxpl_cache->vec_size,nelmts,&mem_nseq,&mem_nelem,mem_off,mem_len)<0)
-                HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed");
-
-            /* Start at the beginning of the sequences again */
-            curr_mem_seq=0;
-        } /* end if */
-
-        /* Read file sequences into current memory sequence */
-        if ((tmp_file_len=(*io_info->ops.readvv)(io_info,
-                file_nseq, &curr_file_seq, file_len, file_off,
-                mem_nseq, &curr_mem_seq, mem_len, mem_off,
-                addr, chunk, buf))<0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error");
+        else {
+            HDassert(io_buf->op_type == H5S_SELECT_WRITE);
+            if((tmp_file_len = (*io_info->ops.writevv)(io_info,
+                    file_nseq, &curr_file_seq, file_len, file_off,
+                    mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                    addr, chunk, io_buf->u.wbuf)) < 0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
+        } /* end else */
 
         /* Decrement number of elements left to process */
-        assert((tmp_file_len%elmt_size)==0);
-        nelmts-=(tmp_file_len/elmt_size);
-    } /* end while */
+        HDassert((tmp_file_len % elmt_size) == 0);
+    } /* end if */
+    else {
+        size_t mem_nelem;           /* Number of elements used in memory sequences */
+        size_t file_nelem;          /* Number of elements used in file sequences */
+
+        /* Initialize file iterator */
+        if(H5S_select_iter_init(&file_iter, file_space, elmt_size) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
+        file_iter_init = 1;	/* File selection iteration info has been initialized */
+
+        /* Initialize memory iterator */
+        if(H5S_select_iter_init(&mem_iter, mem_space, elmt_size) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator")
+        mem_iter_init = 1;	/* Memory selection iteration info has been initialized */
+
+        /* Initialize sequence counts */
+        curr_mem_seq = curr_file_seq = 0;
+        mem_nseq = file_nseq = 0;
+
+        /* Loop, until all bytes are processed */
+        while(nelmts > 0) {
+            /* Check if more file sequences are needed */
+            if(curr_file_seq >= file_nseq) {
+                /* Get sequences for file selection */
+                if(H5S_SELECT_GET_SEQ_LIST(file_space, H5S_GET_SEQ_LIST_SORTED, &file_iter, io_info->dxpl_cache->vec_size, nelmts, &file_nseq, &file_nelem, file_off, file_len) < 0)
+                    HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
+
+                /* Start at the beginning of the sequences again */
+                curr_file_seq = 0;
+            } /* end if */
+
+            /* Check if more memory sequences are needed */
+            if(curr_mem_seq >= mem_nseq) {
+                /* Get sequences for memory selection */
+                if(H5S_SELECT_GET_SEQ_LIST(mem_space, 0, &mem_iter, io_info->dxpl_cache->vec_size, nelmts, &mem_nseq, &mem_nelem, mem_off, mem_len) < 0)
+                    HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed")
+
+                /* Start at the beginning of the sequences again */
+                curr_mem_seq = 0;
+            } /* end if */
+
+            /* Perform I/O on memory and file sequences */
+            if(io_buf->op_type == H5S_SELECT_READ) {
+                if((tmp_file_len = (*io_info->ops.readvv)(io_info,
+                        file_nseq, &curr_file_seq, file_len, file_off,
+                        mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                        addr, chunk, io_buf->u.rbuf)) < 0)
+                    HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
+            } /* end if */
+            else {
+                HDassert(io_buf->op_type == H5S_SELECT_WRITE);
+                if((tmp_file_len = (*io_info->ops.writevv)(io_info,
+                        file_nseq, &curr_file_seq, file_len, file_off,
+                        mem_nseq, &curr_mem_seq, mem_len, mem_off,
+                        addr, chunk, io_buf->u.wbuf)) < 0)
+                    HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
+            } /* end else */
+
+            /* Decrement number of elements left to process */
+            HDassert((tmp_file_len % elmt_size) == 0);
+            nelmts -= (tmp_file_len / elmt_size);
+        } /* end while */
+    } /* end else */
 
 done:
     /* Release file selection iterator */
-    if(file_iter_init) {
-        if (H5S_SELECT_ITER_RELEASE(&file_iter)<0)
-            HDONE_ERROR (H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator");
-    } /* end if */
+    if(file_iter_init)
+        if(H5S_SELECT_ITER_RELEASE(&file_iter) < 0)
+            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     /* Release memory selection iterator */
-    if(mem_iter_init) {
-        if (H5S_SELECT_ITER_RELEASE(&mem_iter)<0)
-            HDONE_ERROR (H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator");
-    } /* end if */
+    if(mem_iter_init)
+        if(H5S_SELECT_ITER_RELEASE(&mem_iter) < 0)
+            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator")
 
     /* Free vector arrays */
     if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
-        if(file_len!=NULL)
-            H5FL_SEQ_FREE(size_t,file_len);
-        if(file_off!=NULL)
-            H5FL_SEQ_FREE(hsize_t,file_off);
-        if(mem_len!=NULL)
-            H5FL_SEQ_FREE(size_t,mem_len);
-        if(mem_off!=NULL)
-            H5FL_SEQ_FREE(hsize_t,mem_off);
+        if(file_len != NULL)
+            H5FL_SEQ_FREE(size_t, file_len);
+        if(file_off != NULL)
+            H5FL_SEQ_FREE(hsize_t, file_off);
+        if(mem_len != NULL)
+            H5FL_SEQ_FREE(size_t, mem_len);
+        if(mem_off != NULL)
+            H5FL_SEQ_FREE(hsize_t, mem_off);
     } /* end if */
-    FUNC_LEAVE_NOAPI(ret_value);
-} /* end H5D_select_read() */
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_select_io() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5D_select_write
+ * Function:	H5D_select_read
  *
- * Purpose:	Writes directly from application memory into a file
+ * Purpose:	Reads directly from file into application memory.
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -575,133 +633,63 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_select_write(H5D_io_info_t *io_info,
+H5D_select_read(H5D_io_info_t *io_info,
     size_t nelmts, size_t elmt_size,
     const H5S_t *file_space, const H5S_t *mem_space,
     haddr_t addr, void *chunk/*in*/,
-    const void *buf/*out*/)
+    void *buf/*out*/)
 {
-    H5S_sel_iter_t mem_iter;    /* Memory selection iteration info */
-    hbool_t mem_iter_init=0;    /* Memory selection iteration info has been initialized */
-    H5S_sel_iter_t file_iter;   /* File selection iteration info */
-    hbool_t file_iter_init=0;	/* File selection iteration info has been initialized */
-    hsize_t _mem_off[H5D_IO_VECTOR_SIZE];      /* Array to store sequence offsets in memory */
-    hsize_t *mem_off=NULL;      /* Pointer to sequence offsets in memory */
-    hsize_t _file_off[H5D_IO_VECTOR_SIZE];     /* Array to store sequence offsets in the file */
-    hsize_t *file_off=NULL;     /* Pointer to sequence offsets in the file */
-    size_t _mem_len[H5D_IO_VECTOR_SIZE];       /* Array to store sequence lengths in memory */
-    size_t *mem_len=NULL;       /* Pointer to sequence lengths in memory */
-    size_t _file_len[H5D_IO_VECTOR_SIZE];      /* Array to store sequence lengths in the file */
-    size_t *file_len=NULL;      /* Pointer to sequence lengths in the file */
-    size_t mem_nseq;            /* Number of sequences generated in the file */
-    size_t file_nseq;           /* Number of sequences generated in memory */
-    size_t mem_nelem;           /* Number of elements used in memory sequences */
-    size_t file_nelem;          /* Number of elements used in file sequences */
-    size_t curr_mem_seq;        /* Current memory sequence to operate on */
-    size_t curr_file_seq;       /* Current file sequence to operate on */
-    ssize_t tmp_file_len;       /* Temporary number of bytes in file sequence */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    H5D_select_buf_t io_buf;      /* Selection I/O operation to perform */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5D_select_write, FAIL);
+    FUNC_ENTER_NOAPI(H5D_select_read, FAIL)
 
-    /* Check args */
-    assert(io_info);
-    assert(io_info->dset);
-    assert(io_info->store);
-    assert(TRUE==H5P_isa_class(io_info->dxpl_id,H5P_DATASET_XFER));
-    assert(buf);
-
-    /* Allocate the vector I/O arrays */
-    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
-        if((mem_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
-        if((mem_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
-        if((file_len = H5FL_SEQ_MALLOC(size_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O length vector array");
-        if((file_off = H5FL_SEQ_MALLOC(hsize_t,io_info->dxpl_cache->vec_size))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate I/O offset vector array");
-    } /* end if */
-    else {
-        mem_len=_mem_len;
-        mem_off=_mem_off;
-        file_len=_file_len;
-        file_off=_file_off;
-    } /* end else */
-
-    /* Initialize file iterator */
-    if (H5S_select_iter_init(&file_iter, file_space, elmt_size)<0)
-        HGOTO_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator");
-    file_iter_init=1;	/* File selection iteration info has been initialized */
-
-    /* Initialize memory iterator */
-    if (H5S_select_iter_init(&mem_iter, mem_space, elmt_size)<0)
-        HGOTO_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to initialize selection iterator");
-    mem_iter_init=1;	/* Memory selection iteration info has been initialized */
+    /* Construct proper I/O operation */
+    io_buf.op_type = H5S_SELECT_READ;
+    io_buf.u.rbuf = buf;
 
-    /* Initialize sequence counts */
-    curr_mem_seq=curr_file_seq=0;
-    mem_nseq=file_nseq=0;
+    /* Call generic selection operation */
+    if(H5D_select_io(io_info, nelmts, elmt_size, file_space, mem_space, addr, chunk, &io_buf) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_READERROR, FAIL, "read error")
 
-    /* Loop, until all bytes are processed */
-    while(nelmts>0) {
-        /* Check if more file sequences are needed */
-        if(curr_file_seq>=file_nseq) {
-            /* Get sequences for file selection */
-            if(H5S_SELECT_GET_SEQ_LIST(file_space,H5S_GET_SEQ_LIST_SORTED,&file_iter,io_info->dxpl_cache->vec_size,nelmts,&file_nseq,&file_nelem,file_off,file_len)<0)
-                HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed");
-
-            /* Start at the beginning of the sequences again */
-            curr_file_seq=0;
-        } /* end if */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5D_select_read() */
 
-        /* Check if more memory sequences are needed */
-        if(curr_mem_seq>=mem_nseq) {
-            /* Get sequences for memory selection */
-            if(H5S_SELECT_GET_SEQ_LIST(mem_space,0,&mem_iter,io_info->dxpl_cache->vec_size,nelmts,&mem_nseq,&mem_nelem,mem_off,mem_len)<0)
-                HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "sequence length generation failed");
+
+/*-------------------------------------------------------------------------
+ * Function:	H5D_select_write
+ *
+ * Purpose:	Writes directly from application memory into a file
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              Tuesday, July 23, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5D_select_write(H5D_io_info_t *io_info,
+    size_t nelmts, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space,
+    haddr_t addr, void *chunk/*in*/,
+    const void *buf/*out*/)
+{
+    H5D_select_buf_t io_buf;      /* Selection I/O operation to perform */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-            /* Start at the beginning of the sequences again */
-            curr_mem_seq=0;
-        } /* end if */
+    FUNC_ENTER_NOAPI(H5D_select_write, FAIL)
 
-        /* Write memory sequences into file sequences */
-        if ((tmp_file_len=(*io_info->ops.writevv)(io_info,
-                file_nseq, &curr_file_seq, file_len, file_off,
-                mem_nseq, &curr_mem_seq, mem_len, mem_off,
-                addr, chunk, buf))<0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error");
+    /* Construct proper I/O operation */
+    io_buf.op_type = H5S_SELECT_WRITE;
+    io_buf.u.wbuf = buf;
 
-        /* Decrement number of elements left to process */
-        assert((tmp_file_len%elmt_size)==0);
-        nelmts-=(tmp_file_len/elmt_size);
-    } /* end while */
+    /* Call generic selection operation */
+    if(H5D_select_io(io_info, nelmts, elmt_size, file_space, mem_space, addr, chunk, &io_buf) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_WRITEERROR, FAIL, "write error")
 
 done:
-    /* Release file selection iterator */
-    if(file_iter_init) {
-        if (H5S_SELECT_ITER_RELEASE(&file_iter)<0)
-            HDONE_ERROR (H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator");
-    } /* end if */
-
-    /* Release memory selection iterator */
-    if(mem_iter_init) {
-        if (H5S_SELECT_ITER_RELEASE(&mem_iter)<0)
-            HDONE_ERROR (H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release selection iterator");
-    } /* end if */
-
-    /* Free vector arrays */
-    if(io_info->dxpl_cache->vec_size != H5D_IO_VECTOR_SIZE) {
-        if(file_len!=NULL)
-            H5FL_SEQ_FREE(size_t,file_len);
-        if(file_off!=NULL)
-            H5FL_SEQ_FREE(hsize_t,file_off);
-        if(mem_len!=NULL)
-            H5FL_SEQ_FREE(size_t,mem_len);
-        if(mem_off!=NULL)
-            H5FL_SEQ_FREE(hsize_t,mem_off);
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_select_write() */
 
diff --git a/src/H5F.c b/src/H5F.c
index 8a4b019..b1171bd 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -308,7 +308,7 @@ H5F_get_access_plist(H5F_t *f)
 
     /* Copy properties of the file access property list */
     if(H5P_set(new_plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set initial meta data cache resize config.")
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set initial metadata cache resize config.")
     if(H5P_set(new_plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &(f->shared->rdcc_nelmts)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data cache element size")
     if(H5P_set(new_plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
@@ -321,11 +321,11 @@ H5F_get_access_plist(H5F_t *f)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment")
     if(H5P_set(new_plist, H5F_ACS_GARBG_COLCT_REF_NAME, &(f->shared->gc_ref)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference")
-    if(H5P_set(new_plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->lf->def_meta_block_size)) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set meta data cache size")
+    if(H5P_set(new_plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(f->shared->lf->meta_aggr.alloc_size)) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set metadata cache size")
     if(H5P_set(new_plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &(f->shared->sieve_buf_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't sieve buffer size")
-    if(H5P_set(new_plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->lf->def_sdata_block_size)) < 0)
+    if(H5P_set(new_plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(f->shared->lf->sdata_aggr.alloc_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' cache size")
     if(H5P_set(new_plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'latest format' flag")
@@ -882,7 +882,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
         if(NULL == (plist = H5I_object(fapl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not file access property list")
         if(H5P_get(plist, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, &(f->shared->mdc_initCacheCfg)) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get initial meta data cache resize config")
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get initial metadata cache resize config")
         if(H5P_get(plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &(f->shared->rdcc_nelmts)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get data cache element size")
         if(H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &(f->shared->rdcc_nbytes)) < 0)
@@ -900,6 +900,11 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
         if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &(f->shared->latest_format)) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'latest format' flag")
 
+        /* Get the VFD values to cache */
+        f->shared->maxaddr = H5FD_get_maxaddr(lf);
+        if(!H5F_addr_defined(f->shared->maxaddr))
+            HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad maximum address from VFD")
+
         /* Bump superblock version if we are to use the latest version of the format */
         if(f->shared->latest_format)
             super_vers = HDF5_SUPERBLOCK_VERSION_LATEST;
@@ -924,12 +929,12 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
         } /* end if */
 
 	/*
-	 * Create a meta data cache with the specified number of elements.
+	 * Create a metadata cache with the specified number of elements.
 	 * The cache might be created with a different number of elements and
 	 * the access property list should be updated to reflect that.
 	 */
 	if(SUCCEED != H5AC_create(f, &(f->shared->mdc_initCacheCfg)))
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create meta data cache")
+	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
 
 	/* Create a metadata cache with modified API along side the regular
 	 * version.  For now, this is just for testing.  Once we get it 
@@ -1728,7 +1733,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
     if(H5D_flush(f, dxpl_id, flags) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush dataset cache")
 
-    /* flush (and invalidate, if requested) the entire meta data cache */
+    /* flush (and invalidate, if requested) the entire metadata cache */
     H5AC_flags = 0;
     if((flags & H5F_FLUSH_INVALIDATE) != 0 )
         H5AC_flags |= H5AC__FLUSH_INVALIDATE_FLAG;
@@ -1743,29 +1748,11 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
      * "small data" blocks back to the free lists in the file.
      */
     if(flags & H5F_FLUSH_INVALIDATE) {
-        if(f->shared->lf->feature_flags & H5FD_FEAT_AGGREGATE_METADATA) {
-            /* Return the unused portion of the metadata block to a free list */
-            if(f->shared->lf->eoma != 0)
-                if(H5FD_free(f->shared->lf, H5FD_MEM_DEFAULT, dxpl_id,
-                        f->shared->lf->eoma, f->shared->lf->cur_meta_block_size) < 0)
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free metadata block")
-
-            /* Reset metadata block information, just in case */
-            f->shared->lf->eoma = 0;
-            f->shared->lf->cur_meta_block_size = 0;
-        } /* end if */
-
-        if(f->shared->lf->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA) {
-            /* Return the unused portion of the "small data" block to a free list */
-            if(f->shared->lf->eosda != 0)
-                if(H5FD_free(f->shared->lf, H5FD_MEM_DRAW, dxpl_id,
-                        f->shared->lf->eosda, f->shared->lf->cur_sdata_block_size) < 0)
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free 'small data' block")
+        if(H5FD_aggr_reset(f->shared->lf, &(f->shared->lf->meta_aggr), dxpl_id) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't reset metadata block")
 
-            /* Reset "small data" block information, just in case */
-            f->shared->lf->eosda = 0;
-            f->shared->lf->cur_sdata_block_size = 0;
-        } /* end if */
+        if(H5FD_aggr_reset(f->shared->lf, &(f->shared->lf->sdata_aggr), dxpl_id) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't reset 'small data' block")
     } /* end if */
 
     /* Write the superblock to disk */
@@ -2479,8 +2466,6 @@ H5F_get_driver_id(const H5F_t *f)
  * Programmer:	Quincey Koziol 
  *		March 27, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -2490,13 +2475,13 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
 
     FUNC_ENTER_NOAPI(H5F_get_fileno, FAIL)
 
-    assert(f);
-    assert(f->shared);
-    assert(f->shared->lf);
-    assert(filenum);
+    HDassert(f);
+    HDassert(f->shared);
+    HDassert(f->shared->lf);
+    HDassert(filenum);
 
     /* Retrieve the file's serial number */
-    if(H5FD_get_fileno(f->shared->lf,filenum) < 0)
+    if(H5FD_get_fileno(f->shared->lf, filenum) < 0)
 	HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, FAIL, "can't retrieve fileno")
 
 done:
diff --git a/src/H5FD.c b/src/H5FD.c
index 096509e..3ae6d8e 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -24,18 +24,25 @@
  *              file driver layer.
  */
 
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#define H5FD_PACKAGE		/*suppress error about including H5FDpkg  */
 
 /* Interface initialization */
 #define H5_INTERFACE_INIT_FUNC	H5FD_init_interface
 
 
-/* Packages needed by this file */
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
+#include "H5FDpkg.h"		/* File Drivers				*/
 #include "H5FDcore.h"		/* Files stored entirely in memory	*/
 #include "H5FDfamily.h"		/* File families 			*/
 #include "H5FDlog.h"        	/* sec2 driver with I/O logging (for debugging) */
@@ -47,41 +54,50 @@
 #include "H5FDwindows.h"        /* Windows buffered I/O     */
 #endif
 #include "H5FDdirect.h"		/* Direct file I/O			*/
-#include "H5FLprivate.h"	/* Free lists                           */
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Pprivate.h"		/* Property lists			*/
 
-/* static prototypes */
+/****************/
+/* Local Macros */
+/****************/
+
+/* Metadata accumulator controls */
+#define H5FD_ACCUM_THROTTLE     8
+#define H5FD_ACCUM_THRESHOLD    2048
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
 static herr_t H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size,
     const void *old_pl, void **copied_pl);
 static herr_t H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *),
     void *pl);
 static herr_t H5FD_free_cls(H5FD_class_t *cls);
-static haddr_t H5FD_alloc_from_free_list(H5FD_t *file, H5FD_mem_t type,
-    hsize_t size);
-static haddr_t H5FD_alloc_metadata(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-    hsize_t size);
-static haddr_t H5FD_alloc_raw(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
-    hsize_t size);
-static haddr_t H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-static herr_t H5FD_free_freelist(H5FD_t *file);
-static haddr_t H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
-
-/* Declare a free list to manage the H5FD_free_t struct */
-H5FL_DEFINE(H5FD_free_t);
-
-/* Declare a PQ free list to manage the metadata accumulator buffer */
-H5FL_BLK_DEFINE_STATIC(meta_accum);
-
-/* Local macro definitions */
-#define H5FD_ACCUM_THROTTLE     8
-#define H5FD_ACCUM_THRESHOLD    2048
 
-/* Define this to display information about file allocations */
-/* #define H5FD_ALLOC_DEBUG */
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
 
-/* Static local variables */
+/*******************/
+/* Local Variables */
+/*******************/
 
 /*
  * Global count of the number of H5FD_t's handed out.  This is used as a
@@ -99,6 +115,32 @@ static unsigned long file_serial_no;
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5FD_init
+ *
+ * Purpose:	Initialize the interface from some other package.
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, January  3, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_init(void)
+{
+    herr_t ret_value = SUCCEED;   /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_init, FAIL)
+    /* FUNC_ENTER() does all the work */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_init() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5FD_init_interface
  *
  * Purpose:	Initialize the virtual file layer.
@@ -1055,10 +1097,12 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     HDmemset(file->fl, 0, sizeof(file->fl));
     if(H5P_get(plist, H5F_ACS_META_BLOCK_SIZE_NAME, &(meta_block_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get meta data block size")
-    file->def_meta_block_size = meta_block_size;
+    file->meta_aggr.feature_flag = H5FD_FEAT_AGGREGATE_METADATA;
+    file->meta_aggr.alloc_size = meta_block_size;
     if(H5P_get(plist, H5F_ACS_SDATA_BLOCK_SIZE_NAME, &(sdata_block_size)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get 'small data' block size")
-    file->def_sdata_block_size = sdata_block_size;
+    file->sdata_aggr.feature_flag = H5FD_FEAT_AGGREGATE_SMALLDATA;
+    file->sdata_aggr.alloc_size = sdata_block_size;
     file->accum_loc = HADDR_UNDEF;
     if(H5P_get(plist, H5F_ACS_ALIGN_THRHD_NAME, &(file->threshold)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get alignment threshold")
@@ -1182,74 +1226,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_free_freelist
- * Purpose:     Split off from H5FD_close(). Free the elements in the
- *              free list for this file driver.
- * Return:      Success:    SUCCEED
- *              Failure:    Never fails
- * Programmer:  Bill Wendling
- *              17. February 2003
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_free_freelist(H5FD_t *file)
-{
-    H5FD_mem_t  i;
-#ifdef H5F_DEBUG
-    unsigned    nblocks = 0;
-    hsize_t     nbytes = 0;
-#endif  /* H5F_DEBUG */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_freelist)
-
-    /* check args */
-    HDassert(file && file->cls);
-
-    /*
-     * Free all free-lists, leaking any memory thus described. Also leaks
-     * file space allocated but not used when metadata aggregation is
-     * turned on.
-     */
-    for(i = H5FD_MEM_DEFAULT; i < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, i)) {
-        H5FD_free_t *cur, *next;
-
-        for( cur = file->fl[i]; cur; cur = next) {
-#ifdef H5F_DEBUG
-            ++nblocks;
-            nbytes += cur->size;
-#endif  /* H5F_DEBUG */
-            next = cur->next;
-            H5FL_FREE(H5FD_free_t, cur);
-        } /* end for */
-
-        file->fl[i] = NULL;
-    } /* end for */
-
-#ifdef H5F_DEBUG
-    if(nblocks && H5DEBUG(F))
-        HDfprintf(H5DEBUG(F),
-                  "H5F: leaked %Hu bytes of file memory in %u blocks\n",
-                  nbytes, nblocks);
-#endif  /* H5F_DEBUG */
-
-    /* Check if we need to reset the metadata accumulator information */
-    if(file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
-        /* Free the buffer */
-        if(file->meta_accum)
-            file->meta_accum = H5FL_BLK_FREE(meta_accum, file->meta_accum);
-
-        /* Reset the buffer sizes & location */
-        file->accum_buf_size = file->accum_size = 0;
-        file->accum_loc = HADDR_UNDEF;
-        file->accum_dirty = 0;
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5FD_free_freelist() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FDcmp
  *
  * Purpose:	Compare the keys of two files using the file driver callback
@@ -1481,719 +1457,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_alloc
- * Purpose:     Private version of H5FDalloc().
- * Return:      Success:    The format address of the new file memory.
- *              Failure:    The undefined address HADDR_UNDEF
- * Programmer:  Robb Matzke
- *              Wednesday, August  4, 1999
- * Modifications:
- *	Albert Cheng, 2001/05/01
- *	Implement the allocation by alignment/threshold.
- *
- *      Bill Wendling, 2002/12/02
- *      Split apart into subfunctions for each separate task.
- *
- *      Bill Wendling, 2003/02/19
- *      Added support for FPHDF5.
- *
- *	John Mainzer, 2004/04/13
- *	Moved much of the FPHDF5 specific code into H5FP_client_alloc(),
- *      and re-worked it to get rid of a race condition on the eoa.
- *
- *-------------------------------------------------------------------------
- */
-haddr_t
-H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
-{
-    haddr_t     ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI(H5FD_alloc, HADDR_UNDEF)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* check args */
-    assert(file);
-    assert(file->cls);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-#ifdef H5F_DEBUG
-    if(H5DEBUG(F))
-	HDfprintf(H5DEBUG(F), "%s: alignment=%Hd, threshold=%Hd, size=%Hd\n",
-                  FUNC, file->alignment, file->threshold, size);
-#endif  /* H5F_DEBUG */
-
-    /* Try to allocate from the free list first */
-    if((ret_value = H5FD_alloc_from_free_list(file, type, size)) != HADDR_UNDEF)
-        HGOTO_DONE(ret_value)
-
-#ifdef H5F_DEBUG
-    if(H5DEBUG(F))
-	HDfprintf(H5DEBUG(F), "%s: Could not allocate from freelists\n", FUNC);
-#endif  /* H5F_DEBUG */
-
-    if(type != H5FD_MEM_DRAW) {
-        /* Handle metadata differently from "raw" data */
-        if((ret_value = H5FD_alloc_metadata(file, type, dxpl_id, size)) == HADDR_UNDEF)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate for metadata")
-    } else {
-        /* Allocate "raw" data */
-        if((ret_value = H5FD_alloc_raw(file, type, dxpl_id, size)) == HADDR_UNDEF)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate for raw data")
-    }
-
-done:
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
-#endif /* H5FD_ALLOC_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_alloc() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_alloc_from_free_list
- * Purpose:     Try to allocate SIZE bytes of memory from the free list
- *              if possible.
- *
- *              This is split from H5FD_alloc().
- * Return:      Success:    The format address of the new file memory.
- *              Failure:    The undefined address HADDR_UNDEF
- * Programmer:  Bill Wendling
- *              02. December, 2002
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_alloc_from_free_list(H5FD_t *file, H5FD_mem_t type, hsize_t size)
-{
-    H5FD_mem_t mapped_type;
-    haddr_t ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI(H5FD_alloc_from_free_list, HADDR_UNDEF)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    assert(file);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-    /* Map the allocation request to a free list */
-    if(H5FD_MEM_DEFAULT == file->cls->fl_map[type])
-        mapped_type = type;
-    else
-        mapped_type = file->cls->fl_map[type];
-
-    /*
-     * Try to satisfy the request from the free list. Only perform the
-     * search if the free list has the potential of satisfying the
-     * request.
-     *
-     * Here, aligned requests are requests that are >= threshold and
-     * alignment > 1.
-     *
-     * For non-aligned request, first try to find an exact match,
-     * otherwise use the best match which is the smallest size that meets
-     * the requested size.
-     *
-     * For aligned address request, find a block in the following order
-     * of preferences:
-     *
-     *   1. block address is aligned and exact match in size;
-     *   2. block address is aligned with smallest size > requested size;
-     *   3. block address is not aligned with smallest size >= requested size.
-     */
-    if(mapped_type >= H5FD_MEM_DEFAULT && (file->maxsize == 0 || size <= file->maxsize)) {
-        H5FD_free_t    *prev = NULL, *best = NULL;
-        H5FD_free_t    *cur = file->fl[mapped_type];
-        hbool_t         found_aligned = FALSE;
-        hbool_t         need_aligned;
-        hsize_t         head;
-
-        need_aligned = file->alignment > 1 && size >= file->threshold;
-
-        while(cur) {
-            if(cur->size > file->maxsize)
-                file->maxsize = cur->size;
-
-            if(need_aligned) {
-                if((head = cur->addr % file->alignment) == 0) {
-                    /*
-                     * Aligned address
-                     */
-                    if(cur->size >= size) {
-                        if(cur->size == size) {
-                            /* exact match */
-                            ret_value = cur->addr;
-
-                            /*
-                             * Make certain we don't hand out a block of raw data
-                             * from the free list which overlaps with the metadata
-                             * aggregation buffer (if it's turned on)
-                             */
-                            if(type == H5FD_MEM_DRAW &&
-                                    (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
-                                    H5F_addr_overlap(ret_value, size,
-                                                     file->accum_loc, file->accum_size)) {
-                                ret_value = HADDR_UNDEF;
-                            } else {
-                                if(prev)
-                                    prev->next = cur->next;
-                                else
-                                    file->fl[mapped_type] = cur->next;
-
-                                H5FL_FREE(H5FD_free_t, cur);
-
-                                if(size == file->maxsize)
-                                    file->maxsize = 0;  /*unknown*/
-
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Exact size match (aligned)\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                                HGOTO_DONE(ret_value)
-                            }
-                        }
-                        else
-                            /* Favor smallest block, that's closest to the beginning of the file */
-                            if(!best || !found_aligned || cur->size < best->size ||
-                                    (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr))) {
-                                best = cur;
-                                found_aligned = TRUE;
-                            }
-                    } /* end if */
-                } else {
-                    /*
-                     * Non-aligned address
-                     *
-                     * Check to see if this block is big enough to skip
-                     * to the next aligned address and is still big
-                     * enough for the requested size.  The extra
-                     * (cur->size > head) is for preventing unsigned
-                     * underflow.  (This could be improved by checking for
-                     * an exact match after excluding the head.  Such
-                     * match is as good as the found_aligned case above.)
-                     */
-                    head = file->alignment - head;	/* actual head size */
-
-                    if(!found_aligned && cur->size > head && cur->size-head >= size) {
-                        /* Favor smallest block, that's closest to the beginning of the file */
-                        if(!best || cur->size < best->size ||
-                                (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr)))
-                            best = cur;
-                    } /* end if */
-                } /* end else */
-            } else {
-                /* !need_aligned */
-                if(cur->size >= size) {
-                    if(cur->size == size) {
-                        /* exact match */
-                        ret_value = cur->addr;
-
-                        /*
-                         * Make certain we don't hand out a block of raw data
-                         * from the free list which overlaps with the metadata
-                         * aggregation buffer (if it's turned on)
-                         */
-                        if(type == H5FD_MEM_DRAW &&
-                                (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
-                                H5F_addr_overlap(ret_value, size, file->accum_loc,
-                                                 file->accum_size)) {
-                            ret_value = HADDR_UNDEF;
-                        } else {
-                            if(prev)
-                                prev->next = cur->next;
-                            else
-                                file->fl[mapped_type] = cur->next;
-
-                            H5FL_FREE(H5FD_free_t, cur);
-
-                            if(size == file->maxsize)
-                                file->maxsize = 0;  /*unknown*/
-
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Exact size match (unaligned)\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                            HGOTO_DONE(ret_value)
-                        }
-                    } /* end if */
-                    else {
-                        /* Favor smallest block, that's closest to the beginning of the file */
-                        if(!best || cur->size < best->size ||
-                                (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr)))
-                            best = cur;
-                    } /* end else */
-                } /* end if */
-            } /* end else */
-
-            prev = cur;
-            cur = cur->next;
-        } /* end while */
-
-        /* Couldn't find exact match, use best fitting piece found */
-        if(best) {
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Splitting %Hu byte sized block\n", FUNC, best->size);
-#endif /* H5FD_ALLOC_DEBUG */
-            if(best->size == file->maxsize)
-                file->maxsize = 0;  /*unknown*/
-
-            if(!need_aligned || found_aligned) {
-                /* free only tail */
-                ret_value = best->addr;
-
-                /*
-                 * Make certain we don't hand out a block of raw data
-                 * from the free list which overlaps with the metadata
-                 * aggregation buffer (if it's turned on)
-                 */
-                if(type == H5FD_MEM_DRAW &&
-                        (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
-                        H5F_addr_overlap(ret_value, size, file->accum_loc,
-                                         file->accum_size)) {
-                    ret_value = HADDR_UNDEF;
-                } else {
-                    best->addr += size;     /* Reduce size of block on free list */
-                    best->size -= size;
-                    HGOTO_DONE(ret_value)
-                }
-            } else {
-                /*
-                 * Split into 3 pieces. Keep the the head and tail in the
-                 * freelist.
-                 */
-                H5FD_free_t *tmp = NULL;
-
-                head = file->alignment - (best->addr % file->alignment);
-                ret_value = best->addr + head;
-
-                /*
-                 * Make certain we don't hand out a block of raw data
-                 * from the free list which overlaps with the metadata
-                 * aggregation buffer (if it's turned on)
-                 */
-                if(type == H5FD_MEM_DRAW &&
-                        (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
-                        H5F_addr_overlap(ret_value, size, file->accum_loc, file->accum_size)) {
-                    ret_value = HADDR_UNDEF;
-                } else {
-                    /* Attempt to allocate memory for temporary node */
-                    if((tmp = H5FL_MALLOC(H5FD_free_t))==NULL)
-                        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "free block allocation failed")
-
-                    if((tmp->size = (best->size - (head + size)))!=0) {
-                        tmp->addr = best->addr + (head + size);
-                        tmp->next = best->next;
-                        best->next = tmp;
-                    } else {
-                        /* no tail piece */
-                        H5FL_FREE(H5FD_free_t,tmp);
-                    }
-
-                    best->size = head;
-                    HGOTO_DONE(ret_value)
-                } /* end else */
-            } /* end else */
-        } /* end if */
-    } /* end if */
-
-done:
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
-#endif /* H5FD_ALLOC_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_alloc_from_free_list() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_alloc_metadata
- * Purpose:     Try to allocate SIZE bytes of memory from the metadata
- *              block if possible.
- *
- *              This is split from H5FD_alloc().
- * Return:      Success:    The format address of the new file memory.
- *              Failure:    The undefined address HADDR_UNDEF
- * Programmer:  Bill Wendling
- *              2. December, 2002
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_alloc_metadata(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
-{
-    haddr_t ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI(H5FD_alloc_metadata, HADDR_UNDEF)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* check args */
-    assert(file);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-    /*
-     * If the metadata aggregation feature is enabled for this VFL
-     * driver, allocate "generic" metadata space and sub-allocate out of
-     * that, if possible. Otherwise just allocate through
-     * H5FD_real_alloc()
-     */
-
-    /*
-     * Allocate all types of metadata out of the metadata block
-     */
-    if(file->feature_flags & H5FD_FEAT_AGGREGATE_METADATA) {
-        /*
-         * Check if the space requested is larger than the space left in
-         * the block
-         */
-        if(size > file->cur_meta_block_size) {
-            haddr_t new_meta;   /* Address for new metadata */
-
-            /*
-             * Check if the block asked for is too large for a metadata
-             * block
-             */
-            if(size >= file->def_meta_block_size) {
-                /* Allocate more room for this new block the regular way */
-                if(HADDR_UNDEF==(new_meta = H5FD_real_alloc(file, type, dxpl_id, size)))
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata block")
-
-                /*
-                 * Check if the new metadata is at the end of the current
-                 * metadata block
-                 */
-                if(file->eoma + file->cur_meta_block_size == new_meta) {
-                    /*
-                     * Treat the allocation request as if the current
-                     * metadata block grew by the amount allocated and
-                     * just update the eoma address. Don't bother
-                     * updating the cur_meta_block_size since it will
-                     * just grow and shrink by the same amount.
-                     */
-                    ret_value = file->eoma;
-                    file->eoma += size;
-                } else {
-                    /* Use the new metadata block for the space allocated */
-                    ret_value = new_meta;
-                }
-            } else {
-                /* Allocate another metadata block */
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Allocating 'metadata' block\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                if(HADDR_UNDEF==(new_meta = H5FD_real_alloc(file, H5FD_MEM_DEFAULT, dxpl_id,
-                                           file->def_meta_block_size)))
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata block")
-
-                /*
-                 * Check if the new metadata is at the end of the current
-                 * metadata block
-                 */
-                if(file->eoma + file->cur_meta_block_size == new_meta) {
-                    file->cur_meta_block_size += file->def_meta_block_size;
-                } else {
-                    /*
-                     * Return the unused portion of the metadata block to
-                     * a free list
-                     */
-                    if(file->eoma != 0)
-                        if(H5FD_free(file, H5FD_MEM_DEFAULT, dxpl_id, file->eoma,
-                                      file->cur_meta_block_size) < 0)
-                            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free metadata block")
-
-                    /* Point the metadata block at the newly allocated block */
-                    file->eoma = new_meta;
-                    file->cur_meta_block_size = file->def_meta_block_size;
-                }
-
-                /* Allocate space out of the metadata block */
-                ret_value = file->eoma;
-                file->cur_meta_block_size -= size;
-                file->eoma += size;
-            }
-        } else {
-            /* Allocate space out of the metadata block */
-            ret_value = file->eoma;
-            file->cur_meta_block_size -= size;
-            file->eoma += size;
-        }
-    } else {
-        /* Allocate data the regular way */
-        if(HADDR_UNDEF==(ret_value = H5FD_real_alloc(file, type, dxpl_id, size)))
-            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata block")
-    }
-
-done:
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
-#endif /* H5FD_ALLOC_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_alloc_metadata() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_alloc_raw
- * Purpose:     Try to allocate SIZE bytes of raw data.
- *
- *              This is split from H5FD_alloc().
- * Return:      Success:    The format address of the new file memory.
- *              Failure:    The undefined address HADDR_UNDEF
- * Programmer:  Bill Wendling
- *              2. December, 2002
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_alloc_raw(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
-{
-    haddr_t ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI(H5FD_alloc_raw, HADDR_UNDEF)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* check args */
-    assert(file);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-    /*
-     * If the "small data" aggregation feature is enabled for this VFL driver,
-     * allocate "small data" space and sub-allocate out of that, if
-     * possible. Otherwise just allocate through H5FD_real_alloc()
-     */
-    if(file->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA) {
-        /*
-         * Check if the space requested is larger than the space left in
-         * the block
-         */
-        if(size > file->cur_sdata_block_size) {
-            haddr_t new_data;       /* Address for new raw data block */
-
-            /* Check if the block asked for is too large for the "small data" block */
-            if(size >= file->def_sdata_block_size) {
-                /* Allocate more room for this new block the regular way */
-                if(HADDR_UNDEF==(new_data = H5FD_real_alloc(file, type, dxpl_id, size)))
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data block")
-
-                /*
-                 * Check if the new raw data is at the end of the current
-                 * "small data" block
-                 */
-                if(file->eosda + file->cur_sdata_block_size == new_data) {
-                    /*
-                     * Treat the allocation request as if the current
-                     * "small data" block grew by the amount allocated
-                     * and just update the eosda address. Don't bother
-                     * updating the cur_sdata_block_size since it will
-                     * just grow and shrink by the same amount.
-                     */
-                    ret_value = file->eosda;
-                    file->eosda += size;
-                } else {
-                    /* Use the new "small data" block for the space allocated */
-                    ret_value = new_data;
-                }
-            } else {
-                /* Allocate another "small data" block */
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Allocating 'small data' block\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                if(HADDR_UNDEF==(new_data = H5FD_real_alloc(file, type, dxpl_id,
-                                           file->def_sdata_block_size)))
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data block")
-
-                /*
-                 * Check if the new raw data is at the end of the current
-                 * "small data" block
-                 */
-                if(file->eosda + file->cur_sdata_block_size == new_data) {
-                    file->cur_sdata_block_size += file->def_sdata_block_size;
-                } else {
-                    /*
-                     * Return the unused portion of the "small data"
-                     * block to a free list
-                     */
-                    if(file->eosda != 0)
-                        if(H5FD_free(file, H5FD_MEM_DRAW, dxpl_id, file->eosda,
-                                      file->cur_sdata_block_size) < 0)
-                            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free 'small data' block")
-
-                    /*
-                     * Point the "small data" block at the newly
-                     * allocated block
-                     */
-                    file->eosda = new_data;
-                    file->cur_sdata_block_size = file->def_sdata_block_size;
-                }
-
-                /* Allocate space out of the "small data" block */
-                ret_value = file->eosda;
-                file->cur_sdata_block_size -= size;
-                file->eosda += size;
-            }
-        } else {
-            /* Allocate space out of the "small data" block */
-            ret_value = file->eosda;
-            file->cur_sdata_block_size -= size;
-            file->eosda += size;
-        }
-    } else {
-        /* Allocate data the regular way */
-        if(HADDR_UNDEF==(ret_value = H5FD_real_alloc(file, type, dxpl_id, size)))
-            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data block")
-    }
-
-done:
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
-#endif /* H5FD_ALLOC_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_alloc_raw() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FD_real_alloc
- *
- * Purpose:	Double private version of H5FDalloc() :-)
- *
- * Return:	Success:	The format address of the new file memory.
- *
- *		Failure:	The undefined address HADDR_UNDEF
- *
- * Programmer:	Quincey Koziol
- *              Friday, August 25, 2000
- *
- * Modifications:
- *	Albert Cheng, 2001/05/01
- *	Implement the allocation by alignment/threshold.
- *
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
-{
-    haddr_t ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FD_real_alloc)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* check args */
-    assert(file);
-    assert(file->cls);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-    /*
-     * Dispatch to driver `alloc' callback or extend the end-of-address
-     * marker
-     */
-    if(file->cls->alloc) {
-        if((ret_value = (file->cls->alloc)(file, type, dxpl_id, size)) == HADDR_UNDEF)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver allocation request failed")
-    } else {
-        if((ret_value = H5FD_update_eoa(file, type, dxpl_id, size)) == HADDR_UNDEF)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver eoa update request failed")
-    }
-
-done:
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
-#endif /* H5FD_ALLOC_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_real_alloc() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_update_eoa
- * Purpose:     Update the EOA field of the file's memory.
- *
- *              This was split off from the H5FD_real_alloc function to
- *              make life easier for all.
- * Return:      Success:    The format address of the new file memory.
- *              Failure:    The undefined address HADDR_UNDEF
- * Programmer:  Bill Wendling
- *              Wednesday, 04. December, 2002
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
-{
-    haddr_t eoa, oldeoa = 0;
-    hsize_t wasted;
-    haddr_t ret_value = HADDR_UNDEF;
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FD_update_eoa)
-
-    /* check args */
-    assert(file);
-    assert(file->cls);
-    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    assert(size > 0);
-
-    eoa = file->cls->get_eoa(file, type);
-
-#ifdef H5F_DEBUG
-    if(file->alignment * file->threshold != 1 && H5DEBUG(F))
-        HDfprintf(H5DEBUG(F),
-                  "%s: alignment=%Hd, threshold=%Hd, size=%Hd, Begin eoa=%a\n",
-                  FUNC, file->alignment, file->threshold, size, eoa);
-#endif  /* H5F_DEBUG */
-
-    /* Wasted is 0 if not exceeding threshold or eoa happens to be aligned */
-    wasted = (size >= file->threshold) ? (eoa % file->alignment) : 0;
-    if(wasted) {
-        wasted = file->alignment - wasted;      /* actual waste                 */
-        oldeoa = eoa;                           /* save it for later freeing    */
-
-        /* Advance eoa to the next alignment by allocating the wasted */
-        if(H5F_addr_overflow(eoa, size) || (eoa + wasted) > file->maxaddr)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
-
-        eoa += wasted;
-
-        if(file->cls->set_eoa(file, type, eoa) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
-    } /* end if */
-
-    /* allocate the aligned memory */
-    if(H5F_addr_overflow(eoa, size) || eoa + size > file->maxaddr)
-        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
-
-    ret_value = eoa;
-    eoa += size;
-
-    if(file->cls->set_eoa(file, type, eoa) < 0)
-        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
-
-    /* Free the wasted memory */
-    if(wasted) {
-        if(H5FD_free(file, type, dxpl_id, oldeoa, wasted) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
-    } /* end if */
-
-#ifdef H5F_DEBUG
-    if(file->alignment * file->threshold != 1 && H5DEBUG(F))
-        HDfprintf(H5DEBUG(F),
-                  "%s: ret_value=%a, wasted=%Hd, Ended eoa=%a\n",
-                  FUNC, ret_value, wasted, eoa);
-#endif  /* H5F_DEBUG */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_update_eoa() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FDfree
  *
  * Purpose:	Frees format addresses starting with ADDR and continuing for
@@ -2243,305 +1506,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_free
- *
- * Purpose:     Private version of H5FDfree()
- *
- * Return:      Success:        Non-negative
- *
- *              Failure:        Negative
- *
- * Programmer:  Robb Matzke
- *              Wednesday, August  4, 1999
- *
- * Modifications:
- *          Bill Wendling, February 20, 2003
- *          Added support for Flexible PHDF5. If the process is the
- *          Set-Aside-Process, then we execute this function. Clients
- *          don't.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FD_free(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
-{
-    H5FD_mem_t		mapped_type;
-    herr_t      ret_value = SUCCEED;       /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FD_free, FAIL)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* Check args */
-    HDassert(file);
-    HDassert(file->cls);
-    HDassert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-
-    if(!H5F_addr_defined(addr) || addr > file->maxaddr ||
-            H5F_addr_overflow(addr, size) || (addr + size) > file->maxaddr)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid region")
-
-    /* Allow 0-sized free's to occur without penalty */
-    if(0 == size)
-        HGOTO_DONE(SUCCEED)
-
-    /* Map request type to free list */
-    if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
-        mapped_type = type;
-    else
-        mapped_type = file->cls->fl_map[type];
-
-    /*
-     * If the request maps to a free list then add memory to the free list
-     * without ever telling the driver that it was freed.  Otherwise let the
-     * driver deallocate the memory.
-     */
-    if(mapped_type >= H5FD_MEM_DEFAULT) {
-        H5FD_free_t *last;          /* Last merged node */
-        H5FD_free_t *last_prev = NULL;/* Pointer to node before merged node */
-        H5FD_free_t *curr;          /* Current free block being inspected */
-        H5FD_free_t *prev;          /* Previous free block being inspected */
-
-        /* Adjust the metadata accumulator to remove the freed block, if it overlaps */
-        if((file->feature_flags&H5FD_FEAT_ACCUMULATE_METADATA)
-                && H5F_addr_overlap(addr, size, file->accum_loc, file->accum_size)) {
-            size_t overlap_size;        /* Size of overlap with accumulator */
-
-            /* Check for overlapping the beginning of the accumulator */
-            if(H5F_addr_le(addr, file->accum_loc)) {
-                /* Check for completely overlapping the accumulator */
-                if(H5F_addr_ge(addr + size, file->accum_loc + file->accum_size)) {
-                    /* Reset the entire accumulator */
-                    file->accum_loc=HADDR_UNDEF;
-                    file->accum_size=FALSE;
-                    file->accum_dirty=FALSE;
-                } /* end if */
-                /* Block to free must end within the accumulator */
-                else {
-                    size_t new_accum_size;      /* Size of new accumulator buffer */
-
-                    /* Calculate the size of the overlap with the accumulator, etc. */
-                    H5_ASSIGN_OVERFLOW(overlap_size,(addr+size)-file->accum_loc,haddr_t,size_t);
-                    new_accum_size=file->accum_size-overlap_size;
-
-                    /* Move the accumulator buffer information to eliminate the freed block */
-                    HDmemmove(file->meta_accum,file->meta_accum+overlap_size,new_accum_size);
-
-                    /* Adjust the accumulator information */
-                    file->accum_loc+=overlap_size;
-                    file->accum_size=new_accum_size;
-                } /* end else */
-            } /* end if */
-            /* Block to free must start within the accumulator */
-            else {
-                /* Calculate the size of the overlap with the accumulator */
-                H5_ASSIGN_OVERFLOW(overlap_size,(file->accum_loc+file->accum_size)-addr,haddr_t,size_t);
-
-                /* Block to free is in the middle of the accumulator */
-                if(H5F_addr_lt((addr + size), file->accum_loc + file->accum_size)) {
-                    haddr_t tail_addr;
-                    size_t tail_size;
-
-                    /* Calculate the address & size of the tail to write */
-                    tail_addr=addr+size;
-                    H5_ASSIGN_OVERFLOW(tail_size,(file->accum_loc+file->accum_size)-tail_addr,haddr_t,size_t);
-
-                    /* Write out the part of the accumulator after the block to free */
-                    /* (Use the driver's write call directly - to avoid looping back and writing to metadata accumulator) */
-                    if((file->cls->write)(file, H5FD_MEM_DEFAULT, dxpl_id, tail_addr, tail_size, file->meta_accum+(tail_addr-file->accum_loc)) < 0)
-                        HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "file write request failed")
-                } /* end if */
-
-                /* Adjust the accumulator information */
-                file->accum_size=file->accum_size-overlap_size;
-            } /* end else */
-        } /* end if */
-
-        /* Scan through the existing blocks for the mapped type to see if we can extend one */
-        curr = file->fl[mapped_type];
-        last = prev = NULL;
-        while(curr != NULL) {
-            /* Check if the block to free adjoins the start of the current block */
-            if((addr + size) == curr->addr) {
-                /* If we previously found & merged a node, eliminate it from the list & free it */
-                if(last != NULL) {
-                    /* Check if there was a previous block in the list */
-                    if(last_prev != NULL)
-                        /* Eliminate the merged block from the list */
-                        last_prev->next = last->next;
-                    /* No previous block, this must be the head of the list */
-                    else
-                        /* Eliminate the merged block from the list */
-                        file->fl[mapped_type] = last->next;
-
-                    /* Check for eliminating the block before the 'current' one */
-                    if(last == prev)
-                        prev = last_prev;
-
-                    /* Free the memory for the merged block */
-                    H5FL_FREE(H5FD_free_t, last);
-                } /* end if */
-
-                /* Adjust the address and size of the block found */
-                curr->addr = addr;
-                curr->size += size;
-
-                /* Adjust the information about to memory block to include the merged block */
-                addr = curr->addr;
-                size = curr->size;
-
-                /* Update the information about the merged node */
-                last = curr;
-                last_prev = prev;
-            } /* end if */
-            else {
-                /* Check if the block to free adjoins the end of the current block */
-                if((curr->addr + curr->size) == addr) {
-                    /* If we previously found & merged a node, eliminate it from the list & free it */
-                    if(last != NULL) {
-                        /* Check if there was a previous block in the list */
-                        if(last_prev != NULL)
-                            /* Eliminate the merged block from the list */
-                            last_prev->next = last->next;
-                        /* No previous block, this must be the head of the list */
-                        else
-                            /* Eliminate the merged block from the list */
-                            file->fl[mapped_type] = last->next;
-
-                        /* Check for eliminating the block before the 'current' one */
-                        if(last == prev)
-                            prev = last_prev;
-
-                        /* Free the memory for the merged block */
-                        H5FL_FREE(H5FD_free_t, last);
-                    } /* end if */
-
-                    /* Adjust the size of the block found */
-                    curr->size += size;
-
-                    /* Adjust the information about to memory block to include the merged block */
-                    addr = curr->addr;
-                    size = curr->size;
-
-                    /* Update the information about the merged node */
-                    last = curr;
-                    last_prev = prev;
-                } /* end if */
-            } /* end else */
-
-            /* Advance to next node in list */
-            prev = curr;
-            curr = curr->next;
-        } /* end while */
-
-        /* Check if we adjusted an existing block */
-        if(last != NULL) {
-            /* Move the node found to the front, if it wasn't already there */
-            if(last_prev != NULL) {
-                last_prev->next = last->next;
-                last->next = file->fl[mapped_type];
-                file->fl[mapped_type] = last;
-            } /* end if */
-        } /* end if */
-        else {
-            /* Allocate a new node to hold the free block's information */
-            if(NULL == (last = H5FL_MALLOC(H5FD_free_t)))
-                HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, FAIL, "can't allocate node for free space info")
-
-            last->addr = addr;
-            last->size = size;
-            last->next = file->fl[mapped_type];
-            file->fl[mapped_type] = last;
-        } /* end else */
-
-        /* Check if we increased the size of the largest block on the list */
-        file->maxsize = MAX(file->maxsize, last->size);
-
-        /* Check if this free block adjoins the "metadata aggregator" */
-        if(file->feature_flags & H5FD_FEAT_AGGREGATE_METADATA && file->eoma != 0) {
-            hbool_t adjoins = FALSE;    /* Whether the block adjoined the metadata aggregator */
-
-            /* Does the new block adjoin the end of the metadata aggregator */
-            if((file->eoma + file->cur_meta_block_size) == last->addr) {
-                last->addr = file->eoma;
-                adjoins = TRUE;
-            } /* end if */
-            /* Does the new block adjoin the beginning of the metadata aggregator */
-            else if((last->addr + last->size) == file->eoma)
-                adjoins = TRUE;
-
-            /* Reset metadata aggregator information, if adjoined */
-            if(adjoins) {
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Adjoined metadata aggregator\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                last->size += file->cur_meta_block_size;
-                file->eoma = 0;
-                file->cur_meta_block_size = 0;
-            } /* end if */
-        } /* end if */
-
-        /* Check if this free block adjoins the "small data aggregator" */
-        if(file->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA && file->eosda != 0) {
-            hbool_t adjoins = FALSE;    /* Whether the block adjoined the small-data aggregator */
-
-            /* Does the new block adjoin the end of the small-data aggregator */
-            if((file->eosda + file->cur_sdata_block_size) == last->addr) {
-                last->addr = file->eosda;
-                adjoins = TRUE;
-            } /* end if */
-            /* Does the new block adjoin the beginning of the small-data aggregator */
-            else if((last->addr + last->size) == file->eosda)
-                adjoins = TRUE;
-
-            /* Reset small-data aggregator information, if adjoined */
-            if(adjoins) {
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Adjoined small data aggregator\n", FUNC);
-#endif /* H5FD_ALLOC_DEBUG */
-                last->size += file->cur_sdata_block_size;
-                file->eosda = 0;
-                file->cur_sdata_block_size = 0;
-            } /* end if */
-        } /* end if */
-
-        /* Check if this free block is at the end of file allocated space.
-         * Truncate it if this is true. */
-        if(file->cls->get_eoa) {
-            haddr_t     eoa;
-
-            eoa = file->cls->get_eoa(file, type);
-            if(eoa == (last->addr + last->size)) {
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: Reducing file size to = %a\n", FUNC, last->addr);
-#endif /* H5FD_ALLOC_DEBUG */
-                if(file->cls->set_eoa(file, type, last->addr) < 0)
-                    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "set end of space allocation request failed")
-
-                /* Remove this free block from the list */
-                file->fl[mapped_type] = last->next;
-                if(file->maxsize == last->size)
-                    file->maxsize = 0; /*unknown*/
-                H5FL_FREE(H5FD_free_t, last);
-            } /* end if */
-        } /* end if */
-    } else if(file->cls->free) {
-        if((file->cls->free)(file, type, dxpl_id, addr, size) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver free request failed")
-    } else {
-        /* leak memory */
-#ifdef H5F_DEBUG
-HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
-#endif /* H5F_DEBUG */
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_free() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FDrealloc
  *
  * Purpose:	Changes the size of an allocated chunk of memory, possibly
@@ -2584,318 +1548,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_realloc
- *
- * Purpose:	Private version of H5FDrealloc()
- *
- * Return:	Success:	New address of the block of memory, not
- *				necessarily the same as the original address.
- *
- *		Failure:	HADDR_UNDEF
- *
- * Programmer:	Robb Matzke
- *              Wednesday, August  4, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-haddr_t
-H5FD_realloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsize_t old_size,
-	     hsize_t new_size)
-{
-    haddr_t	new_addr=old_addr;
-    uint8_t	_buf[8192];
-    uint8_t	*buf=_buf;
-    haddr_t      ret_value;       /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FD_realloc, HADDR_UNDEF)
-
-    if(new_size == old_size) {
-        /*nothing to do*/
-    } else if(0 == old_size) {
-        /* allocate memory */
-        HDassert(!H5F_addr_defined(old_addr));
-        if(HADDR_UNDEF == (new_addr = H5FD_alloc(file, type, dxpl_id, new_size)))
-            HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
-    } else if(0==new_size) {
-        /* free memory */
-        HDassert(H5F_addr_defined(old_addr));
-        if(H5FD_free(file, type, dxpl_id, old_addr, old_size) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
-        new_addr = HADDR_UNDEF;
-    } else if(new_sizesizeof(size_t) and the
-         * object on disk is too large to read into a memory buffer all at one
-         * time.  This chunk of code would have to be re-written using a loop
-         * to move pieces of the realloced data through a fixed size buffer, etc.
-         * -QAK, 6/20/01
-         */
-        if(HADDR_UNDEF == (new_addr = H5FD_alloc(file, type, dxpl_id, new_size)))
-            HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
-        H5_CHECK_OVERFLOW(old_size,hsize_t,size_t);
-        if(old_size > sizeof(_buf) && NULL == (buf = H5MM_malloc((size_t)old_size))) {
-            (void)H5FD_free(file, type, dxpl_id, new_addr, new_size);
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
-        } /* end if */
-        if(H5FD_read(file, type, dxpl_id, old_addr, (size_t)old_size, buf) < 0 ||
-                H5FD_write(file, type, dxpl_id, new_addr, (size_t)old_size, buf) < 0) {
-            (void)H5FD_free(file, type, dxpl_id, new_addr, new_size);
-            if(buf != _buf)
-                H5MM_xfree(buf);
-            HGOTO_ERROR(H5E_FILE, H5E_READERROR, HADDR_UNDEF, "unable to move file block")
-        } /* end if */
-
-        if(buf != _buf)
-            H5MM_xfree(buf);
-        if(H5FD_free(file, type, dxpl_id, old_addr, old_size) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
-    } /* end else */
-
-    /* Set return value */
-    ret_value = new_addr;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_realloc() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FD_can_extend
- *
- * Purpose:	Check if a block in the file can be extended.
- *
- * Return:	Success:	TRUE(1)/FALSE(0)
- *
- * 		Failure:	FAIL
- *
- * Programmer:	Quincey Koziol
- *              Friday, June 11, 2004
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-htri_t
-H5FD_can_extend(const H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
-{
-    haddr_t     eoa;                    /* End of address space in the file */
-    htri_t      ret_value=FALSE;        /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FD_can_extend, FAIL)
-
-    /* Retrieve the end of the address space */
-    if(HADDR_UNDEF==(eoa=H5FD_get_eoa(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
-
-    /* Check if the block is exactly at the end of the file */
-    if((addr+size)==eoa)
-        HGOTO_DONE(TRUE)
-    else {
-        H5FD_free_t *curr;          /* Current free block being inspected */
-        H5FD_mem_t mapped_type;     /* Memory type, after mapping */
-        haddr_t end;                /* End of block in file */
-
-        /* Map request type to free list */
-        if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
-            mapped_type = type;
-        else
-            mapped_type = file->cls->fl_map[type];
-
-        /* Check if block is inside the metadata or small data accumulator */
-        if(mapped_type!=H5FD_MEM_DRAW) {
-            if(file->feature_flags & H5FD_FEAT_AGGREGATE_METADATA) {
-                /* If the metadata block is at the end of the file, and
-                 * the block to test adjoins the beginning of the metadata
-                 * block, then it's extendable
-                 */
-                if(file->eoma + file->cur_meta_block_size == eoa &&
-                        (addr+size)==file->eoma)
-                    HGOTO_DONE(TRUE)
-            } /* end if */
-        } /* end if */
-        else {
-            if(file->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA) {
-                /* If the small data block is at the end of the file, and
-                 * the block to test adjoins the beginning of the small data
-                 * block, then it's extendable
-                 */
-                if(file->eosda + file->cur_sdata_block_size == eoa &&
-                        (addr+size)==file->eosda)
-                    HGOTO_DONE(TRUE)
-            } /* end if */
-        } /* end else */
-
-        /* Scan through the existing blocks for the mapped type to see if we can extend one */
-        if(mapped_type >= H5FD_MEM_DEFAULT) {
-            curr = file->fl[mapped_type];
-            end = addr + size;
-            while(curr != NULL) {
-                if(end == curr->addr) {
-                    if(extra_requested <= curr->size)
-                        HGOTO_DONE(TRUE)
-                    else
-                        HGOTO_DONE(FALSE)
-                } /* end if */
-
-                /* Advance to next node in list */
-                curr=curr->next;
-            } /* end while */
-        } /* end if */
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_can_extend() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FD_extend
- *
- * Purpose:	Extend a block in the file.
- *
- * Return:	Success:	Non-negative
- *
- * 		Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, June 12, 2004
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FD_extend(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
-{
-    haddr_t     eoa;                    /* End of address space in the file */
-    haddr_t     end;                    /* End of block in file */
-    hbool_t     update_eoma=FALSE;      /* Whether we need to update the eoma */
-    hbool_t     update_eosda=FALSE;     /* Whether we need to update the eosda */
-    hbool_t     at_end=FALSE;           /* Block is at end of file */
-    H5FD_mem_t  mapped_type;            /* Memory type, after mapping */
-    herr_t      ret_value=SUCCEED;      /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FD_extend, FAIL)
-#ifdef H5FD_ALLOC_DEBUG
-HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu, extra_requested = %Hu\n", FUNC, (unsigned)type, addr, size, extra_requested);
-#endif /* H5FD_ALLOC_DEBUG */
-
-    /* Retrieve the end of the address space */
-    if(HADDR_UNDEF==(eoa=H5FD_get_eoa(file, type)))
-	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
-
-    /* Map request type to free list */
-    if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
-        mapped_type = type;
-    else
-        mapped_type = file->cls->fl_map[type];
-
-    /* Compute end of block */
-    end = addr + size;
-
-    /* Check if the block is exactly at the end of the file */
-    if(end == eoa)
-        at_end = TRUE;
-    else {
-        /* (Check if block is inside the metadata or small data accumulator) */
-        if(mapped_type!=H5FD_MEM_DRAW) {
-            if(file->feature_flags & H5FD_FEAT_AGGREGATE_METADATA)
-                /* If the metadata block is at the end of the file, and
-                 * the block to test adjoins the beginning of the metadata
-                 * block, then it's extendable
-                 */
-                if((file->eoma + file->cur_meta_block_size) == eoa &&
-                        end == file->eoma)
-                    update_eoma=TRUE;
-        } /* end if */
-        else {
-            if(file->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA)
-                /* If the small data block is at the end of the file, and
-                 * the block to test adjoins the beginning of the small data
-                 * block, then it's extendable
-                 */
-                if((file->eosda + file->cur_sdata_block_size) == eoa &&
-                        end == file->eosda)
-                    update_eosda=TRUE;
-        } /* end else */
-    } /* end else */
-
-    /* Block is at end of file, we are extending the eoma or eosda */
-    if(update_eoma || update_eosda || at_end) {
-        /* Check for overflowing the file */
-        if(H5F_addr_overflow(eoa, extra_requested) || eoa + extra_requested > file->maxaddr)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "file allocation request failed")
-
-        /* Extend the file */
-        eoa += extra_requested;
-        if(file->cls->set_eoa(file, type, eoa) < 0)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "file allocation request failed")
-
-        /* Update the metadata and/or small data block */
-        assert(!(update_eoma && update_eosda));
-        if(update_eoma)
-            file->eoma+=extra_requested;
-        if(update_eosda)
-            file->eosda+=extra_requested;
-    } /* end if */
-    /* If the block we are extending isn't at the end of the file, find a free block to extend into */
-    else {
-        H5FD_free_t *curr;          /* Current free block being inspected */
-        H5FD_free_t *prev;          /* Current free block being inspected */
-
-        /* Walk through free list, looking for block to merge with */
-        curr = file->fl[mapped_type];
-        prev = NULL;
-        while(curr!=NULL) {
-            /* Found block that ajoins end of block to extend */
-            if(end == curr->addr) {
-                /* Check if free space is large enough */
-                if(extra_requested <= curr->size) {
-                    /* Check for exact match */
-                    if(extra_requested == curr->size) {
-                        /* Unlink node from free list */
-                        if(prev == NULL)
-                            file->fl[mapped_type] = curr->next;
-                        else
-                            prev->next = curr->next;
-
-                        /* Free the memory for the used block */
-                        H5FL_FREE(H5FD_free_t, curr);
-                    } /* end if */
-                    else {
-                        curr->addr += extra_requested;
-                        curr->size -= extra_requested;
-                    } /* end else */
-
-                    /* Leave now */
-                    break;
-                } /* end if */
-                else
-                    HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "can't extend block")
-            } /* end if */
-
-            /* Advance to next node in list */
-            prev = curr;
-            curr = curr->next;
-        } /* end while */
-
-        /* Couldn't find block to extend */
-        if(curr == NULL)
-            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "can't extend block")
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_extend() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FDget_eoa
  *
  * Purpose:	Returns the address of the first byte after the last
@@ -3154,6 +1806,36 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5FD_get_maxaddr
+ *
+ * Purpose:	Private version of H5FDget_eof()
+ *
+ * Return:	Success:	The maximum address allowed in the file.
+ *		Failure:	HADDR_UNDEF
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, January  3, 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+haddr_t
+H5FD_get_maxaddr(const H5FD_t *file)
+{
+    haddr_t ret_value;          /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_get_maxaddr, HADDR_UNDEF)
+
+    HDassert(file);
+
+    /* Set return value */
+    ret_value = file->maxaddr;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_get_maxaddr() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5FDread
  *
  * Purpose:	Reads SIZE bytes from FILE beginning at address ADDR
@@ -3795,22 +2477,20 @@ done:
  * Programmer:	Quincey Koziol 
  *		March 27, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5FD_get_fileno, FAIL)
 
-    assert(file);
-    assert(filenum);
+    HDassert(file);
+    HDassert(filenum);
 
     /* Retrieve the file's serial number */
-    HDmemcpy(filenum,&file->fileno,sizeof(file->fileno));
+    *filenum = file->fileno;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3883,103 +2563,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_vfd_handle() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_get_freespace
- *
- * Purpose:     Retrieve the amount of free space in a file.
- *
- * Return:      Success:        Amount of free space in file
- *              Failure:        Negative
- *
- * Programmer:  Quincey Koziol
- *              Monday, October  6, 2003
- *
- * Modifications:
- *              Raymond Lu
- *              5 January 2007
- *              Due to the complexity EOA for Multi driver, this function
- *              is made failed for now.
- * 
- *-------------------------------------------------------------------------
- */
-hssize_t
-H5FD_get_freespace(const H5FD_t *file)
-{
-    H5FD_free_t *free_node;     /* Pointer to node on free list */
-    H5FD_mem_t type;            /* Type of memory */
-    haddr_t ma_addr = HADDR_UNDEF;    /* Base "metadata aggregator" address */
-    hsize_t ma_size = 0;        /* Size of "metadata aggregator" */
-    haddr_t sda_addr = HADDR_UNDEF;    /* Base "small data aggregator" address */
-    hsize_t sda_size = 0;       /* Size of "small data aggregator" */
-    haddr_t eoa = 0;            /* End of allocated space in the file */
-    hssize_t ret_value = 0;     /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FD_get_freespace, FAIL)
-
-    /* check args */
-    HDassert(file);
-    HDassert(file->cls);
-
-    /* Multi driver doesn't support this function because of the complexity.
-     * It doesn't have eoa for the whole file. */
-    if(file->driver_id == H5FD_MULTI)
-        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "Multi driver doesn't support this function")
-    
-    /* Retrieve the 'eoa' for the file */
-    eoa = file->cls->get_eoa(file, H5FD_MEM_DEFAULT);
-
-    /* Check for aggregating metadata allocations */
-    if(file->feature_flags & H5FD_FEAT_AGGREGATE_METADATA) {
-        ma_addr = file->eoma;
-        ma_size = file->cur_meta_block_size;
-    } /* end if */
-
-    /* Check for aggregating small data allocations */
-    if(file->feature_flags & H5FD_FEAT_AGGREGATE_SMALLDATA) {
-        sda_addr = file->eosda;
-        sda_size = file->cur_sdata_block_size;
-    } /* end if */
-
-    /* Iterate over all the types of memory, to retrieve amount of free space for each */
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,type)) {
-        /* Iterate through the free list, accumulating the amount of free space for this type */
-        free_node = file->fl[type];
-        while(free_node) {
-            /* Check for current node adjoining the metadata & small data aggregators */
-            if(H5F_addr_eq(free_node->addr + free_node->size, ma_addr)) {
-                ma_addr -= free_node->size;
-                ma_size += free_node->size;
-            } else if(H5F_addr_eq(free_node->addr + free_node->size, sda_addr)) {
-                sda_addr -= free_node->size;
-                sda_size += free_node->size;
-            } else if(H5F_addr_eq(ma_addr + ma_size, free_node->addr))
-                ma_size += free_node->size;
-            else if(H5F_addr_eq(sda_addr + sda_size, free_node->addr))
-                sda_size += free_node->size;
-            else
-                ret_value += (hssize_t)free_node->size;
-            free_node = free_node->next;
-        } /* end while */
-    } /* end for */
-
-    /* Check for aggregating metadata allocations */
-    if(H5F_addr_defined(ma_addr)) {
-        /* Add in the reserved space for metadata to the available free space */
-        /* (if it's not at the tail of the file) */
-        if(H5F_addr_ne(ma_addr + ma_size, eoa))
-            ret_value += ma_size;
-    } /* end if */
-
-    /* Check for aggregating small data allocations */
-    if(H5F_addr_defined(sda_addr)) {
-        /* Add in the reserved space for metadata to the available free space */
-        /* (if it's not at the tail of the file) */
-        if(H5F_addr_ne(sda_addr + sda_size, eoa))
-            ret_value += sda_size;
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_get_freespace() */
-
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 3109e09..df07c0a 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -234,7 +234,11 @@ static const H5FD_class_t H5FD_log_g = {
     H5FD_log_flush,				/*flush			*/
     NULL,                                       /*lock                  */
     NULL,                                       /*unlock                */
+#ifdef OLD_WAY
     H5FD_FLMAP_NOLIST 				/*fl_map		*/
+#else /* OLD_WAY */
+    H5FD_FLMAP_SINGLE 				/*fl_map		*/
+#endif /* OLD_WAY */
 };
 
 
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 5d5f092..c8087bb 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -322,13 +322,13 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
     FUNC_ENTER_API(H5Pset_fapl_mpio, FAIL)
     H5TRACE3("e", "iMcMi", fapl_id, comm, info);
 
-    if(fapl_id==H5P_DEFAULT)
+    if(fapl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if (MPI_COMM_NULL == comm)
+    if(MPI_COMM_NULL == comm)
 	HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator")
 
     /* Initialize driver specific properties */
@@ -393,11 +393,11 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
     FUNC_ENTER_API(H5Pget_fapl_mpio, FAIL)
     H5TRACE3("e", "ixx", fapl_id, comm, info);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if (H5FD_MPIO!=H5P_get_driver(plist))
+    if(H5FD_MPIO != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    if (NULL==(fa=H5P_get_driver_info(plist)))
+    if(NULL == (fa = (H5FD_mpio_fapl_t *)H5P_get_driver_info(plist)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
 
     /* Store the duplicated communicator in a temporary variable for error */
@@ -471,9 +471,9 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
-    if (H5FD_MPIO_INDEPENDENT!=xfer_mode && H5FD_MPIO_COLLECTIVE!=xfer_mode)
+    if(H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "incorrect xfer_mode")
 
     /* Set the transfer mode */
@@ -517,9 +517,9 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
     FUNC_ENTER_API(H5Pget_dxpl_mpio, FAIL)
     H5TRACE2("e", "ix", dxpl_id, xfer_mode);
 
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
-    if (H5FD_MPIO!=H5P_get_driver(plist))
+    if(H5FD_MPIO != H5P_get_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
 
     /* Get the transfer mode */
@@ -563,13 +563,12 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
 
     FUNC_ENTER_API(H5Pset_dxpl_mpio_collective_opt, FAIL)
     H5TRACE2("e", "iDc", dxpl_id, opt_mode);
-/*    H5TRACE2("e","iDt",dxpl_id,xfer_mode);*/
 
-    if(dxpl_id==H5P_DEFAULT)
+    if(dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
@@ -616,13 +615,12 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
 
     FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt, FAIL)
     H5TRACE2("e", "iDh", dxpl_id, opt_mode);
-/*    H5TRACE2("e","iDt",dxpl_id,xfer_mode);*/
 
-    if(dxpl_id==H5P_DEFAULT)
+    if(dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
@@ -666,11 +664,11 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
     FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_num, FAIL)
     H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
 
-    if(dxpl_id==H5P_DEFAULT)
+    if(dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
@@ -713,11 +711,11 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch
     FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_ratio, FAIL)
     H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
 
-    if(dxpl_id==H5P_DEFAULT)
+    if(dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
@@ -761,19 +759,18 @@ H5FD_mpio_fapl_get(H5FD_t *_file)
 
     FUNC_ENTER_NOAPI(H5FD_mpio_fapl_get, NULL)
 
-    assert(file);
-    assert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(file);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
-    if (NULL==(fa=H5MM_calloc(sizeof(H5FD_mpio_fapl_t))))
+    if(NULL == (fa = (H5FD_mpio_fapl_t *)H5MM_calloc(sizeof(H5FD_mpio_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Duplicate communicator and Info object. */
-    if (FAIL==H5FD_mpi_comm_info_dup(file->comm, file->info,
-					&fa->comm, &fa->info))
+    if(FAIL == H5FD_mpi_comm_info_dup(file->comm, file->info, &fa->comm, &fa->info))
 	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
 
     /* Set return value */
-    ret_value=fa;
+    ret_value = fa;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -809,15 +806,14 @@ if (H5FD_mpio_Debug[(int)'t'])
 fprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
 #endif
 
-    if (NULL==(new_fa=H5MM_malloc(sizeof(H5FD_mpio_fapl_t))))
+    if(NULL == (new_fa = (H5FD_mpio_fapl_t *)H5MM_malloc(sizeof(H5FD_mpio_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the general information */
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_mpio_fapl_t));
 
     /* Duplicate communicator and Info object. */
-    if (FAIL==H5FD_mpi_comm_info_dup(old_fa->comm, old_fa->info,
-					&new_fa->comm, &new_fa->info))
+    if(FAIL == H5FD_mpi_comm_info_dup(old_fa->comm, old_fa->info, &new_fa->comm, &new_fa->info))
 	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
     ret_value = new_fa;
 
@@ -956,14 +952,14 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
 #endif
 
     /* Obtain a pointer to mpio-specific file access properties */
-    if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
+    if(NULL == (plist = (H5P_genplist_t *)H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
-    if (H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_MPIO!=H5P_get_driver(plist)) {
+    if(H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_get_driver(plist)) {
 	_fa.comm = MPI_COMM_SELF; /*default*/
 	_fa.info = MPI_INFO_NULL; /*default*/
 	fa = &_fa;
     } else {
-	fa = H5P_get_driver_info(plist);
+	fa = (const H5FD_mpio_fapl_t *)H5P_get_driver_info(plist);
 	assert(fa);
     }
 
@@ -998,7 +994,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
 #endif
 
     /*OKAY: CAST DISCARDS CONST*/
-    if (MPI_SUCCESS != (mpi_code=MPI_File_open(comm_dup, (char*)name, mpi_amode, info_dup, &fh)))
+    if(MPI_SUCCESS != (mpi_code = MPI_File_open(comm_dup, (char*)name, mpi_amode, info_dup, &fh)))
         HMPI_GOTO_ERROR(NULL, "MPI_File_open failed", mpi_code)
     file_opened=1;
 
@@ -1009,7 +1005,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
         HMPI_GOTO_ERROR(NULL, "MPI_Comm_size failed", mpi_code)
 
     /* Build the return value and initialize it */
-    if (NULL==(file=H5MM_calloc(sizeof(H5FD_mpio_t))))
+    if(NULL == (file = (H5FD_mpio_t *)H5MM_calloc(sizeof(H5FD_mpio_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     file->f = fh;
     file->comm = comm_dup;
@@ -1034,7 +1030,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     } /* end if */
 
     /* Broadcast file size */
-    if (MPI_SUCCESS != (mpi_code=MPI_Bcast(&size, sizeof(MPI_Offset), MPI_BYTE, 0, comm_dup)))
+    if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, comm_dup)))
         HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
 
     /* Determine if the file should be truncated */
@@ -1454,9 +1450,9 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
         H5FD_mpio_xfer_t            xfer_mode;   /* I/O tranfer mode */
 
         /* Obtain the data transfer properties */
-        if(NULL == (plist = H5I_object(dxpl_id)))
+        if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-        xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+        xfer_mode = (H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
 
         /*
          * Set up for a fancy xfer using complex types, or single byte block. We
@@ -1499,10 +1495,10 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
 	    fprintf(stdout, "H5FD_mpio_read: using MPIO collective mode\n");
 #endif
         /* Peek the collective_opt property to check whether the application wants to do IO individually. */
-        coll_opt_mode=(H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
+        coll_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
 
        /* Peek the xfer_opt_mode property to check whether the application wants to do IO individually. */
-        xfer_opt_mode=(H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_IO_XFER_OPT_MODE_NAME);
+        xfer_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_OPT_MODE_NAME);
      
         if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO && xfer_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
@@ -1528,10 +1524,10 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
          * Reset the file view when we used MPI derived types
          */
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-        if (MPI_SUCCESS != (mpi_code=MPI_File_set_view(file->f, 0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
+        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
     } else {
-        if (MPI_SUCCESS!= (mpi_code=MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+        if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
     }
 
@@ -1738,7 +1734,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
 #endif
 
     /* Obtain the data transfer properties */
-    if(NULL == (plist = H5I_object(dxpl_id)))
+    if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     if(type==H5FD_MEM_DRAW) {
@@ -1830,15 +1826,12 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
             fprintf(stdout, "H5FD_mpio_write: using MPIO collective mode\n");
 #endif
         /* Peek the collective_opt property to check whether the application wants to do IO individually. */
-        coll_opt_mode=(H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
+        coll_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_COLLECTIVE_OPT_NAME);
 
          /* Peek the xfer_opt_mode property to check whether the application wants to do IO individually. */
-        xfer_opt_mode=(H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_IO_XFER_OPT_MODE_NAME);
-
-        
+        xfer_opt_mode = (H5FD_mpio_collective_opt_t)H5P_peek_unsigned(plist,H5D_XFER_IO_XFER_OPT_MODE_NAME);
 
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-
         if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO && xfer_opt_mode == H5FD_MPIO_COLLECTIVE_IO ) {
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_Debug[(int)'t'])
@@ -1865,11 +1858,11 @@ if (MPI_SUCCESS != (mpi_code=MPI_File_write_at_all(file->f, mpi_off, (void*)buf,
          * Reset the file view when we used MPI derived types
          */
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-        if (MPI_SUCCESS != (mpi_code=MPI_File_set_view(file->f, 0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
+        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
     } else {
         /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-        if (MPI_SUCCESS != (mpi_code=MPI_File_write_at(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
+        if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, (void*)buf, size_i, buf_type, &mpi_stat)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
     }
 
@@ -1908,8 +1901,8 @@ done:
     /* if only one process writes, need to broadcast the ret_value to 
      * other processes 
      */
-    if (type!=H5FD_MEM_DRAW) {
-	if (MPI_SUCCESS != (mpi_code=MPI_Bcast(&ret_value, sizeof(ret_value), MPI_BYTE, H5_PAR_META_WRITE, file->comm)))
+    if(type != H5FD_MEM_DRAW) {
+	if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&ret_value, (int)sizeof(ret_value), MPI_BYTE, H5_PAR_META_WRITE, file->comm)))
 	    HMPI_DONE_ERROR(FAIL, "MPI_Bcast failed", mpi_code)
     } /* end if */
 #endif /* JRM */
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
new file mode 100644
index 0000000..700ec1d
--- /dev/null
+++ b/src/H5FDpkg.h
@@ -0,0 +1,67 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Programmer:	Quincey Koziol 
+ *		Thursday, January  3, 2008
+ *
+ * Purpose:	This file contains declarations which are visible only within
+ *		the H5FD package.  Source files outside the H5FD package should
+ *		include H5FDprivate.h instead.
+ */
+#ifndef H5FD_PACKAGE
+#error "Do not include this file outside the H5FD package!"
+#endif
+
+#ifndef _H5FDpkg_H
+#define _H5FDpkg_H
+
+/* Get package's private header */
+#include "H5FDprivate.h"	/* File drivers				*/
+
+/* Other private headers needed by this file */
+#include "H5FLprivate.h"	/* Free lists                           */
+
+/**************************/
+/* Package Private Macros */
+/**************************/
+
+
+/****************************/
+/* Package Private Typedefs */
+/****************************/
+
+
+/*****************************/
+/* Package Private Variables */
+/*****************************/
+
+/* Declare a PQ free list to manage the metadata accumulator buffer */
+H5FL_BLK_EXTERN(meta_accum);
+
+
+/******************************/
+/* Package Private Prototypes */
+/******************************/
+H5_DLL herr_t H5FD_init(void);
+H5_DLL herr_t H5FD_free_freelist(H5FD_t *file);
+
+
+/* Testing routines */
+#ifdef H5FD_TESTING
+#endif /* H5FD_TESTING */
+
+#endif /* _H5FDpkg_H */
+
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 202b7d1..4c8c28e 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -62,6 +62,7 @@ H5_DLL haddr_t H5FD_realloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_
 H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type);
 H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr);
 H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file);
+H5_DLL haddr_t H5FD_get_maxaddr(const H5FD_t *file);
 H5_DLL herr_t H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
 		 void *buf/*out*/);
 H5_DLL herr_t H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
@@ -74,5 +75,7 @@ H5_DLL htri_t H5FD_can_extend(const H5FD_t *file, H5FD_mem_t type, haddr_t addr,
     hsize_t size, hsize_t extra_requested);
 H5_DLL herr_t H5FD_extend(H5FD_t *file, H5FD_mem_t type, haddr_t addr,
     hsize_t size, hsize_t extra_requested);
+H5_DLL herr_t H5FD_aggr_reset(H5FD_t *file, H5FD_blk_aggr_t *aggr, hid_t dxpl_id);
 
 #endif /* !_H5FDprivate_H */
+
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index b68f141..839c8a3 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -229,6 +229,15 @@ typedef struct H5FD_free_t {
     struct H5FD_free_t	*next;
 } H5FD_free_t;
 
+/* Structure for metadata & "small [raw] data" block aggregation fields */
+typedef struct H5FD_blk_aggr_t {
+    unsigned long       feature_flag;   /* Feature flag type */
+    hsize_t             alloc_size;     /* Size for allocating new blocks */
+    hsize_t             tot_size;       /* Total amount of bytes aggregated into block */
+    hsize_t             size;           /* Current size of block left */
+    haddr_t             addr;           /* Location of block left */
+} H5FD_blk_aggr_t;
+
 /*
  * The main datatype for each driver. Public fields common to all drivers
  * are declared here and the driver appends private fields in memory.
@@ -241,27 +250,11 @@ struct H5FD_t {
     hsize_t             threshold;      /* Threshold for alignment  */
     hsize_t             alignment;      /* Allocation alignment     */
 
-    /* Metadata aggregation fields */
-    hsize_t             def_meta_block_size;  /* Metadata allocation
-                                               * block size (if
-                                               * aggregating metadata) */
-    hsize_t             cur_meta_block_size;  /* Current size of metadata
-                                               * allocation region left */
-    haddr_t             eoma;                 /* End of metadata
-                                               * allocated region */
-                                              /* (ie. beginning of space available) */
-
-    /* "Small data" aggregation fields */
-    hsize_t             def_sdata_block_size; /* "Small data"
-                                               * allocation block size
-                                               * (if aggregating "small
-                                               * data") */
-    hsize_t             cur_sdata_block_size; /* Current size of "small
-                                               * data" allocation
-                                               * region left */
-    haddr_t             eosda;                /* End of "small data"
-                                               * allocated region */
-                                              /* (ie. beginning of space available) */
+    /* Block aggregation info */
+    H5FD_blk_aggr_t     meta_aggr;      /* Metadata aggregation info */
+                                        /* (if aggregating metadata allocations) */
+    H5FD_blk_aggr_t     sdata_aggr;     /* "Small data" aggregation info */
+                                        /* (if aggregating "small data" allocations) */
 
     /* Metadata accumulator fields */
     unsigned char      *meta_accum;     /* Buffer to hold the accumulated metadata */
@@ -311,3 +304,4 @@ H5_DLL herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing);
 }
 #endif
 #endif
+
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
new file mode 100644
index 0000000..7bd72cc
--- /dev/null
+++ b/src/H5FDspace.c
@@ -0,0 +1,1738 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*-------------------------------------------------------------------------
+ *
+ * Created:		H5FDspace.c
+ *			Jan  3 2008
+ *			Quincey Koziol 
+ *
+ * Purpose:		Space allocation routines for the file.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/****************/
+/* Module Setup */
+/****************/
+
+#define H5FD_PACKAGE		/*suppress error about including H5FDpkg  */
+
+/* Interface initialization */
+#define H5_INTERFACE_INIT_FUNC	H5FD_space_init_interface
+
+
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Fprivate.h"         /* File access				*/
+#include "H5FDpkg.h"		/* File Drivers				*/
+#include "H5FDmulti.h"		/* Usage-partitioned file family	*/
+#include "H5MMprivate.h"	/* Memory management			*/
+
+
+/****************/
+/* Local Macros */
+/****************/
+
+/* Define this to display information about file allocations */
+/* #define H5FD_ALLOC_DEBUG */
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+static haddr_t H5FD_alloc_from_free_list(H5FD_t *file, H5FD_mem_t type,
+    hsize_t size);
+static haddr_t H5FD_aggr_alloc(H5FD_t *file, H5FD_blk_aggr_t *aggr,
+    H5FD_blk_aggr_t *other_aggr, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
+static herr_t H5FD_aggr_adjoin(const H5FD_t *file, H5FD_blk_aggr_t *aggr,
+    H5FD_free_t *last);
+static htri_t H5FD_aggr_can_extend(const H5FD_t *file, const H5FD_blk_aggr_t *aggr,
+    haddr_t eoa, haddr_t end);
+static herr_t H5FD_aggr_shift(H5FD_blk_aggr_t *aggr, hsize_t extra);
+static herr_t H5FD_aggr_query(const H5FD_t *file, const H5FD_blk_aggr_t *aggr,
+    haddr_t *addr, hsize_t *size);
+static haddr_t H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
+static haddr_t H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+/* Declare a free list to manage the H5FD_free_t struct */
+H5FL_DEFINE(H5FD_free_t);
+
+/* Declare a PQ free list to manage the metadata accumulator buffer */
+H5FL_BLK_DEFINE(meta_accum);
+
+
+
+/*--------------------------------------------------------------------------
+NAME
+   H5FD_space_init_interface -- Initialize interface-specific information
+USAGE
+    herr_t H5FD_space_init_interface()
+
+RETURNS
+    Non-negative on success/Negative on failure
+DESCRIPTION
+    Initializes any interface-specific data or routines.  (Just calls
+    H5FD_init_iterface currently).
+
+--------------------------------------------------------------------------*/
+static herr_t
+H5FD_space_init_interface(void)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_space_init_interface)
+
+    FUNC_LEAVE_NOAPI(H5FD_init())
+} /* H5FD_space_init_interface() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_free_freelist
+ *
+ * Purpose:     Split off from H5FD_close(). Free the elements in the
+ *              free list for this file driver.
+ *
+ * Return:      Success:    SUCCEED
+ *              Failure:    Never fails
+ *
+ * Programmer:  Bill Wendling
+ *              17. February 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_free_freelist(H5FD_t *file)
+{
+    H5FD_mem_t  i;
+#ifdef H5FD_ALLOC_DEBUG
+    unsigned    nblocks = 0;
+    hsize_t     nbytes = 0;
+#endif  /* H5FD_ALLOC_DEBUG */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_freelist)
+
+    /* check args */
+    HDassert(file && file->cls);
+
+    /*
+     * Free all free-lists, leaking any memory thus described. Also leaks
+     * file space allocated but not used when metadata aggregation is
+     * turned on.
+     */
+    for(i = H5FD_MEM_DEFAULT; i < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, i)) {
+        H5FD_free_t *cur, *next;
+
+        for( cur = file->fl[i]; cur; cur = next) {
+#ifdef H5FD_ALLOC_DEBUG
+            ++nblocks;
+            nbytes += cur->size;
+#endif  /* H5FD_ALLOC_DEBUG */
+            next = cur->next;
+            H5FL_FREE(H5FD_free_t, cur);
+        } /* end for */
+
+        file->fl[i] = NULL;
+    } /* end for */
+
+#ifdef H5FD_ALLOC_DEBUG
+    if(nblocks)
+        HDfprintf(stderr, "%s: leaked %Hu bytes of file memory in %u blocks\n",
+                  "H5FD_free_freelist", nbytes, nblocks);
+#endif  /* H5FD_ALLOC_DEBUG */
+
+    /* Check if we need to reset the metadata accumulator information */
+    if(file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
+        /* Free the buffer */
+        if(file->meta_accum)
+            file->meta_accum = H5FL_BLK_FREE(meta_accum, file->meta_accum);
+
+        /* Reset the buffer sizes & location */
+        file->accum_buf_size = file->accum_size = 0;
+        file->accum_loc = HADDR_UNDEF;
+        file->accum_dirty = 0;
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD_free_freelist() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_alloc
+ *
+ * Purpose:     Private version of H5FDalloc().
+ *
+ * Return:      Success:    The format address of the new file memory.
+ *              Failure:    The undefined address HADDR_UNDEF
+ *
+ * Programmer:  Robb Matzke
+ *              Wednesday, August  4, 1999
+ *
+ *-------------------------------------------------------------------------
+ */
+haddr_t
+H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
+{
+    haddr_t     ret_value = HADDR_UNDEF;
+
+    FUNC_ENTER_NOAPI(H5FD_alloc, HADDR_UNDEF)
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    /* check args */
+    assert(file);
+    assert(file->cls);
+    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    assert(size > 0);
+
+#ifdef H5F_DEBUG
+    if(H5DEBUG(F))
+	HDfprintf(H5DEBUG(F), "%s: alignment=%Hd, threshold=%Hd, size=%Hd\n",
+                  FUNC, file->alignment, file->threshold, size);
+#endif  /* H5F_DEBUG */
+
+    /* Try to allocate from the free list first */
+    if((ret_value = H5FD_alloc_from_free_list(file, type, size)) != HADDR_UNDEF)
+        HGOTO_DONE(ret_value)
+
+#ifdef H5F_DEBUG
+    if(H5DEBUG(F))
+	HDfprintf(H5DEBUG(F), "%s: Could not allocate from freelists\n", FUNC);
+#endif  /* H5F_DEBUG */
+
+    if(type != H5FD_MEM_DRAW) {
+        /* Handle metadata differently from "raw" data */
+        if(HADDR_UNDEF == (ret_value = H5FD_aggr_alloc(file, &(file->meta_aggr), &(file->sdata_aggr), type, dxpl_id, size)))
+            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata")
+    } /* end if */
+    else {
+        /* Allocate "raw" data */
+        if(HADDR_UNDEF == (ret_value = H5FD_aggr_alloc(file, &(file->sdata_aggr), &(file->meta_aggr), type, dxpl_id, size)))
+            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data")
+    } /* end else */
+
+done:
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+#endif /* H5FD_ALLOC_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_alloc() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_alloc_from_free_list
+ *
+ * Purpose:     Try to allocate SIZE bytes of memory from the free list
+ *              if possible.
+ *
+ *              This is split from H5FD_alloc().
+ *
+ * Return:      Success:    The format address of the new file memory.
+ *              Failure:    The undefined address HADDR_UNDEF
+ *
+ * Programmer:  Bill Wendling
+ *              02. December, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+static haddr_t
+H5FD_alloc_from_free_list(H5FD_t *file, H5FD_mem_t type, hsize_t size)
+{
+    H5FD_mem_t mapped_type;
+    haddr_t ret_value = HADDR_UNDEF;
+
+    FUNC_ENTER_NOAPI(H5FD_alloc_from_free_list, HADDR_UNDEF)
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    assert(file);
+    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    assert(size > 0);
+
+    /* Map the allocation request to a free list */
+    if(H5FD_MEM_DEFAULT == file->cls->fl_map[type])
+        mapped_type = type;
+    else
+        mapped_type = file->cls->fl_map[type];
+
+    /*
+     * Try to satisfy the request from the free list. Only perform the
+     * search if the free list has the potential of satisfying the
+     * request.
+     *
+     * Here, aligned requests are requests that are >= threshold and
+     * alignment > 1.
+     *
+     * For non-aligned request, first try to find an exact match,
+     * otherwise use the best match which is the smallest size that meets
+     * the requested size.
+     *
+     * For aligned address request, find a block in the following order
+     * of preferences:
+     *
+     *   1. block address is aligned and exact match in size;
+     *   2. block address is aligned with smallest size > requested size;
+     *   3. block address is not aligned with smallest size >= requested size.
+     */
+    if(mapped_type >= H5FD_MEM_DEFAULT && (file->maxsize == 0 || size <= file->maxsize)) {
+        H5FD_free_t    *prev = NULL, *best = NULL;
+        H5FD_free_t    *cur = file->fl[mapped_type];
+        hbool_t         found_aligned = FALSE;
+        hbool_t         need_aligned;
+        hsize_t         head;
+
+        need_aligned = file->alignment > 1 && size >= file->threshold;
+
+        while(cur) {
+            if(cur->size > file->maxsize)
+                file->maxsize = cur->size;
+
+            if(need_aligned) {
+                if((head = cur->addr % file->alignment) == 0) {
+                    /*
+                     * Aligned address
+                     */
+                    if(cur->size >= size) {
+                        if(cur->size == size) {
+                            /* exact match */
+                            ret_value = cur->addr;
+
+                            /*
+                             * Make certain we don't hand out a block of raw data
+                             * from the free list which overlaps with the metadata
+                             * aggregation buffer (if it's turned on)
+                             */
+                            if(type == H5FD_MEM_DRAW &&
+                                    (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+                                    H5F_addr_overlap(ret_value, size,
+                                                     file->accum_loc, file->accum_size)) {
+                                ret_value = HADDR_UNDEF;
+                            } else {
+                                if(prev)
+                                    prev->next = cur->next;
+                                else
+                                    file->fl[mapped_type] = cur->next;
+
+                                H5FL_FREE(H5FD_free_t, cur);
+
+                                if(size == file->maxsize)
+                                    file->maxsize = 0;  /*unknown*/
+
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Exact size match (aligned)\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                                HGOTO_DONE(ret_value)
+                            }
+                        }
+                        else
+                            /* Favor smallest block, that's closest to the beginning of the file */
+                            if(!best || !found_aligned || cur->size < best->size ||
+                                    (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr))) {
+                                best = cur;
+                                found_aligned = TRUE;
+                            }
+                    } /* end if */
+                } else {
+                    /*
+                     * Non-aligned address
+                     *
+                     * Check to see if this block is big enough to skip
+                     * to the next aligned address and is still big
+                     * enough for the requested size.  The extra
+                     * (cur->size > head) is for preventing unsigned
+                     * underflow.  (This could be improved by checking for
+                     * an exact match after excluding the head.  Such
+                     * match is as good as the found_aligned case above.)
+                     */
+                    head = file->alignment - head;	/* actual head size */
+
+                    if(!found_aligned && cur->size > head && cur->size-head >= size) {
+                        /* Favor smallest block, that's closest to the beginning of the file */
+                        if(!best || cur->size < best->size ||
+                                (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr)))
+                            best = cur;
+                    } /* end if */
+                } /* end else */
+            } else {
+                /* !need_aligned */
+                if(cur->size >= size) {
+                    if(cur->size == size) {
+                        /* exact match */
+                        ret_value = cur->addr;
+
+                        /*
+                         * Make certain we don't hand out a block of raw data
+                         * from the free list which overlaps with the metadata
+                         * aggregation buffer (if it's turned on)
+                         */
+                        if(type == H5FD_MEM_DRAW &&
+                                (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+                                H5F_addr_overlap(ret_value, size, file->accum_loc,
+                                                 file->accum_size)) {
+                            ret_value = HADDR_UNDEF;
+                        } else {
+                            if(prev)
+                                prev->next = cur->next;
+                            else
+                                file->fl[mapped_type] = cur->next;
+
+                            H5FL_FREE(H5FD_free_t, cur);
+
+                            if(size == file->maxsize)
+                                file->maxsize = 0;  /*unknown*/
+
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Exact size match (unaligned)\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                            HGOTO_DONE(ret_value)
+                        }
+                    } /* end if */
+                    else {
+                        /* Favor smallest block, that's closest to the beginning of the file */
+                        if(!best || cur->size < best->size ||
+                                (cur->size == best->size && H5F_addr_lt(cur->addr, best->addr)))
+                            best = cur;
+                    } /* end else */
+                } /* end if */
+            } /* end else */
+
+            prev = cur;
+            cur = cur->next;
+        } /* end while */
+
+        /* Couldn't find exact match, use best fitting piece found */
+        if(best) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Splitting %Hu byte sized block\n", FUNC, best->size);
+#endif /* H5FD_ALLOC_DEBUG */
+            if(best->size == file->maxsize)
+                file->maxsize = 0;  /*unknown*/
+
+            if(!need_aligned || found_aligned) {
+                /* free only tail */
+                ret_value = best->addr;
+
+                /*
+                 * Make certain we don't hand out a block of raw data
+                 * from the free list which overlaps with the metadata
+                 * aggregation buffer (if it's turned on)
+                 */
+                if(type == H5FD_MEM_DRAW &&
+                        (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+                        H5F_addr_overlap(ret_value, size, file->accum_loc,
+                                         file->accum_size)) {
+                    ret_value = HADDR_UNDEF;
+                } else {
+                    best->addr += size;     /* Reduce size of block on free list */
+                    best->size -= size;
+                    HGOTO_DONE(ret_value)
+                }
+            } else {
+                /*
+                 * Split into 3 pieces. Keep the the head and tail in the
+                 * freelist.
+                 */
+                H5FD_free_t *tmp = NULL;
+
+                head = file->alignment - (best->addr % file->alignment);
+                ret_value = best->addr + head;
+
+                /*
+                 * Make certain we don't hand out a block of raw data
+                 * from the free list which overlaps with the metadata
+                 * aggregation buffer (if it's turned on)
+                 */
+                if(type == H5FD_MEM_DRAW &&
+                        (file->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) &&
+                        H5F_addr_overlap(ret_value, size, file->accum_loc, file->accum_size)) {
+                    ret_value = HADDR_UNDEF;
+                } else {
+                    /* Attempt to allocate memory for temporary node */
+                    if((tmp = H5FL_MALLOC(H5FD_free_t))==NULL)
+                        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "free block allocation failed")
+
+                    if((tmp->size = (best->size - (head + size)))!=0) {
+                        tmp->addr = best->addr + (head + size);
+                        tmp->next = best->next;
+                        best->next = tmp;
+                    } else {
+                        /* no tail piece */
+                        H5FL_FREE(H5FD_free_t,tmp);
+                    }
+
+                    best->size = head;
+                    HGOTO_DONE(ret_value)
+                } /* end else */
+            } /* end else */
+        } /* end if */
+    } /* end if */
+
+done:
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+#endif /* H5FD_ALLOC_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_alloc_from_free_list() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_alloc
+ *
+ * Purpose:     Try to allocate SIZE bytes of memory from an aggregator
+ *              block if possible.
+ *
+ *              This is split from H5FD_alloc().
+ *
+ * Return:      Success:    The format address of the new file memory.
+ *              Failure:    The undefined address HADDR_UNDEF
+ *
+ * Programmer:  Bill Wendling
+ *              2. December, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+static haddr_t
+H5FD_aggr_alloc(H5FD_t *file, H5FD_blk_aggr_t *aggr, H5FD_blk_aggr_t *other_aggr,
+    H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
+{
+    haddr_t ret_value;          /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_aggr_alloc)
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    /* check args */
+    HDassert(file);
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(other_aggr);
+    HDassert(other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(other_aggr->feature_flag != aggr->feature_flag);
+    HDassert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    HDassert(size > 0);
+
+    /*
+     * If the aggregation feature is enabled for this VFL
+     * driver, allocate "generic" space and sub-allocate out of
+     * that, if possible. Otherwise just allocate through
+     * H5FD_real_alloc()
+     */
+    if(file->feature_flags & aggr->feature_flag) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: aggr = {%a, %Hu, %Hu}\n", FUNC, aggr->addr, aggr->tot_size, aggr->size);
+#endif /* H5FD_ALLOC_DEBUG */
+        /* Check if the space requested is larger than the space left in the block */
+        if(size > aggr->size) {
+            haddr_t new_space;   /* Address for newly allocated space */
+
+            /* Check if the block asked for is too large for 'normal' aggregator block */
+            if(size >= aggr->alloc_size) {
+                /* Allocate more room for this new block the regular way */
+                if(HADDR_UNDEF == (new_space = H5FD_real_alloc(file, type, dxpl_id, size)))
+                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate aggregation block")
+
+                /* Check if the new space is at the end of the current block */
+                if((aggr->addr + aggr->size) == new_space) {
+                    /*
+                     * Treat the allocation request as if the current block
+                     * grew by the amount allocated and just update the address.
+                     *
+                     * Don't bother updating the block's size since it will
+                     * just grow and shrink by the same amount.
+                     *
+                     * _Do_ add to the total size aggregated.
+                     *
+                     */
+                    ret_value = aggr->addr;
+                    aggr->addr += size;
+                    aggr->tot_size += size;
+                } /* end if */
+                else {
+                    /* Check if the new space is at the end of the _other_ block */
+                    if(other_aggr->size > 0 && (other_aggr->addr + other_aggr->size) == new_space) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: New block is at end of 'other' block: other_aggr = {%a, %Hu, %Hu}\n", FUNC, other_aggr->addr, other_aggr->tot_size, other_aggr->size);
+#endif /* H5FD_ALLOC_DEBUG */
+                        /* If the other block has used at least the
+                         *      'allocation' amount for that block, shift the
+                         *      newly allocated space down over the remainder
+                         *      in the 'other block', shift the 'other block'
+                         *      up by the same amount and free it.  (Which
+                         *      should amount to "bubbling" the remainder in
+                         *      the 'other block' to the end of the file and
+                         *      then "popping" the bubble by shrinking the
+                         *      file)
+                         */
+                        if((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size) {
+                            H5FD_mem_t alloc_type = (other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW);      /* Type of file memory to work with */
+                            haddr_t free_addr = (new_space + size) - other_aggr->size;   /* Address of free space in 'other block' shifted toward end of the file */
+                            hsize_t free_size = other_aggr->size;               /* Size of the free space in 'other block' */
+
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Freeing 'other' block\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                            /* Reset 'other' block's info */
+                            other_aggr->addr = 0;
+                            other_aggr->tot_size = 0;
+                            other_aggr->size = 0;
+
+                            /* Shift newly allocated space down */
+                            new_space -= free_size;
+
+                            /* Return the unused portion of the 'other' block to a free list */
+                            if(H5FD_free(file, alloc_type, dxpl_id, free_addr, free_size) < 0)
+                                HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
+                        } /* end if */
+                    } /* end if */
+
+                    /* Use the new space allocated, leaving the old block */
+                    ret_value = new_space;
+                } /* end else */
+            } /* end if */
+            else {
+                H5FD_mem_t alloc_type = (aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW);      /* Type of file memory to work with */
+
+                /* Allocate another block */
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Allocating block\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                if(HADDR_UNDEF == (new_space = H5FD_real_alloc(file, alloc_type, dxpl_id, aggr->alloc_size)))
+                    HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate aggregation block")
+
+                /* Check if the new space is at the end of the current block */
+                if(aggr->addr + aggr->size == new_space) {
+                    aggr->size += aggr->alloc_size;
+                    aggr->tot_size += aggr->alloc_size;
+                } /* end if */
+                else {
+                    hsize_t new_size;   /* Size of new aggregator block */
+
+                    /* Return the unused portion of the block to a free list */
+                    if(aggr->size > 0)
+                        if(H5FD_free(file, alloc_type, dxpl_id, aggr->addr, aggr->size) < 0)
+                            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
+
+                    /* Check if the new space is at the end of the _other_ block */
+                    if(other_aggr->size > 0 && (other_aggr->addr + other_aggr->size) == new_space) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: New block is at end of 'other' block: other_aggr = {%a, %Hu, %Hu}\n", FUNC, other_aggr->addr, other_aggr->tot_size, other_aggr->size);
+#endif /* H5FD_ALLOC_DEBUG */
+#ifdef QAK
+                        /* If the other block has used at least the
+                         *      'allocation' amount for that block, give the
+                         *      remaining free space in the 'other' block to
+                         *      the new space allocated for 'this' block.
+                         */
+                        if((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Absorbing 'other' block\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                            /* Absorb the remaining free space into newly allocated block */
+                            new_space -= other_aggr->size;
+                            new_size = aggr->alloc_size + other_aggr->size;
+
+                            /* Reset the info for the 'other' block */
+                            other_aggr->addr = 0;
+                            other_aggr->tot_size = 0;
+                            other_aggr->size = 0;
+                        } /* end if */
+                        else
+                            new_size = aggr->alloc_size;
+#else /* QAK */
+                        /* If the other block has used at least the
+                         *      'allocation' amount for that block, shift the
+                         *      newly allocated space down over the remainder
+                         *      in the 'other block', shift the 'other block'
+                         *      up by the same amount and free it.  (Which
+                         *      should amount to "bubbling" the remainder in
+                         *      the 'other block' to the end of the file and
+                         *      then "popping" the bubble by shrinking the
+                         *      file)
+                         */
+                        if((other_aggr->tot_size - other_aggr->size) >= other_aggr->alloc_size) {
+                            H5FD_mem_t other_type = (other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW);      /* Type of file memory to work with */
+                            haddr_t free_addr = (new_space + aggr->alloc_size) - other_aggr->size;   /* Address of free space in 'other block' shifted toward end of the file */
+                            hsize_t free_size = other_aggr->size;               /* Size of the free space in 'other block' */
+
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Freeing 'other' block\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+                            /* Reset 'other' block's info */
+                            other_aggr->addr = 0;
+                            other_aggr->tot_size = 0;
+                            other_aggr->size = 0;
+
+                            /* Shift newly allocated space down */
+                            new_space -= free_size;
+
+                            /* Return the unused portion of the 'other' block to a free list */
+                            if(H5FD_free(file, other_type, dxpl_id, free_addr, free_size) < 0)
+                                HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free aggregation block")
+                        } /* end if */
+                        new_size = aggr->alloc_size;
+#endif /* QAK */
+                    } /* end if */
+                    else
+                        new_size = aggr->alloc_size;
+
+                    /* Point the aggregator at the newly allocated block */
+                    aggr->addr = new_space;
+                    aggr->size = new_size;
+                    aggr->tot_size = new_size;
+                } /* end else */
+
+                /* Allocate space out of the metadata block */
+                ret_value = aggr->addr;
+                aggr->size -= size;
+                aggr->addr += size;
+            } /* end else */
+        } /* end if */
+        else {
+            /* Allocate space out of the block */
+            ret_value = aggr->addr;
+            aggr->size -= size;
+            aggr->addr += size;
+        }
+    } /* end if */
+    else {
+        /* Allocate data the regular way */
+        if(HADDR_UNDEF == (ret_value = H5FD_real_alloc(file, type, dxpl_id, size)))
+            HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate file space")
+    } /* end else */
+
+done:
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+#endif /* H5FD_ALLOC_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_aggr_alloc() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_adjoin
+ *
+ * Purpose:     Check if a newly freed block of space in the file adjoins an
+ *              aggregator block
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Thursday, December 13, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FD_aggr_adjoin(const H5FD_t *file, H5FD_blk_aggr_t *aggr, H5FD_free_t *last)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_aggr_adjoin)
+
+    /* Check args */
+    HDassert(file);
+    HDassert(file->cls);
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    HDassert(last);
+
+    /* Check if this free block adjoins the aggregator */
+    if((file->feature_flags & aggr->feature_flag) && aggr->size > 0) {
+        hbool_t adjoins = FALSE;    /* Whether the block adjoined the aggregator */
+
+        /* Does the newly freed space adjoin the end of the aggregator */
+        if((aggr->addr + aggr->size) == last->addr) {
+            last->addr = aggr->addr;
+            adjoins = TRUE;
+        } /* end if */
+        /* Does the newly freed space adjoin the beginning of the aggregator */
+        else if((last->addr + last->size) == aggr->addr)
+            adjoins = TRUE;
+
+        /* Reset aggregator information, if adjoined */
+        if(adjoins) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Adjoined flag = %lx aggregator\n", "H5FD_aggr_adjoin", aggr->feature_flag);
+#endif /* H5FD_ALLOC_DEBUG */
+            last->size += aggr->size;
+            aggr->addr = 0;
+            aggr->size = 0;
+        } /* end if */
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD_aggr_adjoin() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_can_extend
+ *
+ * Purpose:     Check is an aggregator block can be extended
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Thursday, December 13, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static htri_t
+H5FD_aggr_can_extend(const H5FD_t *file, const H5FD_blk_aggr_t *aggr, haddr_t eoa,
+    haddr_t end)
+{
+    htri_t ret_value = FALSE;
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_aggr_can_extend)
+
+    /* Check args */
+    HDassert(file);
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+
+    /* Check if this aggregator is active */
+    if(file->feature_flags & aggr->feature_flag) {
+        /* If the aggregator block is at the end of the file, and the block to
+         * test adjoins the beginning of the aggregator block, then it's
+         * extendable
+         */
+        if((aggr->addr + aggr->size) == eoa && end == aggr->addr)
+            HGOTO_DONE(TRUE)
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_aggr_can_extend() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_extend
+ *
+ * Purpose:     Shift an aggregator block in the file
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Thursday, December 13, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FD_aggr_shift(H5FD_blk_aggr_t *aggr, hsize_t extra)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_aggr_shift)
+
+    /* Check args */
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+
+    /* Shift the aggregator block by the extra amount */
+    aggr->addr += extra;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD_aggr_shift() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_query
+ *
+ * Purpose:     Query a block aggregator's current address & size info
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Thursday, December 13, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FD_aggr_query(const H5FD_t *file, const H5FD_blk_aggr_t *aggr, haddr_t *addr,
+    hsize_t *size)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_aggr_query)
+
+    /* Check args */
+    HDassert(file);
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+
+    /* Check if this aggregator is active */
+    if(file->feature_flags & aggr->feature_flag) {
+        *addr = aggr->addr;
+        *size = aggr->size;
+    } /* end if */
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD_aggr_query() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_aggr_reset
+ *
+ * Purpose:     Reset a block aggregator, returning any space back to file
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Thursday, December 13, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_aggr_reset(H5FD_t *file, H5FD_blk_aggr_t *aggr, hid_t dxpl_id)
+{
+    H5FD_mem_t alloc_type;      /* Type of file memory to work with */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_aggr_reset, FAIL)
+
+    /* Check args */
+    HDassert(file);
+    HDassert(aggr);
+    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA || aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+
+    /* Set the type of memory in the file */
+    alloc_type = (aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ? H5FD_MEM_DEFAULT : H5FD_MEM_DRAW);      /* Type of file memory to work with */
+
+    /* Check if this aggregator is active */
+    if(file->feature_flags & aggr->feature_flag) {
+        /* Return the unused portion of the metadata block to a free list */
+        if(aggr->size > 0)
+            if(H5FD_free(file, alloc_type, dxpl_id, aggr->addr, aggr->size) < 0)
+                HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free aggregator block")
+
+        /* Reset aggregator block information */
+        aggr->tot_size = 0;
+        aggr->addr = 0;
+        aggr->size = 0;
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_aggr_reset() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FD_real_alloc
+ *
+ * Purpose:	Double private version of H5FDalloc() :-)
+ *
+ * Return:	Success:	The format address of the new file memory.
+ *		Failure:	The undefined address HADDR_UNDEF
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, August 25, 2000
+ *
+ *-------------------------------------------------------------------------
+ */
+static haddr_t
+H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
+{
+    haddr_t ret_value = HADDR_UNDEF;
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_real_alloc)
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    /* check args */
+    assert(file);
+    assert(file->cls);
+    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    assert(size > 0);
+
+    /*
+     * Dispatch to driver `alloc' callback or extend the end-of-address
+     * marker
+     */
+    if(file->cls->alloc) {
+        if((ret_value = (file->cls->alloc)(file, type, dxpl_id, size)) == HADDR_UNDEF)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver allocation request failed")
+    } else {
+        if((ret_value = H5FD_update_eoa(file, type, dxpl_id, size)) == HADDR_UNDEF)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "driver eoa update request failed")
+    }
+
+done:
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
+#endif /* H5FD_ALLOC_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_real_alloc() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_update_eoa
+ *
+ * Purpose:     Update the EOA field of the file's memory.
+ *
+ *              This was split off from the H5FD_real_alloc function to
+ *              make life easier for all.
+ *
+ * Return:      Success:    The format address of the new file memory.
+ *              Failure:    The undefined address HADDR_UNDEF
+ *
+ * Programmer:  Bill Wendling
+ *              Wednesday, 04. December, 2002
+ *
+ *-------------------------------------------------------------------------
+ */
+static haddr_t
+H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
+{
+    haddr_t eoa, oldeoa = 0;
+    hsize_t wasted;
+    haddr_t ret_value = HADDR_UNDEF;
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_update_eoa)
+
+    /* check args */
+    assert(file);
+    assert(file->cls);
+    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    assert(size > 0);
+
+    eoa = file->cls->get_eoa(file, type);
+
+#ifdef H5F_DEBUG
+    if(file->alignment * file->threshold != 1 && H5DEBUG(F))
+        HDfprintf(H5DEBUG(F),
+                  "%s: alignment=%Hd, threshold=%Hd, size=%Hd, Begin eoa=%a\n",
+                  FUNC, file->alignment, file->threshold, size, eoa);
+#endif  /* H5F_DEBUG */
+
+    /* Wasted is 0 if not exceeding threshold or eoa happens to be aligned */
+    wasted = (size >= file->threshold) ? (eoa % file->alignment) : 0;
+    if(wasted) {
+        wasted = file->alignment - wasted;      /* actual waste                 */
+        oldeoa = eoa;                           /* save it for later freeing    */
+
+        /* Advance eoa to the next alignment by allocating the wasted */
+        if(H5F_addr_overflow(eoa, size) || (eoa + wasted) > file->maxaddr)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
+
+        eoa += wasted;
+
+        if(file->cls->set_eoa(file, type, eoa) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
+    } /* end if */
+
+    /* allocate the aligned memory */
+    if(H5F_addr_overflow(eoa, size) || eoa + size > file->maxaddr)
+        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
+
+    ret_value = eoa;
+    eoa += size;
+
+    if(file->cls->set_eoa(file, type, eoa) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, HADDR_UNDEF, "file allocation request failed")
+
+    /* Free the wasted memory */
+    if(wasted) {
+        if(H5FD_free(file, type, dxpl_id, oldeoa, wasted) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
+    } /* end if */
+
+#ifdef H5F_DEBUG
+    if(file->alignment * file->threshold != 1 && H5DEBUG(F))
+        HDfprintf(H5DEBUG(F),
+                  "%s: ret_value=%a, wasted=%Hd, Ended eoa=%a\n",
+                  FUNC, ret_value, wasted, eoa);
+#endif  /* H5F_DEBUG */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_update_eoa() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_free
+ *
+ * Purpose:     Private version of H5FDfree()
+ *
+ * Return:      Success:        Non-negative
+ *              Failure:        Negative
+ *
+ * Programmer:  Robb Matzke
+ *              Wednesday, August  4, 1999
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_free(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
+{
+    H5FD_mem_t		mapped_type;
+    herr_t      ret_value = SUCCEED;       /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_free, FAIL)
+
+    /* Check args */
+    HDassert(file);
+    HDassert(file->cls);
+    HDassert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    if(!H5F_addr_defined(addr) || addr > file->maxaddr ||
+            H5F_addr_overflow(addr, size) || (addr + size) > file->maxaddr)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid region")
+
+    /* Allow 0-sized free's to occur without penalty */
+    if(0 == size)
+        HGOTO_DONE(SUCCEED)
+
+    /* Map request type to free list */
+    if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
+        mapped_type = type;
+    else
+        mapped_type = file->cls->fl_map[type];
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: mapped_type = %u\n", FUNC, (unsigned)mapped_type);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    /*
+     * If the request maps to a free list then add memory to the free list
+     * without ever telling the driver that it was freed.  Otherwise let the
+     * driver deallocate the memory.
+     */
+    if(mapped_type >= H5FD_MEM_DEFAULT) {
+        H5FD_free_t *last;          /* Last merged node */
+        H5FD_free_t *last_prev = NULL;/* Pointer to node before merged node */
+        H5FD_free_t *curr;          /* Current free block being inspected */
+        H5FD_free_t *prev;          /* Previous free block being inspected */
+
+        /* Adjust the metadata accumulator to remove the freed block, if it overlaps */
+        if((file->feature_flags&H5FD_FEAT_ACCUMULATE_METADATA)
+                && H5F_addr_overlap(addr, size, file->accum_loc, file->accum_size)) {
+            size_t overlap_size;        /* Size of overlap with accumulator */
+
+            /* Check for overlapping the beginning of the accumulator */
+            if(H5F_addr_le(addr, file->accum_loc)) {
+                /* Check for completely overlapping the accumulator */
+                if(H5F_addr_ge(addr + size, file->accum_loc + file->accum_size)) {
+                    /* Reset the entire accumulator */
+                    file->accum_loc=HADDR_UNDEF;
+                    file->accum_size=FALSE;
+                    file->accum_dirty=FALSE;
+                } /* end if */
+                /* Block to free must end within the accumulator */
+                else {
+                    size_t new_accum_size;      /* Size of new accumulator buffer */
+
+                    /* Calculate the size of the overlap with the accumulator, etc. */
+                    H5_ASSIGN_OVERFLOW(overlap_size,(addr+size)-file->accum_loc,haddr_t,size_t);
+                    new_accum_size=file->accum_size-overlap_size;
+
+                    /* Move the accumulator buffer information to eliminate the freed block */
+                    HDmemmove(file->meta_accum,file->meta_accum+overlap_size,new_accum_size);
+
+                    /* Adjust the accumulator information */
+                    file->accum_loc+=overlap_size;
+                    file->accum_size=new_accum_size;
+                } /* end else */
+            } /* end if */
+            /* Block to free must start within the accumulator */
+            else {
+                /* Calculate the size of the overlap with the accumulator */
+                H5_ASSIGN_OVERFLOW(overlap_size,(file->accum_loc+file->accum_size)-addr,haddr_t,size_t);
+
+                /* Block to free is in the middle of the accumulator */
+                if(H5F_addr_lt((addr + size), file->accum_loc + file->accum_size)) {
+                    haddr_t tail_addr;
+                    size_t tail_size;
+
+                    /* Calculate the address & size of the tail to write */
+                    tail_addr=addr+size;
+                    H5_ASSIGN_OVERFLOW(tail_size,(file->accum_loc+file->accum_size)-tail_addr,haddr_t,size_t);
+
+                    /* Write out the part of the accumulator after the block to free */
+                    /* (Use the driver's write call directly - to avoid looping back and writing to metadata accumulator) */
+                    if((file->cls->write)(file, H5FD_MEM_DEFAULT, dxpl_id, tail_addr, tail_size, file->meta_accum+(tail_addr-file->accum_loc)) < 0)
+                        HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "file write request failed")
+                } /* end if */
+
+                /* Adjust the accumulator information */
+                file->accum_size=file->accum_size-overlap_size;
+            } /* end else */
+        } /* end if */
+
+        /* Scan through the existing blocks for the mapped type to see if we can extend one */
+        curr = file->fl[mapped_type];
+        last = prev = NULL;
+        while(curr != NULL) {
+            /* Check if the block to free adjoins the start of the current block */
+            if((addr + size) == curr->addr) {
+                /* If we previously found & merged a node, eliminate it from the list & free it */
+                if(last != NULL) {
+                    /* Check if there was a previous block in the list */
+                    if(last_prev != NULL)
+                        /* Eliminate the merged block from the list */
+                        last_prev->next = last->next;
+                    /* No previous block, this must be the head of the list */
+                    else
+                        /* Eliminate the merged block from the list */
+                        file->fl[mapped_type] = last->next;
+
+                    /* Check for eliminating the block before the 'current' one */
+                    if(last == prev)
+                        prev = last_prev;
+
+                    /* Free the memory for the merged block */
+                    H5FL_FREE(H5FD_free_t, last);
+                } /* end if */
+
+                /* Adjust the address and size of the block found */
+                curr->addr = addr;
+                curr->size += size;
+
+                /* Adjust the information about to memory block to include the merged block */
+                addr = curr->addr;
+                size = curr->size;
+
+                /* Update the information about the merged node */
+                last = curr;
+                last_prev = prev;
+            } /* end if */
+            else {
+                /* Check if the block to free adjoins the end of the current block */
+                if((curr->addr + curr->size) == addr) {
+                    /* If we previously found & merged a node, eliminate it from the list & free it */
+                    if(last != NULL) {
+                        /* Check if there was a previous block in the list */
+                        if(last_prev != NULL)
+                            /* Eliminate the merged block from the list */
+                            last_prev->next = last->next;
+                        /* No previous block, this must be the head of the list */
+                        else
+                            /* Eliminate the merged block from the list */
+                            file->fl[mapped_type] = last->next;
+
+                        /* Check for eliminating the block before the 'current' one */
+                        if(last == prev)
+                            prev = last_prev;
+
+                        /* Free the memory for the merged block */
+                        H5FL_FREE(H5FD_free_t, last);
+                    } /* end if */
+
+                    /* Adjust the size of the block found */
+                    curr->size += size;
+
+                    /* Adjust the information about to memory block to include the merged block */
+                    addr = curr->addr;
+                    size = curr->size;
+
+                    /* Update the information about the merged node */
+                    last = curr;
+                    last_prev = prev;
+                } /* end if */
+            } /* end else */
+
+            /* Advance to next node in list */
+            prev = curr;
+            curr = curr->next;
+        } /* end while */
+
+        /* Check if we adjusted an existing block */
+        if(last != NULL) {
+            /* Move the node found to the front, if it wasn't already there */
+            if(last_prev != NULL) {
+                last_prev->next = last->next;
+                last->next = file->fl[mapped_type];
+                file->fl[mapped_type] = last;
+            } /* end if */
+        } /* end if */
+        else {
+            /* Allocate a new node to hold the free block's information */
+            if(NULL == (last = H5FL_MALLOC(H5FD_free_t)))
+                HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, FAIL, "can't allocate node for free space info")
+
+            last->addr = addr;
+            last->size = size;
+            last->next = file->fl[mapped_type];
+            file->fl[mapped_type] = last;
+        } /* end else */
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: mapped_type = %u, last = {%a, %Hu}\n", FUNC, (unsigned)mapped_type, last->addr, last->size);
+#endif /* H5FD_ALLOC_DEBUG */
+
+        /* Check if we increased the size of the largest block on the list */
+        file->maxsize = MAX(file->maxsize, last->size);
+
+        /* Check if this free block adjoins the "metadata aggregator" */
+        if(H5FD_aggr_adjoin(file, &(file->meta_aggr), last) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "aggregator deallocation request failed")
+
+        /* Check if this free block adjoins the "small data aggregator" */
+        if(H5FD_aggr_adjoin(file, &(file->sdata_aggr), last) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "aggregator deallocation request failed")
+
+        /* Check if this free block is at the end of file allocated space.
+         * Truncate it if this is true. */
+        if(file->cls->get_eoa) {
+            haddr_t     eoa;
+
+            eoa = file->cls->get_eoa(file, type);
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: eoa = %a\n", FUNC, eoa);
+#endif /* H5FD_ALLOC_DEBUG */
+            if(eoa == (last->addr + last->size)) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Reducing file size to = %a\n", FUNC, last->addr);
+#endif /* H5FD_ALLOC_DEBUG */
+                if(file->cls->set_eoa(file, type, last->addr) < 0)
+                    HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "set end of space allocation request failed")
+
+                /* Remove this free block from the list */
+                file->fl[mapped_type] = last->next;
+                if(file->maxsize == last->size)
+                    file->maxsize = 0; /*unknown*/
+                H5FL_FREE(H5FD_free_t, last);
+            } /* end if */
+        } /* end if */
+    } else if(file->cls->free) {
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: Letting VFD free space\n", FUNC);
+#endif /* H5FD_ALLOC_DEBUG */
+        if((file->cls->free)(file, type, dxpl_id, addr, size) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver free request failed")
+    } else {
+        /* leak memory */
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)type, addr, size);
+#endif /* H5FD_ALLOC_DEBUG */
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_free() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FD_realloc
+ *
+ * Purpose:	Private version of H5FDrealloc()
+ *
+ * Return:	Success:	New address of the block of memory, not
+ *				necessarily the same as the original address.
+ *		Failure:	HADDR_UNDEF
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, August  4, 1999
+ *
+ *-------------------------------------------------------------------------
+ */
+haddr_t
+H5FD_realloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsize_t old_size,
+	     hsize_t new_size)
+{
+    haddr_t	new_addr=old_addr;
+    uint8_t	_buf[8192];
+    uint8_t	*buf=_buf;
+    haddr_t      ret_value;       /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_realloc, HADDR_UNDEF)
+
+    if(new_size == old_size) {
+        /*nothing to do*/
+    } else if(0 == old_size) {
+        /* allocate memory */
+        HDassert(!H5F_addr_defined(old_addr));
+        if(HADDR_UNDEF == (new_addr = H5FD_alloc(file, type, dxpl_id, new_size)))
+            HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
+    } else if(0==new_size) {
+        /* free memory */
+        HDassert(H5F_addr_defined(old_addr));
+        if(H5FD_free(file, type, dxpl_id, old_addr, old_size) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
+        new_addr = HADDR_UNDEF;
+    } else if(new_sizesizeof(size_t) and the
+         * object on disk is too large to read into a memory buffer all at one
+         * time.  This chunk of code would have to be re-written using a loop
+         * to move pieces of the realloced data through a fixed size buffer, etc.
+         * -QAK, 6/20/01
+         */
+        if(HADDR_UNDEF == (new_addr = H5FD_alloc(file, type, dxpl_id, new_size)))
+            HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
+        H5_CHECK_OVERFLOW(old_size,hsize_t,size_t);
+        if(old_size > sizeof(_buf) && NULL == (buf = H5MM_malloc((size_t)old_size))) {
+            (void)H5FD_free(file, type, dxpl_id, new_addr, new_size);
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed")
+        } /* end if */
+        if(H5FD_read(file, type, dxpl_id, old_addr, (size_t)old_size, buf) < 0 ||
+                H5FD_write(file, type, dxpl_id, new_addr, (size_t)old_size, buf) < 0) {
+            (void)H5FD_free(file, type, dxpl_id, new_addr, new_size);
+            if(buf != _buf)
+                H5MM_xfree(buf);
+            HGOTO_ERROR(H5E_FILE, H5E_READERROR, HADDR_UNDEF, "unable to move file block")
+        } /* end if */
+
+        if(buf != _buf)
+            H5MM_xfree(buf);
+        if(H5FD_free(file, type, dxpl_id, old_addr, old_size) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "file deallocation request failed")
+    } /* end else */
+
+    /* Set return value */
+    ret_value = new_addr;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_realloc() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FD_can_extend
+ *
+ * Purpose:	Check if a block in the file can be extended.
+ *
+ * Return:	Success:	TRUE(1)/FALSE(0)
+ * 		Failure:	FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, June 11, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5FD_can_extend(const H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
+{
+    haddr_t end;                        /* End of block in file */
+    haddr_t eoa;                        /* End of address space in the file */
+    htri_t  ret_value = FALSE;          /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_can_extend, FAIL)
+
+    /* Retrieve the end of the address space */
+    if(HADDR_UNDEF == (eoa = H5FD_get_eoa(file, type)))
+	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
+
+    /* Compute end of block */
+    end = addr + size;
+
+    /* Check if the block is exactly at the end of the file */
+    if(end == eoa)
+        HGOTO_DONE(TRUE)
+    else {
+        H5FD_free_t *curr;          /* Current free block being inspected */
+        H5FD_mem_t mapped_type;     /* Memory type, after mapping */
+
+        /* Map request type to free list */
+        if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
+            mapped_type = type;
+        else
+            mapped_type = file->cls->fl_map[type];
+
+        /* Check if block is inside the metadata or small data aggregator */
+        if(mapped_type!=H5FD_MEM_DRAW) {
+            /* Check for test block able to extend metadata aggregation block */
+            if((ret_value = H5FD_aggr_can_extend(file, &(file->meta_aggr), eoa, end)) < 0)
+                HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't determine if metadata aggregation block can be extended")
+            else if(ret_value > 0)
+                HGOTO_DONE(TRUE)
+        } /* end if */
+        else {
+            /* Check for test block able to extend metadata aggregation block */
+            if((ret_value = H5FD_aggr_can_extend(file, &(file->sdata_aggr), eoa, end)) < 0)
+                HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't determine if 'small data' aggregation block can be extended")
+            else if(ret_value > 0)
+                HGOTO_DONE(TRUE)
+        } /* end else */
+
+        /* Scan through the existing blocks for the mapped type to see if we can extend one */
+        if(mapped_type >= H5FD_MEM_DEFAULT) {
+            curr = file->fl[mapped_type];
+            while(curr != NULL) {
+                if(end == curr->addr) {
+                    if(extra_requested <= curr->size)
+                        HGOTO_DONE(TRUE)
+                    else
+                        HGOTO_DONE(FALSE)
+                } /* end if */
+
+                /* Advance to next node in list */
+                curr=curr->next;
+            } /* end while */
+        } /* end if */
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_can_extend() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FD_extend
+ *
+ * Purpose:	Extend a block in the file.
+ *
+ * Return:	Success:	Non-negative
+ * 		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, June 12, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FD_extend(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
+{
+    haddr_t     eoa;                    /* End of address space in the file */
+    haddr_t     end;                    /* End of block in file */
+    hbool_t     update_eoma=FALSE;      /* Whether we need to update the eoma */
+    hbool_t     update_eosda=FALSE;     /* Whether we need to update the eosda */
+    hbool_t     at_end=FALSE;           /* Block is at end of file */
+    H5FD_mem_t  mapped_type;            /* Memory type, after mapping */
+    herr_t      ret_value=SUCCEED;      /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_extend, FAIL)
+#ifdef H5FD_ALLOC_DEBUG
+HDfprintf(stderr, "%s: type = %u, addr = %a, size = %Hu, extra_requested = %Hu\n", FUNC, (unsigned)type, addr, size, extra_requested);
+#endif /* H5FD_ALLOC_DEBUG */
+
+    /* Retrieve the end of the address space */
+    if(HADDR_UNDEF==(eoa=H5FD_get_eoa(file, type)))
+	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
+
+    /* Map request type to free list */
+    if(H5FD_MEM_DEFAULT==file->cls->fl_map[type])
+        mapped_type = type;
+    else
+        mapped_type = file->cls->fl_map[type];
+
+    /* Compute end of block */
+    end = addr + size;
+
+    /* Check if the block is exactly at the end of the file */
+    if(end == eoa)
+        at_end = TRUE;
+    else {
+        /* (Check if block is inside the metadata or small data accumulator) */
+        if(mapped_type!=H5FD_MEM_DRAW) {
+            /* Check for test block able to extend metadata aggregation block */
+            if((ret_value = H5FD_aggr_can_extend(file, &(file->meta_aggr), eoa, end)) < 0)
+                HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't determine if metadata aggregation block can be extended")
+            else if(ret_value > 0)
+                update_eoma = TRUE;
+        } /* end if */
+        else {
+            /* Check for test block able to extend metadata aggregation block */
+            if((ret_value = H5FD_aggr_can_extend(file, &(file->sdata_aggr), eoa, end)) < 0)
+                HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't determine if metadata aggregation block can be extended")
+            else if(ret_value > 0)
+                update_eosda = TRUE;
+        } /* end else */
+    } /* end else */
+
+    /* Block is at end of file, we are extending the eoma or eosda */
+    if(update_eoma || update_eosda || at_end) {
+        /* Check for overflowing the file */
+        if(H5F_addr_overflow(eoa, extra_requested) || eoa + extra_requested > file->maxaddr)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "file allocation request failed")
+
+        /* Extend the file */
+        eoa += extra_requested;
+        if(file->cls->set_eoa(file, type, eoa) < 0)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "file allocation request failed")
+
+        /* Update the metadata and/or small data block */
+        HDassert(!(update_eoma && update_eosda));
+        if(update_eoma)
+            H5FD_aggr_shift(&(file->meta_aggr), extra_requested);
+        if(update_eosda)
+            H5FD_aggr_shift(&(file->sdata_aggr), extra_requested);
+    } /* end if */
+    /* If the block we are extending isn't at the end of the file, find a free block to extend into */
+    else {
+        H5FD_free_t *curr;          /* Current free block being inspected */
+        H5FD_free_t *prev;          /* Current free block being inspected */
+
+        /* Walk through free list, looking for block to merge with */
+        curr = file->fl[mapped_type];
+        prev = NULL;
+        while(curr!=NULL) {
+            /* Found block that ajoins end of block to extend */
+            if(end == curr->addr) {
+                /* Check if free space is large enough */
+                if(extra_requested <= curr->size) {
+                    /* Check for exact match */
+                    if(extra_requested == curr->size) {
+                        /* Unlink node from free list */
+                        if(prev == NULL)
+                            file->fl[mapped_type] = curr->next;
+                        else
+                            prev->next = curr->next;
+
+                        /* Free the memory for the used block */
+                        H5FL_FREE(H5FD_free_t, curr);
+                    } /* end if */
+                    else {
+                        curr->addr += extra_requested;
+                        curr->size -= extra_requested;
+                    } /* end else */
+
+                    /* Leave now */
+                    break;
+                } /* end if */
+                else
+                    HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "can't extend block")
+            } /* end if */
+
+            /* Advance to next node in list */
+            prev = curr;
+            curr = curr->next;
+        } /* end while */
+
+        /* Couldn't find block to extend */
+        if(curr == NULL)
+            HGOTO_ERROR(H5E_VFL, H5E_NOSPACE, FAIL, "can't extend block")
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_extend() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_get_freespace
+ *
+ * Purpose:     Retrieve the amount of free space in a file.
+ *
+ * Return:      Success:        Amount of free space in file
+ *              Failure:        Negative
+ *
+ * Programmer:  Quincey Koziol
+ *              Monday, October  6, 2003
+ *
+ * Note:
+ *              Raymond Lu
+ *              5 January 2007
+ *              Due to the complexity EOA for Multi driver, this function
+ *              is made failed for now.
+ * 
+ *-------------------------------------------------------------------------
+ */
+hssize_t
+H5FD_get_freespace(const H5FD_t *file)
+{
+    H5FD_free_t *free_node;     /* Pointer to node on free list */
+    H5FD_mem_t type;            /* Type of memory */
+    haddr_t ma_addr = HADDR_UNDEF;    /* Base "metadata aggregator" address */
+    hsize_t ma_size = 0;        /* Size of "metadata aggregator" */
+    haddr_t sda_addr = HADDR_UNDEF;    /* Base "small data aggregator" address */
+    hsize_t sda_size = 0;       /* Size of "small data aggregator" */
+    haddr_t eoa = 0;            /* End of allocated space in the file */
+    hssize_t ret_value = 0;     /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FD_get_freespace, FAIL)
+
+    /* check args */
+    HDassert(file);
+    HDassert(file->cls);
+
+    /* Multi driver doesn't support this function because of the complexity.
+     * It doesn't have eoa for the whole file. */
+    if(file->driver_id == H5FD_MULTI)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "Multi driver doesn't support this function")
+    
+    /* Retrieve the 'eoa' for the file */
+    eoa = file->cls->get_eoa(file, H5FD_MEM_DEFAULT);
+
+    /* Retrieve metadata aggregator info, if available */
+    H5FD_aggr_query(file, &(file->meta_aggr), &ma_addr, &ma_size);
+
+    /* Retrieve 'small data' aggregator info, if available */
+    H5FD_aggr_query(file, &(file->sdata_aggr), &sda_addr, &sda_size);
+
+    /* Iterate over all the types of memory, to retrieve amount of free space for each */
+    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,type)) {
+        /* Iterate through the free list, accumulating the amount of free space for this type */
+        free_node = file->fl[type];
+        while(free_node) {
+            /* Check for current node adjoining the metadata & small data aggregators */
+            if(H5F_addr_eq(free_node->addr + free_node->size, ma_addr)) {
+                ma_addr -= free_node->size;
+                ma_size += free_node->size;
+            } else if(H5F_addr_eq(free_node->addr + free_node->size, sda_addr)) {
+                sda_addr -= free_node->size;
+                sda_size += free_node->size;
+            } else if(H5F_addr_eq(ma_addr + ma_size, free_node->addr))
+                ma_size += free_node->size;
+            else if(H5F_addr_eq(sda_addr + sda_size, free_node->addr))
+                sda_size += free_node->size;
+            else
+                ret_value += (hssize_t)free_node->size;
+            free_node = free_node->next;
+        } /* end while */
+    } /* end for */
+
+    /* Check for aggregating metadata allocations */
+    if(ma_size > 0) {
+        /* Add in the reserved space for metadata to the available free space */
+        /* (if it's not at the tail of the file) */
+        if(H5F_addr_ne(ma_addr + ma_size, eoa))
+            ret_value += ma_size;
+    } /* end if */
+
+    /* Check for aggregating small data allocations */
+    if(sda_size > 0) {
+        /* Add in the reserved space for metadata to the available free space */
+        /* (if it's not at the tail of the file) */
+        if(H5F_addr_ne(sda_addr + sda_size, eoa))
+            ret_value += sda_size;
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_get_freespace() */
+
diff --git a/src/H5FS.c b/src/H5FS.c
index f1907b2..2dd2833 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -101,6 +101,9 @@ H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_c
     H5FS_t *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5FS_create, NULL)
+#ifdef QAK
+HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, nclasses);
+#endif /* QAK */
 
     /* Check arguments. */
     HDassert(fs_addr);
@@ -373,13 +376,13 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_c
     else {
         unsigned sect_status = 0;       /* Free space section's status in the metadata cache */
 
-        /* Check the free space section's status in the metadata cache */
-        if(H5AC_get_entry_status(f, fspace->sect_addr, §_status) < 0)
+        /* Check if we've allocated any section info in the file & if it's still in the cache */
+        if(H5F_addr_defined(fspace->sect_addr) && H5AC_get_entry_status(f, fspace->sect_addr, §_status) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "unable to check metadata cache status for free space header")
 
-        /* If this free list header's section info is still in the cache, don't
-         *      unpin the header - let the section info do it, when the section
-         *      into is evicted from the cache. -QAK
+        /* If this free list header's section info exists and is still in the
+         *      cache, don't unpin the header - let the section info do it,
+         *      when the section info is evicted from the cache. -QAK
          */
         if(!(sect_status & H5AC_ES__IN_CACHE)) {
             /* Unpin the free space header in the cache */
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 505223a..c589aa0 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -187,6 +187,9 @@ H5FS_sinfo_pin(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
     H5FS_sinfo_t *ret_value;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_pin)
+#ifdef QAK
+HDfprintf(stderr, "%s: Called, fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
+#endif /* QAK */
 
     /* Check arguments. */
     HDassert(f);
@@ -194,6 +197,9 @@ H5FS_sinfo_pin(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
 
     /* Create new section info, if it doesn't exist yet */
     if(!H5F_addr_defined(fspace->sect_addr)) {
+#ifdef QAK
+HDfprintf(stderr, "%s: Allocating new section info\n", FUNC);
+#endif /* QAK */
         /* Sanity check */
         HDassert(fspace->tot_sect_count == 0);
         HDassert(fspace->serial_sect_count == 0);
@@ -208,6 +214,9 @@ H5FS_sinfo_pin(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
         fspace->alloc_sect_size = (size_t)fspace->sect_size;
         if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->alloc_sect_size)))
             HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, NULL, "file allocation failed for free space sections")
+#ifdef QAK
+HDfprintf(stderr, "%s: New section info, addr = %a, size = %Hu\n", FUNC, fspace->sect_addr, fspace->alloc_sect_size);
+#endif /* QAK */
 
         /* Cache the new free space section info (pinned) */
         if(H5AC_set(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, sinfo, H5AC__PIN_ENTRY_FLAG) < 0)
@@ -1209,12 +1218,6 @@ HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
     HDassert(request);
     HDassert(node);
 
-    /* Check if we need to go get the sections */
-    if(fspace->sinfo == NULL) {
-        if(NULL == (fspace->sinfo = H5FS_sinfo_pin(f, dxpl_id, fspace)))
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't pin sections")
-    } /* end if */
-
     /* Check for any sections on free space list */
 #ifdef QAK
 HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
@@ -1222,6 +1225,12 @@ HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_
 HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
 #endif /* QAK */
     if(fspace->tot_sect_count > 0) {
+        /* Check if we need to go get the sections */
+        if(fspace->sinfo == NULL) {
+            if(NULL == (fspace->sinfo = H5FS_sinfo_pin(f, dxpl_id, fspace)))
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't pin sections")
+        } /* end if */
+
         /* Look for node in bins */
         if((ret_value = H5FS_sect_find_node(fspace, request, node)) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from bins")
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 9df85bb..bea0579 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -90,7 +90,7 @@ typedef struct H5F_file_t {
     unsigned	sohm_vers;	/* Version of shared message table on disk */
     unsigned	sohm_nindexes;	/* Number of shared messages indexes in the table */
     haddr_t	driver_addr;	/* File driver information block address*/
-    hbool_t     fam_to_sec2;    /* Is h5repart changing driver from family to sec2 */
+    haddr_t	maxaddr;	/* Maximum address for file             */
 
     H5AC_t      *cache;		/* The object cache			*/
     H5AC2_t     *cache2;	/* test cache		 		*/
@@ -109,7 +109,8 @@ typedef struct H5F_file_t {
     hsize_t	alignment;	/* Alignment				*/
     unsigned	gc_ref;		/* Garbage-collect references?		*/
     hbool_t	latest_format;	/* Always use the latest format?	*/
-    hbool_t	store_msg_crt_idx;	/* Store creation index for object header messages?	*/
+    hbool_t	store_msg_crt_idx;  /* Store creation index for object header messages?	*/
+    hbool_t     fam_to_sec2;    /* Is h5repart changing driver from family to sec2? */
     int	ncwfs;			/* Num entries on cwfs list		*/
     struct H5HG_heap_t **cwfs;	/* Global heap cache			*/
     struct H5G_t *root_grp;	/* Open root group			*/
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 903f56d..b61773a 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -267,6 +267,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_INTENT(F)           ((F)->intent)
 #define H5F_GET_FC_DEGREE(F)    ((F)->shared->fc_degree)
 #define H5F_STORE_MSG_CRT_IDX(F)    ((F)->shared->store_msg_crt_idx)
+#define H5F_GET_FILENO(F,FILENUM) ((FILENUM) = (F)->shared->lf->fileno)
 #else /* H5F_PACKAGE */
 #define H5F_FCPL(F)             (H5F_get_fcpl(F))
 #define H5F_SIZEOF_ADDR(F)      (H5F_sizeof_addr(F))
@@ -285,6 +286,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_INTENT(F)           (H5F_get_intent(F))
 #define H5F_GET_FC_DEGREE(F)    (H5F_get_fc_degree(F))
 #define H5F_STORE_MSG_CRT_IDX(F)    (H5F_store_msg_crt_idx(F))
+#define H5F_GET_FILENO(F,FILENUM) (H5F_get_filenum((F), &(FILENUM)))
 #endif /* H5F_PACKAGE */
 
 
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 1d98330..a055d46 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -107,6 +107,12 @@ typedef struct H5F_info_t {
     } sohm;
 } H5F_info_t;
 
+/* Library's file format versions */
+typedef enum H5F_libver_t {
+    H5F_LIBVER_EARLIEST,        /* Use the earliest possible format for storing objects */
+    H5F_LIBVER_LATEST           /* Use the latest possible format available for storing objects*/
+} H5F_libver_t;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/H5G.c b/src/H5G.c
index 256edc3..303564d 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -88,6 +88,7 @@
 #include "H5Gpkg.h"		/* Groups		  		*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Lprivate.h"         /* Links                                */
+#include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Pprivate.h"         /* Property lists                       */
 #include "H5AC2private.h"       /* Metadata cache                       */
 
@@ -101,14 +102,43 @@ typedef struct {
     H5G_loc_t *loc;         /* Pointer to the location for insertion */
 } H5G_trav_ins_t;
 
+/* User data for application-style iteration over links in a group */
+typedef struct {
+    hid_t       gid;            /* The group ID for the application callback */
+    H5G_link_iterate_t lnk_op;  /* Application callback */
+    void *op_data;              /* Application's op data */
+} H5G_iter_appcall_ud_t;
+
+/* User data for recursive traversal over links from a group */
+typedef struct {
+    hid_t       gid;            /* The group ID for the starting group */
+    H5G_loc_t	*curr_loc;      /* Location of starting group */
+    hid_t       lapl_id;        /* LAPL for walking across links */
+    hid_t       dxpl_id; 	/* DXPL for operations */
+    H5_index_t  idx_type;       /* Index to use */
+    H5_iter_order_t order;      /* Iteration order within index */
+    H5SL_t     *visited;        /* Skip list for tracking visited nodes */
+    char       *path;           /* Path name of the link */
+    size_t      curr_path_len;  /* Current length of the path in the buffer */
+    size_t      path_buf_size;  /* Size of path buffer */
+    H5L_iterate_t op;           /* Application callback */
+    void       *op_data;        /* Application's op data */
+} H5G_iter_visit_ud_t;
+
+
 /* Package variables */
 
+
 /* Local variables */
 
 /* Declare a free list to manage the H5G_t struct */
 H5FL_DEFINE(H5G_t);
 H5FL_DEFINE(H5G_shared_t);
 
+/* Declare the free list to manage H5_obj_t's */
+H5FL_DEFINE(H5_obj_t);
+
+
 /* Private prototypes */
 static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id);
 
@@ -367,7 +397,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
     if((grp = H5G_open_name(&loc, name, gapl_id, H5AC_dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
-    /* Register an atom for the group */
+    /* Register an ID for the group */
     if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
 
@@ -1021,8 +1051,8 @@ H5G_open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
     H5G_loc_t   grp_loc;                /* Location used to open group */
     H5G_name_t  grp_path;            	/* Opened object group hier. path */
     H5O_loc_t   grp_oloc;            	/* Opened object object location */
-    H5O_type_t  obj_type;               /* Type of object at location */
     hbool_t     loc_found = FALSE;      /* Location at 'name' found */
+    H5O_type_t  obj_type;               /* Type of object at location */
     H5G_t      *ret_value;              /* Return value */
 
     FUNC_ENTER_NOAPI(H5G_open_name, NULL)
@@ -1147,7 +1177,7 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
     ret_value = grp;
 
 done:
-    if (!ret_value && grp) {
+    if(!ret_value && grp) {
         H5O_loc_free(&(grp->oloc));
         H5G_name_free(&(grp->path));
         H5FL_FREE(H5G_t,grp);
@@ -1524,3 +1554,453 @@ H5G_unmount(H5G_t *grp)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G_unmount() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5G_iterate_cb
+ *
+ * Purpose:     Callback function for iterating over links in a group
+ *
+ * Return:	Success:        Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *	        Oct  3, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
+{
+    H5G_iter_appcall_ud_t *udata = (H5G_iter_appcall_ud_t *)_udata;     /* User data for callback */
+    herr_t ret_value = H5_ITER_ERROR;   /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5G_iterate_cb)
+
+    /* Sanity check */
+    HDassert(lnk);
+    HDassert(udata);
+
+    switch(udata->lnk_op.op_type) {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+        case H5G_LINK_OP_OLD:
+            /* Make the old-type application callback */
+            ret_value = (udata->lnk_op.op_func.op_old)(udata->gid, lnk->name, udata->op_data);
+            break;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
+        case H5G_LINK_OP_NEW:
+            {
+                H5L_info_t info;    /* Link info */
+
+                /* Retrieve the info for the link */
+                if(H5G_link_to_info(lnk, &info) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
+
+                /* Make the application callback */
+                ret_value = (udata->lnk_op.op_func.op_new)(udata->gid, lnk->name, &info, udata->op_data);
+            }
+            break;
+    } /* end switch */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_iterate_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5G_iterate
+ *
+ * Purpose:     Private function for iterating over links in a group
+ *
+ * Return:	Success:        Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *	        Oct  3, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_iterate(hid_t loc_id, const char *group_name,
+    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
+    const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
+{
+    H5G_loc_t	loc;            /* Location of parent for group */
+    hid_t gid = -1;             /* ID of group to iterate over */
+    H5G_t *grp;                 /* Pointer to group data structure to iterate over */
+    H5G_iter_appcall_ud_t udata; /* User data for callback */
+    herr_t ret_value;           /* Return value */
+
+    FUNC_ENTER_NOAPI(H5G_iterate, FAIL)
+
+    /* Sanity check */
+    HDassert(group_name);
+    HDassert(last_lnk);
+    HDassert(lnk_op && lnk_op->op_func.op_new);
+
+    /*
+     * Open the group on which to operate.  We also create a group ID which
+     * we can pass to the application-defined operator.
+     */
+    if(H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if(NULL == (grp = H5G_open_name(&loc, group_name, lapl_id, dxpl_id)))
+        HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
+    if((gid = H5I_register(H5I_GROUP, grp)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+
+    /* Set up user data for callback */
+    udata.gid = gid;
+    udata.lnk_op = *lnk_op;
+    udata.op_data = op_data;
+
+    /* Call the real group iteration routine */
+    if((ret_value = H5G_obj_iterate(&(grp->oloc), idx_type, order, skip, last_lnk, H5G_iterate_cb, &udata, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "error iterating over links")
+
+done:
+    /* Release the group opened */
+    if(gid > 0) {
+        if(H5I_dec_ref(gid) < 0)
+            HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+    } /* end if */
+    else if(grp && H5G_close(grp) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_iterate() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5G_free_visit_visited
+ *
+ * Purpose:     Free the key for an object visited during a group traversal
+ *
+ * Return:      Non-negative on success, negative on failure
+ *
+ * Programmer:  Quincey Koziol
+ *	        Nov  4, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_free_visit_visited)
+
+    H5FL_FREE(H5_obj_t, item);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5G_free_visit_visited() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5G_visit_cb
+ *
+ * Purpose:     Callback function for recursively visiting links from a group
+ *
+ * Return:	Success:        Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *	        Nov  4, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
+{
+    H5G_iter_visit_ud_t *udata = (H5G_iter_visit_ud_t *)_udata;     /* User data for callback */
+    H5L_info_t info;                    /* Link info */
+    H5G_loc_t   obj_loc;                /* Location of object */
+    H5G_name_t  obj_path;            	/* Object's group hier. path */
+    H5O_loc_t   obj_oloc;            	/* Object's object location */
+    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
+    size_t old_path_len = udata->curr_path_len; /* Length of path before appending this link's name */
+    size_t link_name_len;               /* Length of link's name */
+    size_t len_needed;                  /* Length of path string needed */
+    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5G_visit_cb)
+
+    /* Sanity check */
+    HDassert(lnk);
+    HDassert(udata);
+
+    /* Check if we will need more space to store this link's relative path */
+    /* ("+2" is for string terminator and possible '/' for group separator later) */
+    link_name_len = HDstrlen(lnk->name);
+    len_needed = udata->curr_path_len + link_name_len + 2;
+    if(len_needed > udata->path_buf_size) {
+        void *new_path;         /* Pointer to new path buffer */
+
+        /* Attempt to allocate larger buffer for path */
+        if(NULL == (new_path = H5MM_realloc(udata->path, len_needed)))
+            HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
+        udata->path = new_path;
+        udata->path_buf_size = len_needed;
+    } /* end if */
+
+    /* Build the link's relative path name */
+    HDassert(udata->path[old_path_len] == '\0');
+    HDstrcpy(&(udata->path[old_path_len]), lnk->name); 
+    udata->curr_path_len += link_name_len;
+
+    /* Construct the link info from the link message */
+    if(H5G_link_to_info(lnk, &info) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
+
+    /* Make the application callback */
+    ret_value = (udata->op)(udata->gid, udata->path, &info, udata->op_data);
+
+    /* Check for doing more work */
+    if(ret_value == H5_ITER_CONT && lnk->type == H5L_TYPE_HARD) {
+        H5_obj_t obj_pos;       /* Object "position" for this object */
+
+        /* Set up opened group location to fill in */
+        obj_loc.oloc = &obj_oloc;
+        obj_loc.path = &obj_path;
+        H5G_loc_reset(&obj_loc);
+
+        /* Find the object using the LAPL passed in */
+        /* (Correctly handles mounted files) */
+        if(H5G_loc_find(udata->curr_loc, lnk->name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
+        obj_found = TRUE;
+
+        /* Construct unique "position" for this object */
+        H5F_GET_FILENO(obj_oloc.file, obj_pos.fileno);
+        obj_pos.addr = obj_oloc.addr;
+
+        /* Check if we've seen the object the link references before */
+        if(NULL == H5SL_search(udata->visited, &obj_pos)) {
+            H5O_type_t otype;       /* Basic object type (group, dataset, etc.) */
+            unsigned rc;		/* Reference count of object    */
+
+            /* Get the object's reference count and type */
+            if(H5O_get_rc_and_type(&obj_oloc, udata->dxpl_id, &rc, &otype) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
+
+            /* If its ref count is > 1, we add it to the list of visited objects */
+            /* (because it could come up again during traversal) */
+            if(rc > 1) {
+                H5_obj_t *new_node;                  /* New object node for visited list */
+
+                /* Allocate new object "position" node */
+                if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+                    HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
+
+                /* Set node information */
+                *new_node = obj_pos;
+
+                /* Add to list of visited objects */
+                if(H5SL_insert(udata->visited, new_node, new_node) < 0)
+                    HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+            } /* end if */
+
+            /* If it's a group, we recurse into it */
+            if(otype == H5O_TYPE_GROUP) {
+                H5G_loc_t *old_loc = udata->curr_loc;       /* Pointer to previous group location info */
+                H5_index_t idx_type = udata->idx_type;      /* Type of index to use */
+                H5O_linfo_t	linfo;		        /* Link info message */
+
+                /* Add the path separator to the current path */
+                HDassert(udata->path[udata->curr_path_len] == '\0');
+                HDstrcpy(&(udata->path[udata->curr_path_len]), "/"); 
+                udata->curr_path_len++;
+                    
+                /* Attempt to get the link info for this group */
+                if(H5G_obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) {
+                    /* Check for creation order tracking, if creation order index lookup requested */
+                    if(idx_type == H5_INDEX_CRT_ORDER) {
+                        /* Check if creation order is tracked */
+                        if(!linfo.track_corder)
+                            /* Switch to name order for this group */
+                            idx_type = H5_INDEX_NAME;
+                    } /* end if */
+                    else
+                        HDassert(idx_type == H5_INDEX_NAME);
+                } /* end if */
+                else {
+                    /* Clear error stack from not finding the link info message */
+                    H5E_clear_stack(NULL);
+
+                    /* Can only perform name lookups on groups with symbol tables */
+                    if(idx_type != H5_INDEX_NAME)
+                        /* Switch to name order for this group */
+                        idx_type = H5_INDEX_NAME;
+                } /* end if */
+
+                /* Point to this group's location info */
+                udata->curr_loc = &obj_loc;
+
+                /* Iterate over links in group */
+                ret_value = H5G_obj_iterate(&obj_oloc, idx_type, udata->order, (hsize_t)0, NULL, H5G_visit_cb, udata, udata->dxpl_id);
+
+                /* Restore location */
+                udata->curr_loc = old_loc;
+            } /* end if */
+        } /* end if */
+    } /* end if */
+
+done:
+    /* Reset path back to incoming path */
+    udata->path[old_path_len] = '\0';
+    udata->curr_path_len = old_path_len;
+
+    /* Release resources */
+    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_visit_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5G_visit
+ *
+ * Purpose:	Recursively visit all the links in a group and all
+ *              the groups that are linked to from that group.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Each _link_ reachable from the initial group will only be
+ *              visited once.  However, because an object may be reached from
+ *              more than one link, the visitation may call the application's
+ *              callback with more than one link that points to a particular
+ *              _object_.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ *
+ *
+ * Programmer:	Quincey Koziol
+ *		November 4 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id,
+    hid_t dxpl_id)
+{
+    H5G_iter_visit_ud_t udata;      /* User data for callback */
+    H5O_linfo_t	linfo;		    /* Link info message */
+    hid_t       gid = (-1);         /* Group ID */
+    H5G_t      *grp = NULL;         /* Group opened */
+    H5G_loc_t	loc;                /* Location of group passed in */
+    H5G_loc_t	start_loc;          /* Location of starting group */
+    H5O_type_t otype;               /* Basic object type (group, dataset, etc.) */
+    unsigned rc;		    /* Reference count of object    */
+    herr_t      ret_value;          /* Return value */
+
+    FUNC_ENTER_NOAPI(H5G_visit, FAIL)
+
+    /* Check args */
+    if(H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+    /* Open the group to begin visiting within */
+    if((grp = H5G_open_name(&loc, group_name, lapl_id, dxpl_id)) == NULL)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
+
+    /* Register an ID for the starting group */
+    if((gid = H5I_register(H5I_GROUP, grp)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+
+    /* Get the location of the starting group */
+    if(H5G_loc(gid, &start_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+    /* Set up user data */
+    udata.gid = gid;
+    udata.curr_loc = &start_loc;
+    udata.lapl_id = lapl_id;
+    udata.dxpl_id = dxpl_id;
+    udata.idx_type = idx_type;
+    udata.order = order;
+    udata.op = op;
+    udata.op_data = op_data;
+
+    /* Allocate space for the path name */
+    if(NULL == (udata.path = H5MM_strdup("")))
+        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate path name buffer")
+    udata.path_buf_size = 1;
+    udata.curr_path_len = 0;
+
+    /* Create skip list to store visited object information */
+    if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, 0.5, (size_t)16)) == NULL)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
+
+    /* Get the group's reference count and type */
+    if(H5O_get_rc_and_type(&grp->oloc, dxpl_id, &rc, &otype) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object info")
+
+    /* If its ref count is > 1, we add it to the list of visited objects */
+    /* (because it could come up again during traversal) */
+    if(rc > 1) {
+        H5_obj_t *obj_pos;                  /* New object node for visited list */
+
+        /* Allocate new object "position" node */
+        if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+            HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate object node")
+
+        /* Construct unique "position" for this object */
+        H5F_GET_FILENO(grp->oloc.file, obj_pos->fileno);
+        obj_pos->addr = grp->oloc.addr;
+
+        /* Add to list of visited objects */
+        if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
+    } /* end if */
+
+    /* Attempt to get the link info for this group */
+    if(H5G_obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) {
+        /* Check for creation order tracking, if creation order index lookup requested */
+        if(idx_type == H5_INDEX_CRT_ORDER) {
+            /* Check if creation order is tracked */
+            if(!linfo.track_corder)
+                /* Switch to name order for this group */
+                idx_type = H5_INDEX_NAME;
+        } /* end if */
+        else
+            HDassert(idx_type == H5_INDEX_NAME);
+    } /* end if */
+    else {
+        /* Clear error stack from not finding the link info message */
+        H5E_clear_stack(NULL);
+
+        /* Can only perform name lookups on groups with symbol tables */
+        if(idx_type != H5_INDEX_NAME)
+            /* Switch to name order for this group */
+            idx_type = H5_INDEX_NAME;
+    } /* end if */
+
+    /* Call the link iteration routine */
+    if((ret_value = H5G_obj_iterate(&(grp->oloc), idx_type, order, (hsize_t)0, NULL, H5G_visit_cb, &udata, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't visit links")
+
+done:
+    /* Release user data resources */
+    H5MM_xfree(udata.path);
+    if(udata.visited)
+        H5SL_destroy(udata.visited, H5G_free_visit_visited, NULL);
+
+    /* Release the group opened */
+    if(gid > 0) {
+        if(H5I_dec_ref(gid) < 0)
+            HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+    } /* end if */
+    else if(grp && H5G_close(grp) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_visit() */
+
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index 042d29a..b0340a7 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -406,9 +406,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_compact_iterate(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, 
+H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, 
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    hid_t gid, H5G_link_iterate_t *lnk_op, void *op_data)
+    H5G_lib_iterate_t op, void *op_data)
 {
     H5G_link_table_t    ltable = {0, NULL};     /* Link table */
     herr_t		ret_value;              /* Return value */
@@ -418,14 +418,14 @@ H5G_compact_iterate(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
     /* Sanity check */
     HDassert(oloc);
     HDassert(linfo);
-    HDassert(lnk_op && lnk_op->u.lib_op);
+    HDassert(op);
 
     /* Build table of all link messages */
     if(H5G_compact_build_table(oloc, dxpl_id, linfo, idx_type, order, <able) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
 
     /* Iterate over links in table */
-    if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, gid, lnk_op, op_data)) < 0)
+    if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, op, op_data)) < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
 done:
diff --git a/src/H5Gdense.c b/src/H5Gdense.c
index 2b7493b..ed53a47 100644
--- a/src/H5Gdense.c
+++ b/src/H5Gdense.c
@@ -90,9 +90,8 @@ typedef struct {
     hsize_t     count;                  /* # of links examined               */
 
     /* downward (from application) */
-    hid_t       gid;                    /* Group ID for application callback */
     hsize_t     skip;                   /* Number of links to skip           */
-    const H5G_link_iterate_t *lnk_op;   /* Callback for each link            */
+    H5G_lib_iterate_t op;               /* Callback for each link            */
     void        *op_data;               /* Callback data for each link       */
 
     /* upward */
@@ -799,7 +798,6 @@ H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     /* Allocate space for the table entries */
     if(ltable->nlinks > 0) {
         H5G_dense_bt_ud_t udata;       /* User data for iteration callback */
-        H5G_link_iterate_t lnk_op;      /* Link operator */
 
         /* Allocate the table to store the links */
         if((ltable->lnks = H5MM_malloc(sizeof(H5O_link_t) * ltable->nlinks)) == NULL)
@@ -809,12 +807,8 @@ H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
         udata.ltable = ltable;
         udata.curr_lnk = 0;
 
-        /* Build iterator operator */
-        lnk_op.op_type = H5G_LINK_OP_LIB;
-        lnk_op.u.lib_op = H5G_dense_build_table_cb;
-
         /* Iterate over the links in the group, building a table of the link messages */
-        if(H5G_dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, (hid_t)0, &lnk_op, &udata) < 0)
+        if(H5G_dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_dense_build_table_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
 
         /* Sort link table in correct iteration order */
@@ -904,32 +898,8 @@ H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
                 H5G_dense_iterate_fh_cb, &fh_udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTOPERATE, H5_ITER_ERROR, "heap op callback failed")
 
-        /* Check which type of callback to make */
-        switch(bt2_udata->lnk_op->op_type) {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-            case H5G_LINK_OP_OLD:
-                /* Make the old-type application callback */
-                ret_value = (bt2_udata->lnk_op->u.old_op)(bt2_udata->gid, fh_udata.lnk->name, bt2_udata->op_data);
-                break;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-            case H5G_LINK_OP_APP:
-                {
-                    H5L_info_t info;    /* Link info */
-
-                    /* Retrieve the info for the link */
-                    if(H5G_link_to_info(fh_udata.lnk, &info) < 0)
-                        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
-
-                    /* Make the application callback */
-                    ret_value = (bt2_udata->lnk_op->u.app_op)(bt2_udata->gid, fh_udata.lnk->name, &info, bt2_udata->op_data);
-                }
-                break;
-
-            case H5G_LINK_OP_LIB:
-                /* Call the library's callback */
-                ret_value = (bt2_udata->lnk_op->u.lib_op)(fh_udata.lnk, bt2_udata->op_data);
-        } /* end switch */
+        /* Make the callback */
+        ret_value = (bt2_udata->op)(fh_udata.lnk, bt2_udata->op_data);
 
         /* Release the space allocated for the link */
         H5O_msg_free(H5O_LINK_ID, fh_udata.lnk);
@@ -964,7 +934,7 @@ done:
 herr_t
 H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    hid_t gid, const H5G_link_iterate_t *lnk_op, void *op_data)
+    H5G_lib_iterate_t op, void *op_data)
 {
     H5HF_t *fheap = NULL;               /* Fractal heap handle */
     H5G_link_table_t ltable = {0, NULL};      /* Table of links */
@@ -979,7 +949,7 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
      */
     HDassert(f);
     HDassert(linfo);
-    HDassert(lnk_op && lnk_op->u.lib_op);
+    HDassert(op);
 
     /* Determine the address of the index to use */
     if(idx_type == H5_INDEX_NAME) {
@@ -1018,10 +988,9 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
         udata.f = f;
         udata.dxpl_id = dxpl_id;
         udata.fheap = fheap;
-        udata.gid = gid;
         udata.skip = skip;
         udata.count = 0;
-        udata.lnk_op = lnk_op;
+        udata.op = op;
         udata.op_data = op_data;
 
         /* Iterate over the records in the v2 B-tree's "native" order */
@@ -1039,7 +1008,7 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
 
         /* Iterate over links in table */
-        if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, gid, lnk_op, op_data)) < 0)
+        if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, op, op_data)) < 0)
             HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index bc635be..ffcc0e5 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -771,10 +771,10 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
 
     /* Build link operator info */
     lnk_op.op_type = H5G_LINK_OP_OLD;
-    lnk_op.u.old_op = op;
+    lnk_op.op_func.op_old = op;
 
     /* Call private function. */
-    if((ret_value = H5G_obj_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed")
 
     /* Set the index we stopped at */
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 7292245..75a3e83 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -603,7 +603,7 @@ H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
  */
 herr_t
 H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
-    hsize_t *last_lnk, hid_t gid, const H5G_link_iterate_t *lnk_op, void *op_data)
+    hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data)
 {
     size_t u;                           /* Local index variable */
     herr_t ret_value = H5_ITER_CONT;   /* Return value */
@@ -612,7 +612,7 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
 
     /* Sanity check */
     HDassert(ltable);
-    HDassert(lnk_op);
+    HDassert(op);
 
     /* Skip over links, if requested */
     if(last_lnk)
@@ -621,32 +621,8 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
     /* Iterate over link messages */
     H5_ASSIGN_OVERFLOW(/* To: */ u, /* From: */ skip, /* From: */ hsize_t, /* To: */ size_t)
     for(; u < ltable->nlinks && !ret_value; u++) {
-        /* Check which kind of callback to make */
-        switch(lnk_op->op_type) {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-            case H5G_LINK_OP_OLD:
-                /* Make the old-type application callback */
-                ret_value = (lnk_op->u.old_op)(gid, ltable->lnks[u].name, op_data);
-                break;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-            case H5G_LINK_OP_APP:
-                {
-                    H5L_info_t info;    /* Link info */
-
-                    /* Retrieve the info for the link */
-                    if(H5G_link_to_info(&(ltable->lnks[u]), &info) < 0)
-                        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
-
-                    /* Make the application callback */
-                    ret_value = (lnk_op->u.app_op)(gid, ltable->lnks[u].name, &info, op_data);
-                }
-                break;
-
-            case H5G_LINK_OP_LIB:
-                /* Call the library's callback */
-                ret_value = (lnk_op->u.lib_op)(&(ltable->lnks[u]), op_data);
-        } /* end switch */
+        /* Make the callback */
+        ret_value = (op)(&(ltable->lnks[u]), op_data);
 
         /* Increment the number of entries passed through */
         if(last_lnk)
@@ -657,7 +633,6 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
     if(ret_value < 0)
         HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_link_iterate_table() */
 
diff --git a/src/H5Gname.c b/src/H5Gname.c
index e341ee7..bde9e23 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -50,21 +50,15 @@ typedef struct H5G_names_t {
 } H5G_names_t;
 
 /* Info to pass to the iteration function when building name */
-typedef struct H5G_ref_path_iter_t {
+typedef struct H5G_gnba_iter_t {
     /* In */
-    hid_t file; 		/* File id where it came from */
+    const H5O_loc_t *loc; 	/* The location of the object we're looking for */
     hid_t lapl_id; 		/* LAPL for operations */
     hid_t dxpl_id; 		/* DXPL for operations */
-    hbool_t is_root_group; 	/* Flag to indicate that the root group is being looked at */
-    const H5O_loc_t *loc; 	/* The location of the object we're looking for */
-
-    /* In/Out */
-    H5SL_t *ref_path_table;     /* Skip list for tracking visited nodes */
-    size_t max_container_len;   /* Maximum size of container */
 
     /* Out */
-    char *container;            /* full name of the container object */
-} H5G_ref_path_iter_t;
+    char *path;                 /* Name of the object */
+} H5G_gnba_iter_t;
 
 /* Private macros */
 
@@ -85,9 +79,6 @@ static H5RS_str_t *H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r,
 static herr_t H5G_name_move_path(H5RS_str_t **path_r_ptr,
     const char *full_suffix, const char *src_path, const char *dst_path);
 static int H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key);
-static herr_t H5G_refname_iterator(hid_t group, const char *name,
-    const H5L_info_t *link_info, void *_udata);
-static herr_t H5G_free_ref_path_node(void *item, void *key, void *operator_data/*in,out*/);
 
 
 /*-------------------------------------------------------------------------
@@ -468,7 +459,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
 		HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve file ID")
 
             /* Search for name of object */
-	    if((len = H5G_get_refobj_name(file, lapl_id, dxpl_id, loc.oloc, name, size)) < 0) {
+	    if((len = H5G_get_name_by_addr(file, lapl_id, dxpl_id, loc.oloc, name, size)) < 0) {
                 H5I_dec_ref(file);
 		HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name")
             } /* end if */
@@ -1039,222 +1030,139 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5G_refname_iterator
+ * Function:    H5G_get_name_by_addr_cb
  *
- * Purpose:     The iterator which traverses all objects in a file looking for
- * 		one that matches the object that is being looked for.
+ * Purpose:     Callback for retrieving object's name by address
  *
- * Return:      1 on success, 0 to continue searching, negative on failure.
- *
- * Programmer:  Leon Arber, Nov 1, 2006.
+ * Return:      Positive if path is for object desired
+ * 		0 if not correct object
+ * 		negative on failure.
  *
- * Modifications:
- * 		Quincey Koziol, Nov. 3, 2006
- * 		Cleaned up code.
+ * Programmer:	Quincey Koziol
+ *		November 4 2007
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_refname_iterator(hid_t group, const char *name, const H5L_info_t *link_info,
+H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
     void *_udata)
 {
-    H5G_ref_path_iter_t *udata = (H5G_ref_path_iter_t*)_udata;
-    herr_t ret_value = H5_ITER_CONT;       /* Return value */
-    
-    FUNC_ENTER_NOAPI_NOINIT(H5G_refname_iterator)
-    
-    /* We only care about hard links */
-    if(link_info->type == H5L_TYPE_HARD) {
-        H5G_loc_t loc;              /* Group location of parent */
-
-        /* Look up group's location */
-        if(H5G_loc(group, &loc) < 0)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5_ITER_ERROR, "not a location")
-
-        /* Check for finding the object */
-        /* (checks against the file in the location as well, to make certain that
-         *  the correct object is found in a mounted file hierarchy)
-         */
-        if(udata->loc->addr == link_info->u.address && udata->loc->file == loc.oloc->file) {
-            size_t len_needed;              /* Length of container string needed */
-
-            /* Build the object's full name */
-            len_needed = HDstrlen(udata->container) + HDstrlen(name) + 2;
-            if(len_needed > udata->max_container_len) {
-                void *new_container;    /* Pointer to new container */
-
-                if(NULL == (new_container = H5MM_realloc(udata->container, len_needed)))
-                    HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
-                udata->container = new_container;
-                udata->max_container_len = len_needed;
-            } /* end if */
-            HDstrcat(udata->container, name); 
+    H5G_gnba_iter_t *udata = (H5G_gnba_iter_t *)_udata; /* User data for iteration */
+    H5G_loc_t   obj_loc;                /* Location of object */
+    H5G_name_t  obj_path;            	/* Object's group hier. path */
+    H5O_loc_t   obj_oloc;            	/* Object's object location */
+    hbool_t     obj_found = FALSE;      /* Object at 'path' found */
+    herr_t ret_value = H5_ITER_CONT;    /* Return value */
 
-            /* We found a match so we return immediately */
-            HGOTO_DONE(H5_ITER_STOP)
-        } /* end if */
-        else {
-            H5O_info_t oinfo;   /* Object information */
-            H5O_loc_t tmp_oloc; /* Temporary object location */
+    FUNC_ENTER_NOAPI_NOINIT(H5G_get_name_by_addr_cb)
 
-            /* Check if we've seen this object before */
-            if(H5SL_search(udata->ref_path_table, &link_info->u.address))
-                HGOTO_DONE(H5_ITER_CONT)
+    /* Sanity check */
+    HDassert(path);
+    HDassert(linfo);
+    HDassert(udata->loc);
+    HDassert(udata->path == NULL);
 
-            /* Go retrieve the object information */
-            tmp_oloc.file = loc.oloc->file;
-            tmp_oloc.addr = link_info->u.address;
-            if(H5O_get_info(&tmp_oloc, udata->dxpl_id, FALSE, &oinfo) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
+    /* Check for hard link with correct address */
+    if(linfo->type == H5L_TYPE_HARD && udata->loc->addr == linfo->u.address) {
+        H5G_loc_t	grp_loc;                /* Location of group */
 
-            /* If its ref count is > 1, we add it to the list of visited objects */
-            if(oinfo.rc > 1) {
-                haddr_t *new_node;                  /* New path node for table */
+        /* Get group's location */
+        if(H5G_loc(gid, &grp_loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5_ITER_ERROR, "bad group location")
 
-                /* Allocate new path node */
-                if((new_node = H5FL_MALLOC(haddr_t)) == NULL)
-                    HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path node")
+        /* Set up opened object location to fill in */
+        obj_loc.oloc = &obj_oloc;
+        obj_loc.path = &obj_path;
+        H5G_loc_reset(&obj_loc);
 
-                /* Set node information */
-                *new_node = link_info->u.address;
+        /* Find the object */
+        if(H5G_loc_find(&grp_loc, path, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
+        obj_found = TRUE;
 
-                /* Insert into skip list */
-                if(H5SL_insert(udata->ref_path_table, new_node, new_node) < 0)
-                    HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert path node into table")
-            } /* end if */
+        /* Check for object in same file (handles mounted files) */
+        /* (re-verify address, in case we traversed a file mount) */
+        if(udata->loc->addr == obj_loc.oloc->addr && udata->loc->file == obj_loc.oloc->file) {
+            udata->path = H5MM_strdup(path);
 
-            /* If it's a group, we recurse into it */
-            if(oinfo.type == H5O_TYPE_GROUP) {
-                H5G_link_iterate_t lnk_op;          /* Link operator */
-                hsize_t last_obj;
-                size_t len_needed;                  /* Length of container string needed */
-                size_t len;
-
-                /* Build full path name of group to recurse into */
-                len = HDstrlen(udata->container);
-                len_needed = len + HDstrlen(name) + 2;
-                if(len_needed > udata->max_container_len) {
-                    void *new_container;    /* Pointer to new container */
-
-                    if(NULL == (new_container = H5MM_realloc(udata->container, len_needed)))
-                        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
-                    udata->container = new_container;
-                    udata->max_container_len = len_needed;
-                } /* end if */
-                if(!udata->is_root_group)
-                    HDstrcat(udata->container, name); 
-                else
-                    udata->is_root_group = FALSE;
-                HDstrcat(udata->container, "/"); 
-                    
-                /* Build iterator operator */
-                lnk_op.op_type = H5G_LINK_OP_APP;
-                lnk_op.u.app_op = H5G_refname_iterator;
-
-                ret_value = H5G_obj_iterate(udata->file, udata->container, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, &last_obj, &lnk_op, udata, udata->lapl_id, udata->dxpl_id);
-                
-                /* If we didn't find the object, truncate the name to not include group name anymore */
-                if(!ret_value)
-                    udata->container[len] = '\0'; 
-            } /* end if */
-        } /* end else */
+            /* We found a match so we return immediately */
+            HGOTO_DONE(H5_ITER_STOP)
+        } /* end if */
     } /* end if */
+   
+done:    
+    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+        HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_refname_iterator() */
+} /* end H5G_get_name_by_addr_cb() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5G_free_ref_path_node
- *
- * Purpose:     Free the key for a reference path table node
- *
- * Return:      Non-negative on success, negative on failure
+ * Function:    H5G_get_name_by_addr
  *
- * Programmer:  Quincey Koziol
- *
- * Modifications:
- * 		Leon Arber, Oct. 25, 2006.  Moved into H5G from h5ls
- * 		tools lib for looking up path to reference.
- *
- * 		Quincey Koziol, Nov. 3, 2006
- * 		Cleaned up code.
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_free_ref_path_node(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_free_ref_path_node)
-
-    H5FL_FREE(haddr_t, item);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_free_ref_path_node() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5G_get_refobj_name
- *
- * Purpose:     Tries to figure out the path to a reference.
+ * Purpose:     Tries to figure out the path to an object from it's address
  *
  * Return:      returns size of path name, and copies it into buffer
  * 		pointed to by name if that buffer is big enough.
  * 		0 if it cannot find the path
  * 		negative on failure.
  *
- * Programmer:  Leon Arber, Nov 1, 2006.
- *
- * Modifications:
- * 		Quincey Koziol, Nov. 3, 2006
- * 		Cleaned up code.
+ * Programmer:	Quincey Koziol
+ *		November 4 2007
  *
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5G_get_refobj_name(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *loc,
+H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *loc,
     char *name, size_t size)
 {
-    H5G_ref_path_iter_t udata;  /* User data for iteration */
-    H5G_loc_t root_loc;         /* Root location */
-    H5L_info_t root_info;       /* Link info for root group */
+    H5G_gnba_iter_t udata;      /* User data for iteration */
+    H5G_loc_t root_loc;         /* Root group's location */
+    hbool_t found_obj = FALSE;  /* If we found the object */
     herr_t status;              /* Status from iteration */
     ssize_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI(H5G_get_refobj_name, FAIL)
+    FUNC_ENTER_NOAPI(H5G_get_name_by_addr, FAIL)
 
-    /* Construct the link info for the root group */
+    /* Construct the link info for the file's root group */
     if(H5G_loc(file, &root_loc) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get root group's location")
-    HDmemset(&root_info, 0, sizeof(root_info));
-    root_info.type = H5L_TYPE_HARD;
-    root_info.u.address = root_loc.oloc->addr;
-
-    /* Set up user data for iterator */
-    udata.file = file;
-    udata.lapl_id = lapl_id;
-    udata.dxpl_id = dxpl_id;
-    udata.is_root_group = TRUE;
-    if(NULL == (udata.container = H5MM_strdup("")))
-        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate root group name")
-    udata.max_container_len = 1;
-    udata.loc = loc;
-    
-    /* Create skip list to store reference path information */
-    if((udata.ref_path_table = H5SL_create(H5SL_TYPE_HADDR, 0.5, (size_t)16)) == NULL)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "can't create skip list for path nodes")
-
-    /* Iterate over all the objects in the file */
-    if((status = H5G_refname_iterator(file, "/", &root_info, &udata)) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed while looking for object name")
-    else if(status > 0) {
+
+    /* Check for root group being the object looked for */
+    if(root_loc.oloc->addr == loc->addr && root_loc.oloc->file == loc->file) {
+        udata.path = H5MM_strdup("");
+        found_obj = TRUE;
+    } /* end if */
+    else {
+        /* Set up user data for iterator */
+        udata.loc = loc;
+        udata.lapl_id = lapl_id;
+        udata.dxpl_id = dxpl_id;
+        udata.path = NULL;
+        
+        /* Visit all the links in the file */
+        if((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata, lapl_id, dxpl_id)) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group traversal failed while looking for object name")
+        else if(status > 0)
+            found_obj = TRUE;
+    } /* end else */
+
+    /* Check for finding the object */
+    if(found_obj) {
+        size_t full_path_len = HDstrlen(udata.path) + 1;        /* Length of path + 1 (for "/") */
+
         /* Set the length of the full path */
-        ret_value = HDstrlen(udata.container);
+        ret_value = full_path_len;
 
         /* If there's a buffer provided, copy into it, up to the limit of its size */
         if(name) {
-            HDstrncpy(name, udata.container, size);
+            /* Copy the initial path separator */
+            HDstrcpy(name, "/");
+
+            /* Append the rest of the path */
+            /* (less one character, for the initial path separator) */
+            HDstrncat(name, udata.path, (size - 1));
             if((size_t)ret_value >= size)
                 name[size - 1] = '\0';
         } /* end if */
@@ -1264,10 +1172,8 @@ H5G_get_refobj_name(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *l
    
 done:    
     /* Release resources */
-    H5MM_xfree(udata.container);
-    if(udata.ref_path_table)
-        H5SL_destroy(udata.ref_path_table, H5G_free_ref_path_node, NULL);
+    H5MM_xfree(udata.path);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_get_refobj_name() */
+} /* end H5G_get_name_by_addr() */
 
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 442cbf2..86585a0 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -1275,51 +1275,23 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
         if(udata->skip > 0)
             --udata->skip;
         else {
-            const char		*name;  /* Pointer to link name in heap */
+            H5O_link_t lnk;     /* Link for entry */
+            const char *name;   /* Pointer to link name in heap */
 
             /* Get the pointer to the name of the link in the heap */
             name = H5HL_offset_into(f, udata->heap, ents[u].name_off);
             HDassert(name);
 
-            /* Check which type of callback to make */
-            switch(udata->lnk_op->op_type) {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-                case H5G_LINK_OP_OLD:
-                    /* Make the old-type application callback */
-                    ret_value = (udata->lnk_op->u.old_op)(udata->group_id, name, udata->op_data);
-                    break;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-                case H5G_LINK_OP_APP:
-                    {
-                        H5L_info_t info;        /* Link info for entry */
-
-                        /* Make a link info for an entry */
-                        if(H5G_ent_to_info(f, &info, udata->heap, &ents[u]) < 0)
-                            HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for symbol table entry")
-
-                        /* Make the application callback */
-                        ret_value = (udata->lnk_op->u.app_op)(udata->group_id, name, &info, udata->op_data);
-                    }
-                    break;
-
-                case H5G_LINK_OP_LIB:
-                    /* Call the library's callback */
-                    {
-                        H5O_link_t lnk;         /* Link for entry */
-
-                        /* Convert the entry to a link */
-                        if(H5G_ent_to_link(f, &lnk, udata->heap, &ents[u], name) < 0)
-                            HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
-
-                        /* Call the library's callback */
-                        ret_value = (udata->lnk_op->u.lib_op)(&lnk, udata->op_data);
-
-                        /* Release memory for link object */
-                        if(H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
-                            HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, H5_ITER_ERROR, "unable to release link message")
-                    }
-            } /* end switch */
+            /* Convert the entry to a link */
+            if(H5G_ent_to_link(f, &lnk, udata->heap, &ents[u], name) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
+
+            /* Make the callback */
+            ret_value = (udata->op)(&lnk, udata->op_data);
+
+            /* Release memory for link object */
+            if(H5O_msg_reset(H5O_LINK_ID, &lnk) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, H5_ITER_ERROR, "unable to release link message")
         } /* end else */
 
         /* Increment the number of entries passed through */
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index 00bac73..8ca8c52 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -533,7 +533,6 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
             H5O_linfo_t new_linfo = H5G_CRT_LINK_INFO_DEF;  /* Link information */
             H5O_ginfo_t new_ginfo = H5G_CRT_GROUP_INFO_DEF; /* Group information */
             H5G_obj_stab_it_ud1_t udata;        /* User data for iteration */
-            H5G_link_iterate_t lnk_op;          /* Link operator */
 
             /* Convert group to "new format" group, in order to hold the information */
 
@@ -549,12 +548,8 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
             udata.grp_oloc = grp_oloc;
             udata.dxpl_id = dxpl_id;
 
-            /* Build iterator operator */
-            lnk_op.op_type = H5G_LINK_OP_LIB;
-            lnk_op.u.lib_op = H5G_obj_stab_to_new_cb;
-
             /* Iterate through all links in "old format" group and insert them into new format */
-            if(H5G_stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, (hid_t)0, &lnk_op, &udata) < 0)
+            if(H5G_stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_obj_stab_to_new_cb, &udata) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over old format links")
 
             /* Remove the symbol table message from the group */
@@ -636,36 +631,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_obj_iterate(hid_t loc_id, const char *group_name,
+H5G_obj_iterate(const H5O_loc_t *grp_oloc,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
+    H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id)
 {
-    H5G_loc_t	loc;            /* Location of parent for group */
     H5O_linfo_t	linfo;		/* Link info message */
-    hid_t gid = -1;             /* ID of group to iterate over */
-    H5G_t *grp;                 /* Pointer to group data structure to iterate over */
     herr_t ret_value;           /* Return value */
 
     FUNC_ENTER_NOAPI(H5G_obj_iterate, FAIL)
 
     /* Sanity check */
-    HDassert(group_name);
-    HDassert(last_lnk);
-    HDassert(lnk_op && lnk_op->u.lib_op);
-
-    /*
-     * Open the group on which to operate.  We also create a group ID which
-     * we can pass to the application-defined operator.
-     */
-    if(H5G_loc(loc_id, &loc) < 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(NULL == (grp = H5G_open_name(&loc, group_name, lapl_id, dxpl_id)))
-        HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-    if((gid = H5I_register(H5I_GROUP, grp)) < 0)
-        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+    HDassert(grp_oloc);
+    HDassert(op);
 
     /* Attempt to get the link info for this group */
-    if(H5G_obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) {
+    if(H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) {
         /* Check for going out of bounds */
         if(skip > 0 && (size_t)skip >= linfo.nlinks)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
@@ -679,13 +659,13 @@ H5G_obj_iterate(hid_t loc_id, const char *group_name,
 
         if(H5F_addr_defined(linfo.fheap_addr)) {
             /* Iterate over the links in the group, building a table of the link messages */
-            if((ret_value = H5G_dense_iterate(grp->oloc.file, dxpl_id, &linfo, idx_type, order, skip, last_lnk, gid, lnk_op, op_data)) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
+            if((ret_value = H5G_dense_iterate(grp_oloc->file, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over dense links")
         } /* end if */
         else {
             /* Get the object's name from the link messages */
-            if((ret_value = H5G_compact_iterate(&(grp->oloc), dxpl_id, &linfo, idx_type, order, skip, last_lnk, gid, lnk_op, op_data)) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over links")
+            if((ret_value = H5G_compact_iterate(grp_oloc, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over compact links")
         } /* end else */
     } /* end if */
     else {
@@ -697,14 +677,11 @@ H5G_obj_iterate(hid_t loc_id, const char *group_name,
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
 
         /* Iterate over symbol table */
-        if((ret_value = H5G_stab_iterate(&(grp->oloc), dxpl_id, order, skip, last_lnk, gid, lnk_op, op_data)) < 0)
+        if((ret_value = H5G_stab_iterate(grp_oloc, dxpl_id, order, skip, last_lnk, op, op_data)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over symbol table")
     } /* end else */
 
 done:
-    if(gid > 0)
-        H5I_dec_ref(gid); /*also closes 'grp'*/
-
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_obj_iterate() */
 
@@ -904,7 +881,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
                 if(can_convert) {
                     /* Insert link messages into group */
                     for(u = 0; u < linfo->nlinks; u++)
-                        if(H5O_msg_append(oloc->file, dxpl_id, oh, H5O_LINK_ID, 0, H5O_UPDATE_TIME, &(ltable.lnks[u])) < 0) {
+                        if(H5O_msg_append_oh(oloc->file, dxpl_id, oh, H5O_LINK_ID, 0, H5O_UPDATE_TIME, &(ltable.lnks[u])) < 0) {
                             /* Release object header */
                             if(H5O_unprotect(oloc, oh) < 0)
                                 HDONE_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to unprotect dataset object header")
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index cc017b9..53692c5 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -132,18 +132,16 @@ typedef herr_t (*H5G_lib_iterate_t)(const H5O_link_t *lnk, void *op_data);
 typedef struct {
     enum {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        H5G_LINK_OP_OLD,                /* Old application callback */
+        H5G_LINK_OP_OLD,                /* "Old" application callback */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-        H5G_LINK_OP_APP,                /* Application callback */
-        H5G_LINK_OP_LIB                 /* Library internal callback */
+        H5G_LINK_OP_NEW                 /* "New" application callback */
     } op_type;
     union {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        H5G_iterate_t old_op;           /* Old application callback for each link */
+        H5G_iterate_t op_old;           /* "Old" application callback for each link */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-        H5L_iterate_t app_op;           /* Application callback for each link */
-        H5G_lib_iterate_t lib_op;       /* Library internal callback for each link */
-    } u;
+        H5L_iterate_t op_new;           /* "New" application callback for each link */
+    } op_func;
 } H5G_link_iterate_t;
 
 /* Data structure to hold table of links for a group */
@@ -208,10 +206,9 @@ typedef struct H5G_bt_lkp_t {
  */
 typedef struct H5G_bt_it_it_t {
     /* downward */
-    hid_t	group_id;	/*group id to pass to iteration operator     */
     H5HL_t      *heap;          /*symbol table heap 			     */
     hsize_t	skip;		/*initial entries to skip		     */
-    H5G_link_iterate_t *lnk_op;	/*iteration operator			     */
+    H5G_lib_iterate_t op;	/*iteration operator			     */
     void	*op_data;	/*user-defined operator data		     */
 
     /* upward */
@@ -337,6 +334,9 @@ H5_DLL H5G_t *H5G_create_named(const H5G_loc_t *loc, const char *name,
     hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id);
 H5_DLL H5G_t *H5G_open_name(const H5G_loc_t *loc, const char *name,
     hid_t gapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G_iterate(hid_t loc_id, const char *group_name,
+    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
+    const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
 
 /*
  * Group hierarchy traversal routines
@@ -369,9 +369,8 @@ H5_DLL herr_t H5G_stab_insert(const H5O_loc_t *grp_oloc, const char *name,
 H5_DLL herr_t H5G_stab_insert_real(H5F_t *f, H5O_stab_t *stab, const char *name,
     H5O_link_t *obj_lnk, hid_t dxpl_id);
 H5_DLL herr_t H5G_stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab);
-H5_DLL herr_t H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id,
-    H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, hid_t gid,
-    H5G_link_iterate_t *lnk_op, void *op_data);
+H5_DLL herr_t H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
+    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
 H5_DLL herr_t H5G_stab_count(struct H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id);
 H5_DLL herr_t H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
     H5_ih_info_t *bh_info);
@@ -439,8 +438,7 @@ H5_DLL herr_t H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id,
 H5_DLL herr_t H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
     H5_iter_order_t order);
 H5_DLL herr_t H5G_link_iterate_table(const H5G_link_table_t *ltable,
-    hsize_t skip, hsize_t *last_lnk, hid_t gid, const H5G_link_iterate_t *lnk_op,
-    void *op_data);
+    hsize_t skip, hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data);
 H5_DLL herr_t H5G_link_release_table(H5G_link_table_t *ltable);
 H5_DLL herr_t H5G_link_name_replace(H5F_t *file, hid_t dxpl_id,
     H5RS_str_t *grp_full_path_r, const H5O_link_t *lnk);
@@ -456,9 +454,9 @@ H5_DLL herr_t H5G_compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
 H5_DLL herr_t H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
     const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
     H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G_compact_iterate(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, 
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    hid_t gid, H5G_link_iterate_t *lnk_op, void *op_data);
+H5_DLL herr_t H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id,
+    const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
+    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
 H5_DLL herr_t H5G_compact_lookup(H5O_loc_t *grp_oloc, const char *name,
     H5O_link_t *lnk, hid_t dxpl_id);
 H5_DLL herr_t H5G_compact_lookup_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
@@ -482,7 +480,7 @@ H5_DLL herr_t H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id,
     hsize_t n, H5O_link_t *lnk);
 H5_DLL herr_t H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
-    hid_t gid, const H5G_link_iterate_t *lnk_op, void *op_data);
+    H5G_lib_iterate_t op, void *op_data);
 H5_DLL ssize_t H5G_dense_get_name_by_idx(H5F_t  *f, hid_t dxpl_id,
     H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
     char *name, size_t size);
@@ -505,9 +503,9 @@ H5_DLL H5O_linfo_t * H5G_obj_get_linfo(const H5O_loc_t *grp_oloc,
     H5O_linfo_t *linfo, hid_t dxpl_id);
 H5_DLL herr_t H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name,
     H5O_link_t *obj_lnk, hbool_t adj_link, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_iterate(hid_t loc_id, const char *group_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_obj,
-    H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5G_obj_iterate(const H5O_loc_t *grp_oloc,
+    H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
+    H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id);
 H5_DLL herr_t H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id);
 H5_DLL ssize_t H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
     H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id);
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 9717b77..c54f11d 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -162,6 +162,9 @@ H5_DLL herr_t H5G_unmount(H5G_t *grp);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 H5_DLL H5G_obj_t H5G_map_obj_type(H5O_type_t obj_type);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
+H5_DLL herr_t H5G_visit(hid_t loc_id, const char *group_name,
+    H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data,
+    hid_t lapl_id, hid_t dxpl_id);
 
 /*
  * These functions operate on symbol table nodes.
@@ -189,7 +192,7 @@ H5_DLL herr_t H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_dept
 H5_DLL herr_t H5G_name_free(H5G_name_t *name);
 H5_DLL ssize_t H5G_get_name(hid_t id, char *name/*out*/, size_t size,
     hid_t lapl_id, hid_t dxpl_id);
-H5_DLL ssize_t H5G_get_refobj_name(hid_t fid, hid_t lapl_id, hid_t dxpl_id,
+H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id,
     const struct H5O_loc_t *loc, char* name, size_t size);
 
 /*
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 1887943..61af068 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -484,8 +484,7 @@ done:
  */
 herr_t
 H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
-    hsize_t skip, hsize_t *last_lnk, hid_t gid,
-    H5G_link_iterate_t *lnk_op, void *op_data)
+    hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data)
 {
     H5HL_t              *heap = NULL;           /* Local heap for group */
     H5O_stab_t		stab;		        /* Info about symbol table */
@@ -496,7 +495,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
 
     /* Sanity check */
     HDassert(oloc);
-    HDassert(lnk_op && lnk_op->u.app_op);
+    HDassert(op);
 
     /* Get the B-tree info */
     if(NULL == H5O_msg_read(oloc, H5O_STAB_ID, &stab, dxpl_id))
@@ -512,11 +511,10 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
         H5G_bt_it_it_t	udata;                  /* User data to pass to B-tree callback */
 
         /* Build udata to pass through H5B_iterate() to H5G_node_iterate() */
-        udata.group_id = gid;
         udata.heap = heap;
         udata.skip = skip;
         udata.final_ent = last_lnk;
-        udata.lnk_op = lnk_op;
+        udata.op = op;
         udata.op_data = op_data;
 
         /* Iterate over the group members */
@@ -550,7 +548,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
             HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
 
         /* Iterate over links in table */
-        if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, gid, lnk_op, op_data)) < 0)
+        if((ret_value = H5G_link_iterate_table(<able, skip, last_lnk, op, op_data)) < 0)
             HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
     } /* end else */
 
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 3a7288f..bbbe26f 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -394,7 +394,6 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
 {
     H5HF_hdr_t	*hdr = NULL;            /* Fractal heap header info */
     H5HF_direct_t *dblock = NULL;       /* Fractal heap direct block info */
-    H5HF_debug_iter_ud1_t udata;        /* User data for callbacks */
     size_t	blk_prefix_size;        /* Size of prefix for block */
     size_t	amount_free;            /* Amount of free space in block */
     uint8_t	*marker = NULL;         /* Track free space for block */
@@ -450,36 +449,43 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the free space information for the heap */
-    if(H5HF_space_start(hdr, dxpl_id) < 0)
+    if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
-    /* Prepare user data for section iteration callback */
-    udata.stream = stream;
-    udata.indent = indent;
-    udata.fwidth = fwidth;
-    udata.dblock_addr = dblock->block_off;
-    udata.dblock_size = block_size;
-    udata.marker = marker;
-    udata.sect_count = 0;
-    udata.amount_free = 0;
-
-    /* Print header */
-    HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
-
-    /* Iterate over the free space sections, to detect overlaps with this block */
-    if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
-
-    /* Close the free space information */
-    if(H5HF_space_close(hdr, dxpl_id) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
-
-    /* Keep the amount of space free */
-    amount_free = udata.amount_free;
-
-    /* Check for no free space */
-    if(amount_free == 0)
-        HDfprintf(stream, "%*s\n", indent + 3, "");
+    /* If there is a free space manager for the heap, check for sections that overlap this block */
+    if(hdr->fspace) {
+        H5HF_debug_iter_ud1_t udata;        /* User data for callbacks */
+
+        /* Prepare user data for section iteration callback */
+        udata.stream = stream;
+        udata.indent = indent;
+        udata.fwidth = fwidth;
+        udata.dblock_addr = dblock->block_off;
+        udata.dblock_size = block_size;
+        udata.marker = marker;
+        udata.sect_count = 0;
+        udata.amount_free = 0;
+
+        /* Print header */
+        HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
+
+        /* Iterate over the free space sections, to detect overlaps with this block */
+        if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
+
+        /* Close the free space information */
+        if(H5HF_space_close(hdr, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
+
+        /* Keep the amount of space free */
+        amount_free = udata.amount_free;
+
+        /* Check for no free space */
+        if(amount_free == 0)
+            HDfprintf(stream, "%*s\n", indent + 3, "");
+    } /* end if */
+    else
+        amount_free = 0;
 
     HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth,
             "Percent of available space for data used:",
@@ -709,7 +715,6 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
     FILE *stream, int indent, int fwidth)
 {
     H5HF_hdr_t	*hdr = NULL;            /* Fractal heap header info */
-    H5HF_debug_iter_ud2_t udata;        /* User data for callbacks */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(H5HF_sects_debug, FAIL)
@@ -730,22 +735,27 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /* Initialize the free space information for the heap */
-    if(H5HF_space_start(hdr, dxpl_id) < 0)
+    if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
-    /* Prepare user data for section iteration callback */
-    udata.fspace = hdr->fspace;
-    udata.stream = stream;
-    udata.indent = indent;
-    udata.fwidth = fwidth;
+    /* If there is a free space manager for the heap, iterate over them */
+    if(hdr->fspace) {
+        H5HF_debug_iter_ud2_t udata;        /* User data for callbacks */
 
-    /* Iterate over all the free space sections */
-    if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
+        /* Prepare user data for section iteration callback */
+        udata.fspace = hdr->fspace;
+        udata.stream = stream;
+        udata.indent = indent;
+        udata.fwidth = fwidth;
 
-    /* Close the free space information */
-    if(H5HF_space_close(hdr, dxpl_id) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
+        /* Iterate over all the free space sections */
+        if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
+
+        /* Close the free space information */
+        if(H5HF_space_close(hdr, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
+    } /* end if */
 
 done:
     if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 461cba7..702ce08 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -692,7 +692,7 @@ H5_DLL herr_t H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
 H5_DLL hbool_t H5HF_man_iter_ready(H5HF_block_iter_t *biter);
 
 /* Free space manipulation routines */
-H5_DLL herr_t H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id);
+H5_DLL herr_t H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create);
 H5_DLL herr_t H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *node, unsigned flags);
 H5_DLL htri_t H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request,
diff --git a/src/H5HFspace.c b/src/H5HFspace.c
index 16eae51..77d8b1b 100644
--- a/src/H5HFspace.c
+++ b/src/H5HFspace.c
@@ -94,7 +94,7 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id)
+H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create)
 {
     const H5FS_section_class_t *classes[] = { /* Free space section classes implemented for fractal heap */
         H5HF_FSPACE_SECT_CLS_SINGLE,
@@ -118,19 +118,22 @@ H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info")
     } /* end if */
     else {
-        H5FS_create_t fs_create;        /* Free space creation parameters */
-
-        /* Set the free space creation parameters */
-        fs_create.client = H5FS_CLIENT_FHEAP_ID;
-        fs_create.shrink_percent = H5HF_FSPACE_SHRINK;
-        fs_create.expand_percent = H5HF_FSPACE_EXPAND;
-        fs_create.max_sect_size = hdr->man_dtable.cparam.max_direct_size;
-        fs_create.max_sect_addr = hdr->man_dtable.cparam.max_index;
-
-        /* Create the free space structure for the heap */
-        if(NULL == (hdr->fspace = H5FS_create(hdr->f, dxpl_id, &hdr->fs_addr,
-                &fs_create, NELMTS(classes), classes, hdr)))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info")
+        /* Check if we are allowed to create the free space manager */
+        if(may_create) {
+            H5FS_create_t fs_create;        /* Free space creation parameters */
+
+            /* Set the free space creation parameters */
+            fs_create.client = H5FS_CLIENT_FHEAP_ID;
+            fs_create.shrink_percent = H5HF_FSPACE_SHRINK;
+            fs_create.expand_percent = H5HF_FSPACE_EXPAND;
+            fs_create.max_sect_size = hdr->man_dtable.cparam.max_direct_size;
+            fs_create.max_sect_addr = hdr->man_dtable.cparam.max_index;
+
+            /* Create the free space structure for the heap */
+            if(NULL == (hdr->fspace = H5FS_create(hdr->f, dxpl_id, &hdr->fs_addr,
+                    &fs_create, NELMTS(classes), classes, hdr)))
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info")
+        } /* end if */
     } /* end else */
 
 done:
@@ -170,7 +173,7 @@ H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node,
 
     /* Check if the free space for the heap has been initialized */
     if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id) < 0)
+        if(H5HF_space_start(hdr, dxpl_id, TRUE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Construct user data */
@@ -204,7 +207,7 @@ done:
 htri_t
 H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_section_t **node)
 {
-    htri_t node_found;          /* Whether an existing free list node was found */
+    htri_t node_found = FALSE;  /* Whether an existing free list node was found */
     htri_t ret_value;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5HF_space_find)
@@ -218,12 +221,13 @@ H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_secti
 
     /* Check if the free space for the heap has been initialized */
     if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id) < 0)
+        if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Search for free space in the heap */
-    if((node_found = H5FS_sect_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap")
+    if(hdr->fspace)
+        if((node_found = H5FS_sect_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap")
 
     /* Set return value */
     ret_value = node_found;
@@ -262,12 +266,16 @@ H5HF_space_size(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t *fs_size)
 
     /* Check if the free space for the heap has been initialized */
     if(!hdr->fspace)
-        if(H5HF_space_start(hdr, dxpl_id) < 0)
+        if(H5HF_space_start(hdr, dxpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Get free space metadata size */
-    if(H5FS_size(hdr->f, hdr->fspace, fs_size) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't retrieve FS meta storage info")
+    if(hdr->fspace) {
+        if(H5FS_size(hdr->f, hdr->fspace, fs_size) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "can't retrieve FS meta storage info")
+    } /* end if */
+    else
+        *fs_size = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HL.c b/src/H5HL.c
index 1cf3c9f..358816b 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -213,87 +213,91 @@ H5HL_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * udata1,
     size_t		free_block = H5HL_FREE_NULL;
     H5HL_t		*ret_value;
 
-    FUNC_ENTER_NOAPI(H5HL_load, NULL);
+    FUNC_ENTER_NOAPI(H5HL_load, NULL)
 
     /* check arguments */
-    assert(f);
-    assert(H5F_addr_defined(addr));
-    assert(!udata1);
-    assert(!udata2);
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(!udata1);
+    HDassert(!udata2);
 
     /* Cache this for later */
-    sizeof_hdr= H5HL_SIZEOF_HDR(f);
-    assert(sizeof_hdr <= sizeof(hdr));
+    sizeof_hdr = H5HL_SIZEOF_HDR(f);
+    HDassert(sizeof_hdr <= sizeof(hdr));
 
     /* Get the local heap's header */
-    if (H5F_block_read(f, H5FD_MEM_LHEAP, addr, sizeof_hdr, dxpl_id, hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read heap header");
+    if(H5F_block_read(f, H5FD_MEM_LHEAP, addr, sizeof_hdr, dxpl_id, hdr) < 0)
+	HGOTO_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read heap header")
     p = hdr;
 
     /* Check magic number */
     if(HDmemcmp(hdr, H5HL_MAGIC, (size_t)H5HL_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap signature");
+	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap signature")
     p += H5HL_SIZEOF_MAGIC;
 
     /* Version */
-    if (H5HL_VERSION!=*p++)
-	HGOTO_ERROR (H5E_HEAP, H5E_CANTLOAD, NULL, "wrong version number in global heap");
+    if(H5HL_VERSION != *p++)
+	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "wrong version number in global heap")
 
     /* Reserved */
     p += 3;
 
     /* Allocate space in memory for the heap */
-    if (NULL==(heap = H5FL_CALLOC(H5HL_t)))
-	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+    if(NULL == (heap = H5FL_CALLOC(H5HL_t)))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* heap data size */
     H5F_DECODE_LENGTH(f, p, heap->heap_alloc);
 
     /* free list head */
     H5F_DECODE_LENGTH(f, p, free_block);
-    if (free_block != H5HL_FREE_NULL && free_block >= heap->heap_alloc)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list");
+    if(free_block != H5HL_FREE_NULL && free_block >= heap->heap_alloc)
+	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list")
 
     /* data */
     H5F_addr_decode(f, &p, &(heap->addr));
-    if (NULL==(heap->chunk = H5FL_BLK_CALLOC(heap_chunk,(sizeof_hdr + heap->heap_alloc))))
-	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
-    if (heap->heap_alloc &&
+    if(NULL == (heap->chunk = H5FL_BLK_CALLOC(heap_chunk, (sizeof_hdr + heap->heap_alloc))))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if(heap->heap_alloc &&
             H5F_block_read(f, H5FD_MEM_LHEAP, heap->addr, heap->heap_alloc, dxpl_id, heap->chunk + sizeof_hdr) < 0)
-	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to read heap data");
+	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to read heap data")
 
     /* Build free list */
-    while (H5HL_FREE_NULL != free_block) {
-	if (free_block >= heap->heap_alloc)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list");
-	if (NULL==(fl = H5FL_MALLOC(H5HL_free_t)))
-	    HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+    while(H5HL_FREE_NULL != free_block) {
+	if(free_block >= heap->heap_alloc)
+	    HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list")
+	if(NULL == (fl = H5FL_MALLOC(H5HL_free_t)))
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 	fl->offset = free_block;
 	fl->prev = tail;
 	fl->next = NULL;
-	if (tail) tail->next = fl;
+	if(tail)
+            tail->next = fl;
 	tail = fl;
-	if (!heap->freelist) heap->freelist = fl;
+	if(!heap->freelist)
+            heap->freelist = fl;
 
 	p = heap->chunk + sizeof_hdr + free_block;
+
 	H5F_DECODE_LENGTH(f, p, free_block);
-	H5F_DECODE_LENGTH(f, p, fl->size);
+	if(free_block == 0)
+	    HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "free block size is zero?")
 
+	H5F_DECODE_LENGTH(f, p, fl->size);
 	if (fl->offset + fl->size > heap->heap_alloc)
-	    HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list");
-    }
+	    HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "bad heap free list")
+    } /* end while */
 
     /* Set return value */
     ret_value = heap;
 
 done:
-    if (!ret_value && heap) {
-        if(H5HL_dest(f,heap)<0)
-	    HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy local heap collection");
-    }
+    if(!ret_value && heap)
+        if(H5HL_dest(f,heap) < 0)
+	    HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, NULL, "unable to destroy local heap collection")
 
-    FUNC_LEAVE_NOAPI(ret_value);
-}
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HL_load() */
 
 
 /*-------------------------------------------------------------------------
@@ -963,6 +967,45 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
             need_more = need_size;
 
 	new_heap_alloc = heap->heap_alloc + need_more;
+#if 0 /* JRM */ /* delete this once we are convinced that the general 
+		 * fix will do the job.
+		 */
+/*
+ * XXX: This is a _total_ hack, a real kludge. :-/  The metadata cache currently
+ *      responds very poorly when an object is inserted into the cache (or
+ *      resized) that is larger than the current cache size.  It waits through
+ *      an entire 'epoch' of cache operations to resize the cache larger (getting
+ *      _very_ poor performance), instead of immediately accommodating the large
+ *      object by increasing the cache size.
+ *
+ *      So, what we are doing here is to look at the current cache size, check
+ *      if the new local heap will overwhelm the cache and, if so, resize the
+ *      cache to be large enough to hold the new local heap block along with
+ *      leaving room for other objects in the cache.
+ *
+ *      John will be working on a fix inside the cache itself, so this special
+ *      case code here can be removed when he's finished.  - QAK, 2007/12/21
+ */
+{
+	H5AC_cache_config_t mdc_config;
+
+        /* Retrieve the current cache information */
+	mdc_config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
+	if(H5AC_get_cache_auto_resize_config(f->shared->cache, &mdc_config) < 0)
+	    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (size_t)-1, "H5AC_get_cache_auto_resize_config() failed.")
+
+        /* Check if the current cache will get blown out by adding this heap
+         * block and resize it if so.
+         */
+	if((2 * new_heap_alloc) >= mdc_config.initial_size) {
+	    mdc_config.set_initial_size = TRUE;
+	    mdc_config.initial_size = 2 * new_heap_alloc;
+
+	    if(H5AC_set_cache_auto_resize_config(f->shared->cache, &mdc_config) < 0)
+	        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (size_t)-1, "H5AC_set_cache_auto_resize_config() failed.")
+        } /* end if */
+}
+#endif /* JRM */
 	HDassert(heap->heap_alloc < new_heap_alloc);
 	H5_CHECK_OVERFLOW(heap->heap_alloc, size_t, hsize_t);
 	H5_CHECK_OVERFLOW(new_heap_alloc, size_t, hsize_t);
diff --git a/src/H5L.c b/src/H5L.c
index 238815a..bbb3996 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -1171,11 +1171,11 @@ H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
     last_lnk = 0;
 
     /* Build link operator info */
-    lnk_op.op_type = H5G_LINK_OP_APP;
-    lnk_op.u.app_op = op;
+    lnk_op.op_type = H5G_LINK_OP_NEW;
+    lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_obj_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
@@ -1243,11 +1243,11 @@ H5Literate_by_name(hid_t loc_id, const char *group_name,
     last_lnk = 0;
 
     /* Build link operator info */
-    lnk_op.op_type = H5G_LINK_OP_APP;
-    lnk_op.u.app_op = op;
+    lnk_op.op_type = H5G_LINK_OP_NEW;
+    lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_obj_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
@@ -1258,6 +1258,126 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Literate_by_name() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5Lvisit
+ *
+ * Purpose:	Recursively visit all the links in a group and all
+ *              the groups that are linked to from that group.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Each _link_ reachable from the initial group will only be
+ *              visited once.  However, because an object may be reached from
+ *              more than one link, the visitation may call the application's
+ *              callback with more than one link that points to a particular
+ *              _object_.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ * Programmer:	Quincey Koziol
+ *		November 24 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5L_iterate_t op, void *op_data)
+{
+    H5I_type_t  id_type;                /* Type of ID */
+    herr_t      ret_value;              /* Return value */
+
+    FUNC_ENTER_API(H5Lvisit, FAIL)
+    H5TRACE5("e", "iIiIox*x", grp_id, idx_type, order, op, op_data);
+
+    /* Check args */
+    id_type = H5I_get_type(grp_id);
+    if(!(H5I_GROUP == id_type || H5I_FILE == id_type))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid argument")
+    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if(!op)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
+
+    /* Call internal group visitation routine */
+    if((ret_value = H5G_visit(grp_id, ".", idx_type, order, op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Lvisit() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5Lvisit_by_name
+ *
+ * Purpose:	Recursively visit all the links in a group and all
+ *              the groups that are linked to from that group.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Each _link_ reachable from the initial group will only be
+ *              visited once.  However, because an object may be reached from
+ *              more than one link, the visitation may call the application's
+ *              callback with more than one link that points to a particular
+ *              _object_.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ * Programmer:	Quincey Koziol
+ *		November 3 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id)
+{
+    herr_t      ret_value;              /* Return value */
+
+    FUNC_ENTER_API(H5Lvisit_by_name, FAIL)
+    H5TRACE7("e", "i*sIiIox*xi", loc_id, group_name, idx_type, order, op, op_data,
+             lapl_id);
+
+    /* Check args */
+    if(!group_name || !*group_name)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if(!op)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
+    if(H5P_DEFAULT == lapl_id)
+        lapl_id = H5P_LINK_ACCESS_DEFAULT;
+    else
+        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+
+    /* Call internal group visitation routine */
+    if((ret_value = H5G_visit(loc_id, group_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
+	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Lvisit_by_name() */
+
 /*
  *-------------------------------------------------------------------------
  *-------------------------------------------------------------------------
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 1645e4b..823b046 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -170,6 +170,11 @@ H5_DLL herr_t H5Literate(hid_t grp_id, H5_index_t idx_type,
 H5_DLL herr_t H5Literate_by_name(hid_t loc_id, const char *group_name,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
     H5L_iterate_t op, void *op_data, hid_t lapl_id);
+H5_DLL herr_t H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5L_iterate_t op, void *op_data);
+H5_DLL herr_t H5Lvisit_by_name(hid_t loc_id, const char *group_name,
+    H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op,
+    void *op_data, hid_t lapl_id);
 
 /* UD link functions */
 H5_DLL herr_t H5Lcreate_ud(hid_t link_loc_id, const char *link_name,
diff --git a/src/H5MF.c b/src/H5MF.c
index ab62038..df4531e 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -21,25 +21,59 @@
  *
  * Purpose:             File memory management functions.
  *
- * Modifications:
- *      Robb Matzke, 5 Aug 1997
- *      Added calls to H5E.
- *
- * 	Robb Matzke, 8 Jun 1998
- *	Implemented a very simple free list which is not persistent and which
- *	is lossy.
- *
  *-------------------------------------------------------------------------
  */
+
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 
 
-#include "H5private.h"
-#include "H5Eprivate.h"
-#include "H5Fpkg.h"
-#include "H5FDprivate.h"
-#include "H5MFprivate.h"
-#include "H5FDmulti.h"		/*multiple files partitioned by mem usage */
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Fpkg.h"             /* File access				*/
+#include "H5MFprivate.h"	/* File memory management		*/
+
+
+/****************/
+/* Local Macros */
+/****************/
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+static hbool_t H5MF_alloc_overflow(const H5F_t *f, hsize_t size);
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
 
 
 /*-------------------------------------------------------------------------
@@ -51,16 +85,12 @@
  *		is being requested.
  *
  * Return:      Success:        The file address of new chunk.
- *
  *              Failure:        HADDR_UNDEF
  *
  * Programmer:  Robb Matzke
  *              matzke@llnl.gov
  *              Jul 11 1997
  *
- * Modifications:
- *		Robb Matzke, 1999-08-04
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 haddr_t
@@ -68,33 +98,29 @@ H5MF_alloc(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 {
     haddr_t	ret_value;
 
-    FUNC_ENTER_NOAPI(H5MF_alloc, HADDR_UNDEF);
+    FUNC_ENTER_NOAPI(H5MF_alloc, HADDR_UNDEF)
 
     /* check arguments */
-    assert(f);
-    assert(size > 0);
+    HDassert(f);
+    HDassert(size > 0);
 
     /* Fail if we don't have write access */
-    if (0==(f->intent & H5F_ACC_RDWR))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, HADDR_UNDEF, "file is read-only");
-
-    /* Check that the file can address the new space */
-    if( H5MF_alloc_overflow(f, size) )
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "not enough address space in file");
+    if(0 == (f->intent & H5F_ACC_RDWR))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, HADDR_UNDEF, "file is read-only")
 
     /* Allocate space from the virtual file layer */
-    if (HADDR_UNDEF==(ret_value=H5FD_alloc(f->shared->lf, type, dxpl_id, size)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed");
+    if(HADDR_UNDEF == (ret_value = H5FD_alloc(f->shared->lf, type, dxpl_id, size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
 
     /* Convert absolute file address to relative file address */
-    assert(ret_value>=f->shared->base_addr);
+    HDassert(ret_value >= f->shared->base_addr);
 
     /* Set return value */
     ret_value -= f->shared->base_addr;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
-}
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5MF_alloc() */
 
 
 /*-------------------------------------------------------------------------
@@ -109,44 +135,35 @@ done:
  *              matzke@llnl.gov
  *              Jul 17 1997
  *
- * Modifications:
- *		Robb Matzke, 1999-07-28
- *		The ADDR argument is passed by value
- *
- * 		Robb Matzke, 1999-08-03
- *		Modified to use the virtual file layer.
  *-------------------------------------------------------------------------
  */
 herr_t
 H5MF_xfree(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5MF_xfree);
+    FUNC_ENTER_NOAPI_NOFUNC(H5MF_xfree)
 
     /* check arguments */
-    assert(f);
-    if (!H5F_addr_defined(addr) || 0 == size)
+    HDassert(f);
+    if(!H5F_addr_defined(addr) || 0 == size)
         HGOTO_DONE(SUCCEED);
-    assert(addr!=0);
+    HDassert(addr != 0);
 
     /* Convert relative address to absolute address */
     addr += f->shared->base_addr;
 
     /* Allow virtual file layer to free block */
-    if (H5FD_free(f->shared->lf, type, dxpl_id, addr, size)<0) {
+    if(H5FD_free(f->shared->lf, type, dxpl_id, addr, size) < 0) {
 #ifdef H5MF_DEBUG
-	if (H5DEBUG(MF)) {
-	    fprintf(H5DEBUG(MF),
-		    "H5MF_free: lost %lu bytes of file storage\n",
-		    (unsigned long)size);
-	}
+	if(H5DEBUG(MF))
+	    fprintf(H5DEBUG(MF), "H5MF_free: lost %lu bytes of file storage\n", (unsigned long)size);
 #endif
-    }
+    } /* end if */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
-}
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5MF_xfree() */
 
 
 /*-------------------------------------------------------------------------
@@ -169,19 +186,11 @@ done:
  *		circumstances the library may return the same address.
  *
  * Return:	Success:	The relative file address of the new block.
- *
  * 		Failure:	HADDR_UNDEF
  *
  * Programmer:	Robb Matzke
  *              Thursday, April 16, 1998
  *
- * Modifications:
- *		Robb Matzke, 1999-07-28
- *		The ORIG_ADDR is passed by value. The name of NEW_ADDR has
- *		been changed to NEW_ADDR_P
- *
- * 		Robb Matzke, 1999-08-04
- *		Modified to work with the virtual file layer.
  *-------------------------------------------------------------------------
  */
 haddr_t
@@ -190,31 +199,25 @@ H5MF_realloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsize_t
 {
     haddr_t	ret_value;
 
-    FUNC_ENTER_NOAPI(H5MF_realloc, HADDR_UNDEF);
+    FUNC_ENTER_NOAPI(H5MF_realloc, HADDR_UNDEF)
 
     /* Convert old relative address to absolute address */
     old_addr += f->shared->base_addr;
 
-    /* Check that the file can address the new space. */
-    /* In the worst case, this means adding new_size bytes to the end of the file. */
-    if( H5MF_alloc_overflow(f, new_size) )
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "not enough address space in file");
-
     /* Reallocate memory from the virtual file layer */
-    ret_value = H5FD_realloc(f->shared->lf, type, dxpl_id, old_addr, old_size,
-			     new_size);
-    if (HADDR_UNDEF==ret_value)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "unable to allocate new file memory");
+    ret_value = H5FD_realloc(f->shared->lf, type, dxpl_id, old_addr, old_size, new_size);
+    if(HADDR_UNDEF == ret_value)
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "unable to allocate new file memory")
 
     /* Convert return value to relative address */
-    assert(ret_value>=f->shared->base_addr);
+    HDassert(ret_value >= f->shared->base_addr);
 
     /* Set return value */
     ret_value -= f->shared->base_addr;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
-}
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5MF_realloc() */
 
 
 /*-------------------------------------------------------------------------
@@ -224,8 +227,8 @@ done:
  *          F is the file whose space is being allocated, SIZE is the amount
  *          of space needed.
  *
- * Return:	0 if no overflow would result
- *          1 if overflow would result (the allocation should not be allowed)
+ * Return:	FALSE if no overflow would result
+ *          TRUE if overflow would result (the allocation should not be allowed)
  *
  * Programmer:	James Laird
  *		Nat Furrer
@@ -233,46 +236,33 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-hbool_t
+static hbool_t
 H5MF_alloc_overflow(const H5F_t *f, hsize_t size)
 {
-    hsize_t space_needed = 0;    /* Accumulator variable */
-    size_t c;                    /* Local index variable */
-    hbool_t ret_value;           /* Return value */
+    haddr_t eoa;                /* End-of-allocation in the file */
+    haddr_t space_avail;        /* Unallocated space still available in file */
+    hbool_t ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5MF_alloc_overflow)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_alloc_overflow)
 
     /* Start with the current end of the file's address. */
-    space_needed = (hsize_t)H5F_get_eoa(f);
-
-    HDassert(H5F_addr_defined(space_needed));
+    eoa = H5F_get_eoa(f);
+    HDassert(H5F_addr_defined(eoa));
 
-    /* Subtract the file's base address to get the actual amount of
-     * space being used:
-     * (end of allocated space - beginning of allocated space)
+    /* Subtract EOA from the file's maximum address to get the actual amount of
+     * addressable space left in the file.
      */
-    HDassert(H5F_BASE_ADDR(f) < space_needed);
-    space_needed -= (hsize_t)H5F_BASE_ADDR(f);
+    HDassert(f->shared->maxaddr >= eoa);
+    space_avail = (hsize_t)(f->shared->maxaddr - eoa);
 
-    /* Add the amount of space requested for this allocation */
-    space_needed += size;
-
-    /* Ensure that this final number is less than the file's
-     * address space.  We do this by shifting in multiples
-     * of 16 bits because some systems will do nothing if
-     * we shift by 64 bits all at once ( Linux ).
-     *  Thus, we break one shift into several smaller shifts.
-     */
-    for(c=0; c < H5F_SIZEOF_ADDR(f); c += 2)
-        space_needed = space_needed >> 16;
-
-    if(space_needed != 0)
+    /* Ensure that there's enough room left in the file for something of this size */
+    if(size > space_avail)
         ret_value = TRUE;
     else
         ret_value = FALSE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5MF_alloc_overflow() */
 
 
 /*-------------------------------------------------------------------------
@@ -281,14 +271,11 @@ H5MF_alloc_overflow(const H5F_t *f, hsize_t size)
  * Purpose:	Check if a block in the file can be extended.
  *
  * Return:	Success:	TRUE(1)/FALSE(0)
- *
  * 		Failure:	FAIL
  *
  * Programmer:	Quincey Koziol
  *              Friday, June 11, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 htri_t
@@ -296,21 +283,17 @@ H5MF_can_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t e
 {
     htri_t	ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5MF_can_extend, FAIL);
+    FUNC_ENTER_NOAPI(H5MF_can_extend, FAIL)
 
     /* Convert old relative address to absolute address */
     addr += H5F_BASE_ADDR(f);
 
     /* Pass the request down to the virtual file layer */
-    if((ret_value=H5FD_can_extend(f->shared->lf, type, addr, size, extra_requested))<0)
+    if((ret_value = H5FD_can_extend(f->shared->lf, type, addr, size, extra_requested)) < 0)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory");
 
-    /* Make sure there is enough addressable space to satisfy the request */
-    if (ret_value == TRUE)
-        ret_value = !H5MF_alloc_overflow(f, extra_requested);
-
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_can_extend() */
 
 
@@ -320,14 +303,11 @@ done:
  * Purpose:	Extend a block in the file.
  *
  * Return:	Success:	Non-negative
- *
  * 		Failure:	Negative
  *
  * Programmer:	Quincey Koziol
  *              Saturday, June 12, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -335,19 +315,16 @@ H5MF_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra
 {
     herr_t	ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5MF_extend, FAIL);
-
-    /* Make sure there is enough addressable space to satisfy the request */
-    if ( H5MF_alloc_overflow(f, extra_requested) )
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory: out of address space");
+    FUNC_ENTER_NOAPI(H5MF_extend, FAIL)
 
-    /* Convert old relative address to absolute address */
+    /* Convert relative address to absolute address */
     addr += H5F_BASE_ADDR(f);
 
     /* Pass the request down to the virtual file layer */
-    if((ret_value=H5FD_extend(f->shared->lf, type, addr, size, extra_requested))<0)
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory");
+    if((ret_value = H5FD_extend(f->shared->lf, type, addr, size, extra_requested)) < 0)
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory")
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF_extend() */
+
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index b3f0d17..e01a9f6 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -29,9 +29,8 @@
 #define _H5MFprivate_H
 
 /* Private headers needed by this file */
-#include "H5private.h"
-#include "H5Fprivate.h"
-#include "H5FDprivate.h"	/*file driver				  */
+#include "H5Fprivate.h"         /* File access				*/
+#include "H5FDprivate.h"	/* File Drivers				*/
 
 /*
  * Feature: Define H5MF_DEBUG on the compiler command line if you want to
@@ -49,10 +48,10 @@ H5_DLL herr_t H5MF_xfree(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t
 			  hsize_t size);
 H5_DLL haddr_t H5MF_realloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr,
 			     hsize_t old_size, hsize_t new_size);
-H5_DLL hbool_t H5MF_alloc_overflow(const H5F_t *f, hsize_t size);
 H5_DLL htri_t H5MF_can_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr,
     hsize_t size, hsize_t extra_requested);
 H5_DLL herr_t H5MF_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size,
     hsize_t extra_requested);
 
-#endif
+#endif /* end _H5MFprivate_H */
+
diff --git a/src/H5O.c b/src/H5O.c
index f72fe7e..e42f1eb 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -58,6 +58,17 @@
 /* Local Typedefs */
 /******************/
 
+/* User data for recursive traversal over objects from a group */
+typedef struct {
+    hid_t       obj_id;         /* The ID for the starting group */
+    H5G_loc_t	*start_loc;     /* Location of starting group */
+    hid_t       lapl_id;        /* LAPL for walking across links */
+    hid_t       dxpl_id; 	/* DXPL for operations */
+    H5SL_t     *visited;        /* Skip list for tracking visited nodes */
+    H5O_iterate_t op;           /* Application callback */
+    void       *op_data;        /* Application's op data */
+} H5O_iter_visit_ud_t;
+
 
 /********************/
 /* Package Typedefs */
@@ -71,6 +82,9 @@
 static herr_t H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh);
 static const H5O_obj_class_t *H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id);
 static herr_t H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type);
+static herr_t H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id,
+    hid_t dxpl_id);
 
 
 /*********************/
@@ -79,9 +93,11 @@ static herr_t H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type);
 
 /* Header message ID to class mapping */
 
-/* Remember to increment H5O_MSG_TYPES in H5Opkg.h when adding a new 
+
+/* Remember to increment H5O_MSG_TYPES in H5Opkg.h when adding a new
  * message.
  */
+
 const H5O_msg_class_t *const H5O_msg_class_g[] = {
     H5O_MSG_NULL,		/*0x0000 Null				*/
     H5O_MSG_SDSPACE,		/*0x0001 Dataspace			*/
@@ -148,6 +164,9 @@ H5FL_BLK_DEFINE(chunk_image);
 /* Declare external the free list for time_t's */
 H5FL_EXTERN(time_t);
 
+/* Declare external the free list for H5_obj_t's */
+H5FL_EXTERN(H5_obj_t);
+
 
 /*******************/
 /* Local Variables */
@@ -841,6 +860,130 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5Ovisit
+ *
+ * Purpose:	Recursively visit an object and all the objects reachable
+ *              from it.  If the starting object is a group, all the objects
+ *              linked to from that group will be visited.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Soft links and user-defined links are ignored during
+ *              this operation.
+ *
+ *              NOTE: Each _object_ reachable from the initial group will only
+ *              be visited once.  If multiple hard links point to the same
+ *              object, the first link to the object's path (according to the
+ *              iteration index and iteration order given) will be used to in
+ *              the callback about the object.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ * Programmer:	Quincey Koziol
+ *		November 25 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5O_iterate_t op, void *op_data)
+{
+    herr_t      ret_value;              /* Return value */
+
+    FUNC_ENTER_API(H5Ovisit, FAIL)
+    H5TRACE5("e", "iIiIox*x", obj_id, idx_type, order, op, op_data);
+
+    /* Check args */
+    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if(!op)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
+
+    /* Call internal object visitation routine */
+    if((ret_value = H5O_visit(obj_id, ".", idx_type, order, op, op_data, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)) < 0)
+	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Ovisit() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5Ovisit_by_name
+ *
+ * Purpose:	Recursively visit an object and all the objects reachable
+ *              from it.  If the starting object is a group, all the objects
+ *              linked to from that group will be visited.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Soft links and user-defined links are ignored during
+ *              this operation.
+ *
+ *              NOTE: Each _object_ reachable from the initial group will only
+ *              be visited once.  If multiple hard links point to the same
+ *              object, the first link to the object's path (according to the
+ *              iteration index and iteration order given) will be used to in
+ *              the callback about the object.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ * Programmer:	Quincey Koziol
+ *		November 24 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id)
+{
+    herr_t      ret_value;              /* Return value */
+
+    FUNC_ENTER_API(H5Ovisit_by_name, FAIL)
+    H5TRACE7("e", "i*sIiIox*xi", loc_id, obj_name, idx_type, order, op, op_data,
+             lapl_id);
+
+    /* Check args */
+    if(!obj_name || !*obj_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if(!op)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
+    if(H5P_DEFAULT == lapl_id)
+        lapl_id = H5P_LINK_ACCESS_DEFAULT;
+    else
+        if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
+
+    /* Call internal object visitation routine */
+    if((ret_value = H5O_visit(loc_id, obj_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
+	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Ovisit_by_name() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5Oclose
  *
  * Purpose:	Close an open file object.
@@ -953,6 +1096,14 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, hid_t ocpl_id,
         oh->version = H5O_VERSION_1;
     oh->sizeof_size = H5F_SIZEOF_SIZE(f);
     oh->sizeof_addr = H5F_SIZEOF_ADDR(f);
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
+    /* Check whether the "bad message count" property is set */
+    if(H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME) > 0) {
+        /* Retrieve bad message count flag */
+        if(H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get bad message count flag")
+    } /* end if */
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
     /* Set initial status flags */
     oh->flags = oh_flags;
@@ -1141,7 +1292,7 @@ H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id)
     loc_found = TRUE;
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC_dxpl_id)) < 0)
+    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -2138,8 +2289,7 @@ H5O_get_info(H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info_t *o
     HDmemset(oinfo, 0, sizeof(*oinfo));
 
     /* Retrieve the file's fileno */
-    if(H5F_get_fileno(oloc->file, &oinfo->fileno) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "unable to read fileno")
+    H5F_GET_FILENO(oloc->file, oinfo->fileno);
 
     /* Set the object's address */
     oinfo->addr = oloc->addr;
@@ -2429,3 +2579,300 @@ H5O_get_oh_addr(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->chunk[0].addr)
 } /* end H5O_get_oh_addr() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_get_rc_and_type
+ *
+ * Purpose:	Retrieve an object's reference count and type
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *		November  4 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5O_get_rc_and_type(const H5O_loc_t *oloc, hid_t dxpl_id, unsigned *rc, H5O_type_t *otype)
+{
+    H5O_t *oh = NULL;                   /* Object header */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI(H5O_get_rc_and_type, FAIL)
+
+    /* Check args */
+    HDassert(oloc);
+    HDassert(rc);
+    HDassert(otype);
+
+    /* Get the object header */
+    if(NULL == (oh = H5AC_protect(oloc->file, dxpl_id, H5AC_OHDR, oloc->addr, NULL, NULL, H5AC_READ)))
+	HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
+
+    /* Set the object's reference count */
+    *rc = oh->nlink;
+
+    /* Retrieve the type of the object */
+    if(H5O_obj_type_real(oh, otype) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
+
+done:
+    if(oh && H5AC_unprotect(oloc->file, dxpl_id, H5AC_OHDR, oloc->addr, oh, H5AC__NO_FLAGS_SET) < 0)
+	HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_get_rc_and_type() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5O_free_visit_visited
+ *
+ * Purpose:     Free the key for an object visited during a group traversal
+ *
+ * Return:      Non-negative on success, negative on failure
+ *
+ * Programmer:  Quincey Koziol
+ *	        Nov 25, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free_visit_visited)
+
+    H5FL_FREE(H5_obj_t, item);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5O_free_visit_visited() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_visit_cb
+ *
+ * Purpose:     Callback function for recursively visiting objects from a group
+ *
+ * Return:	Success:        Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *	        Nov 25, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O_visit_cb(hid_t UNUSED group, const char *name, const H5L_info_t *linfo,
+    void *_udata)
+{
+    H5O_iter_visit_ud_t *udata = (H5O_iter_visit_ud_t *)_udata;     /* User data for callback */
+    H5G_loc_t   obj_loc;                /* Location of object */
+    H5G_name_t  obj_path;            	/* Object's group hier. path */
+    H5O_loc_t   obj_oloc;            	/* Object's object location */
+    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
+    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5O_visit_cb)
+
+    /* Sanity check */
+    HDassert(name);
+    HDassert(linfo);
+    HDassert(udata);
+
+    /* Check if this is a hard link */
+    if(linfo->type == H5L_TYPE_HARD) {
+        H5_obj_t obj_pos;       /* Object "position" for this object */
+
+        /* Set up opened group location to fill in */
+        obj_loc.oloc = &obj_oloc;
+        obj_loc.path = &obj_path;
+        H5G_loc_reset(&obj_loc);
+
+        /* Find the object using the LAPL passed in */
+        /* (Correctly handles mounted files) */
+        if(H5G_loc_find(udata->start_loc, name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
+        obj_found = TRUE;
+
+        /* Construct unique "position" for this object */
+        H5F_GET_FILENO(obj_oloc.file, obj_pos.fileno);
+        obj_pos.addr = obj_oloc.addr;
+
+        /* Check if we've seen the object the link references before */
+        if(NULL == H5SL_search(udata->visited, &obj_pos)) {
+            H5O_info_t oinfo;           /* Object info */
+
+            /* Get the object's info */
+            if(H5O_get_info(&obj_oloc, udata->dxpl_id, TRUE, &oinfo) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
+
+            /* Make the application callback */
+            ret_value = (udata->op)(udata->obj_id, name, &oinfo, udata->op_data);
+
+            /* Check for continuing to visit objects */
+            if(ret_value == H5_ITER_CONT) {
+                /* If its ref count is > 1, we add it to the list of visited objects */
+                /* (because it could come up again during traversal) */
+                if(oinfo.rc > 1) {
+                    H5_obj_t *new_node;                  /* New object node for visited list */
+
+                    /* Allocate new object "position" node */
+                    if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+                        HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
+
+                    /* Set node information */
+                    *new_node = obj_pos;
+
+                    /* Add to list of visited objects */
+                    if(H5SL_insert(udata->visited, new_node, new_node) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+                } /* end if */
+            } /* end if */
+        } /* end if */
+    } /* end if */
+
+done:
+    /* Release resources */
+    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_visit_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_visit
+ *
+ * Purpose:	Recursively visit an object and all the objects reachable
+ *              from it.  If the starting object is a group, all the objects
+ *              linked to from that group will be visited.  Links within
+ *              each group are visited according to the order within the
+ *              specified index (unless the specified index does not exist for
+ *              a particular group, then the "name" index is used).
+ *
+ *              NOTE: Soft links and user-defined links are ignored during
+ *              this operation.
+ *
+ *              NOTE: Each _object_ reachable from the initial group will only
+ *              be visited once.  If multiple hard links point to the same
+ *              object, the first link to the object's path (according to the
+ *              iteration index and iteration order given) will be used to in
+ *              the callback about the object.
+ *
+ * Return:	Success:	The return value of the first operator that
+ *				returns non-zero, or zero if all members were
+ *				processed with no operator returning non-zero.
+ *
+ *		Failure:	Negative if something goes wrong within the
+ *				library, or the negative value returned by one
+ *				of the operators.
+ *
+ * Programmer:	Quincey Koziol
+ *		November 24 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id,
+    hid_t dxpl_id)
+{
+    H5O_iter_visit_ud_t udata;  /* User data for callback */
+    H5G_loc_t	loc;            /* Location of reference object */
+    H5G_loc_t   obj_loc;        /* Location used to open object */
+    H5G_name_t  obj_path;       /* Opened object group hier. path */
+    H5O_loc_t   obj_oloc;       /* Opened object object location */
+    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
+    H5O_info_t  oinfo;          /* Object info struct */
+    hid_t       obj_id = (-1);  /* ID of object */
+    herr_t      ret_value;      /* Return value */
+
+    FUNC_ENTER_NOAPI(H5O_visit, FAIL)
+
+    /* Portably initialize user data struct to zeros */
+    HDmemset(&udata, 0, sizeof(udata));
+
+    /* Check args */
+    if(H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+    /* Set up opened group location to fill in */
+    obj_loc.oloc = &obj_oloc;
+    obj_loc.path = &obj_path;
+    H5G_loc_reset(&obj_loc);
+
+    /* Find the object's location */
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found")
+    loc_found = TRUE;
+
+    /* Get the object's info */
+    if(H5O_get_info(&obj_oloc, dxpl_id, TRUE, &oinfo) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get object info")
+
+    /* Open the object */
+    /* (Takes ownership of the obj_loc information) */
+    if((obj_id = H5O_open_by_loc(&obj_loc, dxpl_id)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
+
+    /* Make callback for starting object */
+    if((ret_value = op(obj_id, ".", &oinfo, op_data)) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "can't visit objects")
+
+    /* Check for object being a group */
+    if(oinfo.type == H5O_TYPE_GROUP) {
+        H5G_loc_t	start_loc;          /* Location of starting group */
+
+        /* Get the location of the starting group */
+        if(H5G_loc(obj_id, &start_loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+        /* Set up user data for visiting links */
+        udata.obj_id = obj_id;
+        udata.start_loc = &start_loc;
+        udata.lapl_id = lapl_id;
+        udata.dxpl_id = dxpl_id;
+        udata.op = op;
+        udata.op_data = op_data;
+        
+        /* Create skip list to store visited object information */
+        if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, 0.5, (size_t)16)) == NULL)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
+
+        /* If its ref count is > 1, we add it to the list of visited objects */
+        /* (because it could come up again during traversal) */
+        if(oinfo.rc > 1) {
+            H5_obj_t *obj_pos;                  /* New object node for visited list */
+
+            /* Allocate new object "position" node */
+            if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+                HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "can't allocate object node")
+
+            /* Construct unique "position" for this object */
+            obj_pos->fileno = oinfo.fileno;
+            obj_pos->addr = oinfo.addr;
+
+            /* Add to list of visited objects */
+            if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
+        } /* end if */
+
+        /* Call internal group visitation routine */
+        if((ret_value = H5G_visit(obj_id, ".", idx_type, order, H5O_visit_cb, &udata, lapl_id, dxpl_id)) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object visitation failed")
+    } /* end if */
+
+done:
+    if(obj_id > 0) {
+        if(H5I_dec_ref(obj_id) < 0)
+            HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to close object")
+    } /* end if */
+    else if(loc_found && H5G_loc_free(&obj_loc) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
+    if(udata.visited)
+        H5SL_destroy(udata.visited, H5O_free_visit_visited, NULL);
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_visit() */
+
+
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index b5c8c7d..0d5765e 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -580,10 +580,25 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * _udata1,
     if(merged_null_msgs)
 	oh->cache_info.is_dirty = TRUE;
 
+/* Don't check for the incorrect # of object header messages bug unless we've
+ * enabled strict format checking.  This allows for older files, created with
+ * a version of the library that had a bug in tracking the correct # of header
+ * messages to be read in without the library fussing about things. -QAK
+ */
+#ifdef H5_STRICT_FORMAT_CHECKS
     /* Sanity check for the correct # of messages in object header */
     if(oh->version == H5O_VERSION_1)
         if((oh->nmesgs + merged_null_msgs) != nmesgs)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "corrupt object header - too few messages")
+#else /* H5_STRICT_FORMAT_CHECKS */
+    /* Check for incorrect # of messages in object header and if we have write
+     * access on the file, flag the object header as dirty, so it gets fixed. 
+     */
+    if(oh->version == H5O_VERSION_1)
+        if((oh->nmesgs + merged_null_msgs) != nmesgs &&
+                (H5F_get_intent(f) & H5F_ACC_RDWR))
+            oh->cache_info.is_dirty = TRUE;
+#endif /* H5_STRICT_FORMAT_CHECKS */
 
 #ifdef H5O_DEBUG
 H5O_assert(oh);
@@ -710,7 +725,12 @@ H5O_assert(oh);
             *p++ = 0;
 
             /* Number of messages */
-            UINT16ENCODE(p, oh->nmesgs);
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
+            if(oh->store_bad_mesg_count)
+                UINT16ENCODE(p, (oh->nmesgs - 1))
+            else
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
+                UINT16ENCODE(p, oh->nmesgs);
 
             /* Link count */
             UINT32ENCODE(p, oh->nlink);
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index 660b0e1..384353c 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -513,7 +513,6 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
     /* Check for copying dense link storage */
     if(H5F_addr_defined(linfo_src->fheap_addr)) {
         H5O_linfo_postcopy_ud_t udata;          /* User data for iteration callback */
-        H5G_link_iterate_t lnk_op;              /* Link operator */
 
         /* Set up dense link iteration user data */
         udata.src_oloc = src_oloc;
@@ -522,12 +521,8 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
         udata.dxpl_id = dxpl_id;
         udata.cpy_info = cpy_info;
 
-        /* Build iterator operator */
-        lnk_op.op_type = H5G_LINK_OP_LIB;
-        lnk_op.u.lib_op = H5O_linfo_post_copy_file_cb;
-
         /* Iterate over the links in the group, building a table of the link messages */
-        if(H5G_dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, (hid_t)0, &lnk_op, &udata) < 0)
+        if(H5G_dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5O_linfo_post_copy_file_cb, &udata) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
     } /* end if */
 
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index b3d94d9..29a7e79 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -136,7 +136,7 @@ H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
 
     /* Go append message to object header */
-    if(H5O_msg_append(loc->file, dxpl_id, oh, type_id, mesg_flags, update_flags, mesg) < 0)
+    if(H5O_msg_append_oh(loc->file, dxpl_id, oh, type_id, mesg_flags, update_flags, mesg) < 0)
 	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to append to object header")
 
 done:
@@ -148,7 +148,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_msg_append
+ * Function:	H5O_msg_append_oh
  *
  * Purpose:	Simplified version of H5O_msg_create, used when creating a new
  *              object header message (usually during object creation) and
@@ -165,13 +165,13 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_msg_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
+H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
     unsigned mesg_flags, unsigned update_flags, void *mesg)
 {
     const H5O_msg_class_t *type;        /* Original H5O class type for the ID */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_msg_append, FAIL)
+    FUNC_ENTER_NOAPI(H5O_msg_append_oh, FAIL)
 
     /* check args */
     HDassert(f);
@@ -189,7 +189,7 @@ H5O_msg_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_msg_append() */
+} /* end H5O_msg_append_oh() */
 
 
 /*-------------------------------------------------------------------------
@@ -301,6 +301,53 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5O_msg_write_oh
+ *
+ * Purpose:	Modifies an existing message or creates a new message.
+ *
+ *              The UPDATE_FLAGS argument are flags that allow the caller
+ *              to skip updating the modification time or reseting the message
+ *              data.  This is useful when several calls to H5O_msg_write will be
+ *              made in a sequence.
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec  6 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
+    unsigned mesg_flags, unsigned update_flags, void *mesg)
+{
+    const H5O_msg_class_t *type;        /* Actual H5O class type for the ID */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI(H5O_msg_write_oh, FAIL)
+
+    /* check args */
+    HDassert(f);
+    HDassert(oh);
+    HDassert(H5O_ATTR_ID != type_id);   /* Attributes are modified in another routine */
+    HDassert(type_id < NELMTS(H5O_msg_class_g));
+    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    HDassert(type);
+    HDassert(mesg);
+    HDassert(0 == (mesg_flags & ~H5O_MSG_FLAG_BITS));
+
+    /* Call the "real" modify routine */
+    if(H5O_msg_write_real(f, dxpl_id, oh, type, mesg_flags, update_flags, mesg) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to write object header message")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_msg_write_oh() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5O_msg_write_real
  *
  * Purpose:	Modifies an existing message or creates a new message.
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 94af802..69feff4 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -253,6 +253,12 @@ struct H5O_t {
     /* File-specific information (not stored) */
     size_t      sizeof_size;            /* Size of file sizes 		     */
     size_t      sizeof_addr;            /* Size of file addresses	     */
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
+    hbool_t     store_bad_mesg_count;   /* Flag to indicate that a bad message count should be stored */
+                                        /* (This is to simulate a bug in earlier
+                                         *      versions of the library)
+                                         */
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
     /* Object information (stored) */
     hbool_t     has_refcount_msg;       /* Whether the object has a ref. count message */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 393d4e1..19da881 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -93,6 +93,10 @@ typedef struct H5O_t H5O_t;
 #define H5O_BOGUS_MSG_FLAGS_NAME        "bogus msg flags"       /* Flags for 'bogus' message */
 #define H5O_BOGUS_MSG_FLAGS_SIZE        sizeof(uint8_t)
 #endif /* H5O_ENABLE_BOGUS */
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
+#define H5O_BAD_MESG_COUNT_NAME         "bad message count"       /* Flag setting bad message count */
+#define H5O_BAD_MESG_COUNT_SIZE         sizeof(hbool_t)
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
 /* ========= Object Copy properties ============ */
 #define H5O_CPY_OPTION_NAME 		"copy object"           /* Copy options */
@@ -571,13 +575,13 @@ H5_DLL herr_t H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint,
 H5_DLL herr_t H5O_open(H5O_loc_t *loc);
 H5_DLL herr_t H5O_close(H5O_loc_t *loc);
 H5_DLL int H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id);
-H5_DLL struct H5O_t *H5O_protect(H5O_loc_t *loc, hid_t dxpl_id);
-H5_DLL herr_t H5O_unprotect(H5O_loc_t *loc, struct H5O_t *oh);
+H5_DLL H5O_t *H5O_protect(H5O_loc_t *loc, hid_t dxpl_id);
+H5_DLL herr_t H5O_unprotect(H5O_loc_t *loc, H5O_t *oh);
 H5_DLL herr_t H5O_touch(H5O_loc_t *loc, hbool_t force, hid_t dxpl_id);
-H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh,
+H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
     hbool_t force);
 #ifdef H5O_ENABLE_BOGUS
-H5_DLL herr_t H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, unsigned mesg_flags);
+H5_DLL herr_t H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags);
 #endif /* H5O_ENABLE_BOGUS */
 H5_DLL herr_t H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 H5_DLL herr_t H5O_get_info(H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih_info,
@@ -588,14 +592,17 @@ H5_DLL hid_t H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id);
 H5_DLL herr_t H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks);
 H5_DLL void *H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 H5_DLL haddr_t H5O_get_oh_addr(const H5O_t *oh);
+H5_DLL herr_t H5O_get_rc_and_type(const H5O_loc_t *oloc, hid_t dxpl_id, unsigned *rc, H5O_type_t *otype);
 
 /* Object header message routines */
 H5_DLL herr_t H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
     unsigned update_flags, void *mesg, hid_t dxpl_id);
-H5_DLL herr_t H5O_msg_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, unsigned type_id,
+H5_DLL herr_t H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
     unsigned mesg_flags, unsigned update_flags, void *mesg);
-H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned flags,
-    unsigned update_flags, void *mesg, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id,
+    unsigned mesg_flags, unsigned update_flags, void *mesg, hid_t dxpl_id);
+H5_DLL herr_t H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
+    unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg);
 H5_DLL void *H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
     hid_t dxpl_id);
 H5_DLL herr_t H5O_msg_reset(unsigned type_id, void *native);
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index 6ddd565..acce42c 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -52,13 +52,13 @@
  * but we need to assign each kind of message to a different bit so that
  * one index can hold multiple types.)
  */
-#define H5O_MESG_NONE_FLAG     0x0000          /* No shared messages */
-#define H5O_MESG_SDSPACE_FLAG  0x0001          /* Simple Dataspace Message.  */
-#define H5O_MESG_DTYPE_FLAG    0x0002          /* Datatype Message.  */
-#define H5O_MESG_FILL_FLAG     0x0004          /* Fill Value Message. */
-#define H5O_MESG_PLINE_FLAG    0x0008          /* Filter pipeline message.  */
-#define H5O_MESG_ATTR_FLAG     0x0010          /* Attribute Message.  */
-#define H5O_MESG_ALL_FLAG      (H5O_MESG_SDSPACE_FLAG | H5O_MESG_DTYPE_FLAG | H5O_MESG_FILL_FLAG | H5O_MESG_PLINE_FLAG | H5O_MESG_ATTR_FLAG)
+#define H5O_SHMESG_NONE_FLAG    0x0000          /* No shared messages */
+#define H5O_SHMESG_SDSPACE_FLAG ((unsigned)1 << 0x0001) /* Simple Dataspace Message.  */
+#define H5O_SHMESG_DTYPE_FLAG   ((unsigned)1 << 0x0003) /* Datatype Message.  */
+#define H5O_SHMESG_FILL_FLAG    ((unsigned)1 << 0x0005) /* Fill Value Message. */
+#define H5O_SHMESG_PLINE_FLAG   ((unsigned)1 << 0x000b) /* Filter pipeline message.  */
+#define H5O_SHMESG_ATTR_FLAG    ((unsigned)1 << 0x000c) /* Attribute Message.  */
+#define H5O_SHMESG_ALL_FLAG     (H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG | H5O_SHMESG_PLINE_FLAG | H5O_SHMESG_ATTR_FLAG)
 
 /* Object header status flag definitions */
 #define H5O_HDR_CHUNK0_SIZE             0x03    /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
@@ -124,6 +124,10 @@ typedef struct H5O_info_t {
 /* Typedef for message creation indexes */
 typedef uint32_t H5O_msg_crt_idx_t;
 
+/* Prototype for H5Ovisit/H5Ovisit_by_name() operator */
+typedef herr_t (*H5O_iterate_t)(hid_t obj, const char *name, const H5O_info_t *info,
+    void *op_data);
+
 
 /********************/
 /* Public Variables */
@@ -159,6 +163,11 @@ H5_DLL herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name,
 H5_DLL ssize_t H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize);
 H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name,
     char *comment, size_t bufsize, hid_t lapl_id);
+H5_DLL herr_t H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5O_iterate_t op, void *op_data);
+H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name,
+    H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op,
+    void *op_data, hid_t lapl_id);
 H5_DLL herr_t H5Oclose(hid_t object_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 44ac3c4..f31d1a4 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -1877,76 +1877,163 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_latest_format
- *
- * Purpose:	Indicates that the library should always use the latest version
- *      of the file format when creating objects.  If this flag is not set,
- *      the library will always use the most backwardly compatibly format
- *      possible that can store the information about an object.
- *
- *	The default value is set to FALSE (creating backwardly compatible files)
+ * Function:	H5Pset_libver_bounds
+ *
+ * Purpose:	Indicates which versions of the file format the library should
+ *      use when creating objects.  LOW is the earliest version of the HDF5
+ *      library that is guaranteed to be able to access the objects created
+ *      (the format of some objects in an HDF5 file may not have changed between
+ *      versions of the HDF5 library, possibly allowing earlier versions of the
+ *      HDF5 library to access those objects) and HIGH is the latest version
+ *      of the library required to access the objects created (later versions
+ *      of the HDF5 library will also be able to access those objects).
+ *
+ *      LOW is used to require that objects use a more modern format and HIGH
+ *      is used to restrict objects from using a more modern format.
+ *
+ *      The special values of H5F_FORMAT_EARLIEST and H5F_FORMAT_LATEST can be
+ *      used in the following manner:  Setting LOW and HIGH to H5F_FORMAT_LATEST
+ *      will produce files whose objects use the latest version of the file
+ *      format available in the current HDF5 library for each object created.
+ *      Setting LOW and HIGH to H5F_FORMAT_EARLIEST will produce files that that
+ *      always require the use of the earliest version of the file format for
+ *      each object created. [NOTE!  LOW=HIGH=H5F_FORMAT_EARLIEST is not
+ *      implemented as of version 1.8.0 and setting LOW and HIGH to
+ *      H5F_FORMAT_EARLIEST will produce an error currently].
+ *
+ *      Currently, the only two valid combinations for this routine are:
+ *      LOW = H5F_FORMAT_EARLIEST and HIGH = H5F_FORMAT_LATEST (the default
+ *      setting, which creates objects with the ealiest version possible for
+ *      each object, but no upper limit on the version allowed to be created if
+ *      a newer version of an object's format is required to support a feature
+ *      requested with an HDF5 library API routine), and LOW = H5F_FORMAT_LATEST
+ *      and HIGH = H5F_FORMAT_LATEST (which is described above).
+ *
+ *      The LOW and HIGH values set with this routine at imposed with each
+ *      HDF5 library API call that creates objects in the file.  API calls that
+ *      would violate the LOW or HIGH format bound will fail.
+ *
+ *      Setting the LOW and HIGH values will not affect reading/writing existing
+ *      objects, only the creation of new objects.
+ *
+ * Note: Eventually we want to add more values to the H5F_libver_t
+ *      enumerated type that indicate library release values where the file
+ *      format was changed (like "H5F_FORMAT_1_2_0" for the file format changes
+ *      in the 1.2.x release branch and possily even "H5F_FORMAT_1_4_2" for
+ *      a change mid-way through the 1.4.x release branch, etc).
+ *
+ *      Adding more values will allow applications to make settings like the
+ *      following:
+ *          LOW = H5F_FORMAT_EARLIEST, HIGH = H5F_FORMAT_1_2_0 => Create objects
+ *              with the earliest possible format and don't allow any objects
+ *              to be created that require a library version greater than 1.2.x
+ *              (This is the "make certain that  linked with v1.2.x
+ *              of the library can read the file produced" use case)
+ *
+ *          LOW = H5F_FORMAT_1_4_2, HIGH = H5F_FORMAT_LATEST => create objects
+ *              with at least the version of their format that the 1.4.2 library
+ *              uses and allow any later version of the object's format
+ *              necessary to represent features used.
+ *              (This is the "make certain to take advantage of 
+ *              in the file format" use case (maybe  is smaller
+ *              or scales better than an ealier version, which would otherwise
+ *              be used))
+ *
+ *         LOW = H5F_FORMAT_1_2_0, HIGH = H5F_FORMAT_1_6_0 => creates objects
+ *              with at least the version of their format that the 1.2.x library
+ *              uses and don't allow any objects to be created that require a
+ *              library version greater than 1.6.x.
+ *              (Not certain of a particular use case for these settings,
+ *              although its probably just the logical combination of the
+ *              previous two; it just falls out as possible/logical (if it turns
+ *              out to be hard to implement in some way, we can always disallow
+ *              it))
+ *
+ * Note #2:     We talked about whether to include enum values for only library
+ *      versions where the format changed and decided it would be less confusing
+ *      for application developers if we include enum values for _all_ library
+ *      releases and then map down to the previous actual library release which
+ *      had a format change.
  *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *              Friday, September 9, 2006
+ *              Sunday, December 30, 2007
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_latest_format(hid_t plist_id, hbool_t latest)
+H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
+    H5F_libver_t high)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
+    hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED;   /* return value */
 
-    FUNC_ENTER_API(H5Pset_latest_format, FAIL)
-    H5TRACE2("e", "ib", plist_id, latest);
+    FUNC_ENTER_API(H5Pset_libver_bounds, FAIL)
+    H5TRACE3("e", "iFvFv", plist_id, low, high);
+
+    /* Check args */
+    /* (Note that this is _really_ restricted right now, we'll want to loosen
+     *  this up more as we add features - QAK)
+     */
+    if(high != H5F_LIBVER_LATEST)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid high library version bound")
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set values */
+    latest = (low == H5F_LIBVER_LATEST) ? TRUE : FALSE;
     if(H5P_set(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'latest format' flag")
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set library version bounds")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_latest_format() */
+} /* end H5Pset_libver_bounds() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_latest_format
+ * Function:	H5Pget_libver_bounds
  *
- * Purpose:	Returns the current settings for the 'latest format' flag
+ * Purpose:	Returns the current settings for the library version format bounds
  *      from a file access property list.
  *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *              Friday, September 9, 2006
+ *              Thursday, January 3, 2008
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_latest_format(hid_t plist_id, hbool_t *latest/*out*/)
+H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/,
+    H5F_libver_t *high/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
+    hbool_t latest;             /* Whether to use the latest version or not */
     herr_t ret_value = SUCCEED; /* return value */
 
-    FUNC_ENTER_API(H5Pget_latest_format, FAIL)
-    H5TRACE2("e", "ix", plist_id, latest);
+    FUNC_ENTER_API(H5Pget_libver_bounds, FAIL)
+    H5TRACE3("e", "ixx", plist_id, low, high);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get value */
-    if(latest)
-        if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, latest) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get 'latest format' flag")
+    if(H5P_get(plist, H5F_ACS_LATEST_FORMAT_NAME, &latest) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get library version bounds")
+
+    /* Check for setting values to return */
+    /* (Again, this is restricted now, we'll need to open it up later -QAK) */
+    if(low)
+        *low = latest ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST;
+    if(high)
+        *high = H5F_LIBVER_LATEST;
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_latest_format() */
+} /* end H5Pget_libver_bounds() */
 
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 6345961..8fd4909 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -757,7 +757,7 @@ H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_
     H5TRACE4("e", "iIuIuIu", plist_id, index_num, mesg_type_flags, min_mesg_size);
 
     /* Check arguments */
-    if(mesg_type_flags > H5O_MESG_ALL_FLAG)
+    if(mesg_type_flags > H5O_SHMESG_ALL_FLAG)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "unrecognized flags in mesg_type_flags");
 
     /* Get the plist structure */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 214aaec..8382101 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -265,14 +265,16 @@ H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/);
 H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
 H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/);
-H5_DLL herr_t H5Pset_latest_format(hid_t plist_id, hbool_t latest);
-H5_DLL herr_t H5Pget_latest_format(hid_t plist_id, hbool_t *latest);
+H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
+    H5F_libver_t high);
+H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low,
+    H5F_libver_t *high);
 H5_DLL herr_t H5Pset_journal(hid_t fapl_id, const char *journal_file);
 
 /* Dataset creation property list (DCPL) routines */
 H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
 H5_DLL H5D_layout_t H5Pget_layout(hid_t plist_id);
-H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[]);
+H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]);
 H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
 H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset,
           hsize_t size);
diff --git a/src/H5R.c b/src/H5R.c
index 63da596..9ac93b2 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -887,7 +887,7 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't retrieve file ID")
 
     /* Get name, length, etc. */
-    if((ret_value = H5G_get_refobj_name(file_id, lapl_id, dxpl_id, &oloc, name, size)) < 0)
+    if((ret_value = H5G_get_name_by_addr(file_id, lapl_id, dxpl_id, &oloc, name, size)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't determine name")
 
 done:
diff --git a/src/H5S.c b/src/H5S.c
index 8a498aa..8a58cba 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -1055,27 +1055,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_write(H5O_loc_t *loc, const H5S_t *ds, hbool_t update_time, hid_t dxpl_id)
+H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags, H5S_t *ds)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5S_write, FAIL)
 
-    HDassert(loc);
+    HDassert(f);
+    HDassert(oh);
     HDassert(ds);
+    HDassert(H5S_GET_EXTENT_TYPE(ds) >= 0);
 
-    switch(H5S_GET_EXTENT_TYPE(ds)) {
-        case H5S_NULL:
-        case H5S_SCALAR:
-        case H5S_SIMPLE:
-            if(H5O_msg_write(loc, H5O_SDSPACE_ID, 0, update_time, &(ds->extent), dxpl_id) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple dataspace message")
-            break;
-
-        default:
-            HDassert("unknown dataspace class" && 0);
-            break;
-    } /* end switch */
+    /* Write the current dataspace extent to the dataspace message */
+    if(H5O_msg_write_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, update_flags, &(ds->extent)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple dataspace message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1103,7 +1096,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, const H5S_t *ds)
+H5S_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5S_t *ds)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
@@ -1112,19 +1105,11 @@ H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, const H5S_t *ds)
     HDassert(f);
     HDassert(oh);
     HDassert(ds);
+    HDassert(H5S_GET_EXTENT_TYPE(ds) >= 0);
 
-    switch (H5S_GET_EXTENT_TYPE(ds)) {
-        case H5S_NULL:
-        case H5S_SCALAR:
-        case H5S_SIMPLE:
-            if(H5O_msg_append(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, 0, &(ds->extent)) < 0)
-                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't update simple data space message")
-            break;
-
-        default:
-            assert("unknown data space class" && 0);
-            break;
-    }
+    /* Add the dataspace message to the object header */
+    if(H5O_msg_append_oh(f, dxpl_id, oh, H5O_SDSPACE_ID, 0, 0, &(ds->extent)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't add simple dataspace message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1388,6 +1373,7 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
     /* Set offset to zeros */
     for(u = 0; u < space->extent.rank; u++)
         space->select.offset[u] = 0;
+    space->select.offset_changed = FALSE;
 
     /* If the selection is 'all', update the number of elements selected */
     if(H5S_GET_SELECT_TYPE(space) == H5S_SEL_ALL)
diff --git a/src/H5SL.c b/src/H5SL.c
index 53c0f2d..a720182 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -90,61 +90,93 @@
 #define H5SL_LOCATE_FIND_FOUND(SLIST,X,UPDATE,I)                        \
         HGOTO_DONE(X);
 
-/* Define a code template for updating the "update" vector for the "DOUPDATE" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_YES_UPDATE(X,UPDATE,I)                              \
-        UPDATE[I]=&X->forward[I];
 
-/* Define a code template for _NOT_ updating the "update" vector for the "DOUPDATE" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_NO_UPDATE(X,UPDATE,I)
+/* Define a code template for "OP"s that update the "update" vector for the H5SL_LOCATE macro */
+#define H5SL_LOCATE_INSERT_UPDATE(X, UPDATE, I)                         \
+        UPDATE[I] = &X->forward[I];
+#define H5SL_LOCATE_REMOVE_UPDATE(X, UPDATE, I)                         \
+        UPDATE[I] = &X->forward[I];
+
+/* Define a code template for "OP"s that _DON'T_ update the "update" vector for the H5SL_LOCATE macro */
+#define H5SL_LOCATE_SEARCH_UPDATE(X, UPDATE, I)
+#define H5SL_LOCATE_FIND_UPDATE(X, UPDATE, I)
+
 
 /* Define a code template for comparing scalar keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_SCALAR_CMP(TYPE,PKEY1,PKEY2)                        \
-        (*(TYPE *)PKEY1<*(TYPE *)PKEY2)
+#define H5SL_LOCATE_SCALAR_CMP(TYPE, PNODE, PKEY, HASHVAL)              \
+        (*(TYPE *)((PNODE)->key) < *(TYPE *)PKEY)
 
 /* Define a code template for comparing string keys for the "CMP" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_STRING_CMP(TYPE,PKEY1,PKEY2)                        \
-        (HDstrcmp(PKEY1,PKEY2)<0)
+#define H5SL_LOCATE_STRING_CMP(TYPE, PNODE, PKEY, HASHVAL)              \
+        (((PNODE)->hashval == HASHVAL) ? (HDstrcmp((PNODE)->key, PKEY) < 0) : ((PNODE)->hashval < HASHVAL))
+
+/* Define a code template for comparing H5_obj_t keys for the "CMP" in the H5SL_LOCATE macro */
+#define H5SL_LOCATE_OBJ_CMP(TYPE, PNODE, PKEY, HASHVAL)                 \
+        ((((TYPE *)((PNODE)->key))->fileno < ((TYPE *)PKEY)->fileno) ? TRUE : (((TYPE *)((PNODE)->key))->addr < ((TYPE *)PKEY)->addr))
+
 
 /* Define a code template for comparing scalar keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_SCALAR_EQ(TYPE,PKEY1,PKEY2)                         \
-        (*(TYPE *)PKEY1==*(TYPE *)PKEY2)
+#define H5SL_LOCATE_SCALAR_EQ(TYPE, PNODE, PKEY, HASHVAL)               \
+        (*(TYPE *)((PNODE)->key) == *(TYPE *)PKEY)
 
 /* Define a code template for comparing string keys for the "EQ" in the H5SL_LOCATE macro */
-#define H5SL_LOCATE_STRING_EQ(TYPE,PKEY1,PKEY2)                         \
-        (HDstrcmp(PKEY1,PKEY2)==0)
+#define H5SL_LOCATE_STRING_EQ(TYPE, PNODE, PKEY, HASHVAL)               \
+        (((PNODE)->hashval == HASHVAL) && (HDstrcmp(((PNODE)->key), PKEY) == 0))
+
+/* Define a code template for comparing H5_obj_t keys for the "EQ" in the H5SL_LOCATE macro */
+#define H5SL_LOCATE_OBJ_EQ(TYPE, PNODE, PKEY, HASHVAL)                  \
+        ((((TYPE *)((PNODE)->key))->fileno == ((TYPE *)PKEY)->fileno) && (((TYPE *)((PNODE)->key))->addr == ((TYPE *)PKEY)->addr))
+
+
+/* Define a code template for initializing the hash value for scalar keys for the "HASHINIT" in the H5SL_LOCATE macro */
+#define H5SL_LOCATE_SCALAR_HASHINIT(KEY, HASHVAL)
+
+/* Define a code template for initializing the hash value for string keys for the "HASHINIT" in the H5SL_LOCATE macro */
+#define H5SL_LOCATE_STRING_HASHINIT(KEY, HASHVAL)                       \
+    HASHVAL = H5_hash_string(KEY);
+
+/* Define a code template for initializing the hash value for H5_obj_t keys for the "HASHINIT" in the H5SL_LOCATE macro */
+#define H5SL_LOCATE_OBJ_HASHINIT(KEY, HASHVAL)
+
 
 /* Macro used to find node for operation */
-#define H5SL_LOCATE(OP,DOUPDATE,CMP,SLIST,X,UPDATE,I,TYPE,KEY,CHECKED)  \
-    CHECKED=NULL;                                                       \
-    for(I=(int)SLIST->curr_level; I>=0; I--) {                          \
-        if(X->forward[I]!=CHECKED) {                                    \
-            while(X->forward[I] && H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(TYPE,X->forward[I]->key,KEY) ) \
-                X=X->forward[I];                                        \
-            CHECKED=X->forward[I];                                      \
+#define H5SL_LOCATE(OP, CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)      \
+{                                                                       \
+    H5SL_node_t *_checked;      /* Pointer to last node checked */      \
+    int _i;                     /* Local index variable */              \
+                                                                        \
+    _checked = NULL;                                                    \
+    H5_GLUE3(H5SL_LOCATE_,CMP,_HASHINIT)(KEY, HASHVAL)                  \
+    for(_i = (int)SLIST->curr_level; _i >= 0; _i--) {                   \
+        if(X->forward[_i] != _checked) {                                \
+            while(X->forward[_i] && H5_GLUE3(H5SL_LOCATE_,CMP,_CMP)(TYPE, X->forward[_i], KEY, HASHVAL) ) \
+                X = X->forward[_i];                                     \
+            _checked = X->forward[_i];                                  \
         } /* end if */                                                  \
-        H5_GLUE3(H5SL_LOCATE_,DOUPDATE,_UPDATE)(X,UPDATE,I)             \
+        H5_GLUE3(H5SL_LOCATE_,OP,_UPDATE)(X, UPDATE, _i)                \
     } /* end for */                                                     \
-    X=X->forward[0];                                                    \
-    if(X!=NULL && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(TYPE,X->key,KEY) ) {   \
+    X = X->forward[0];                                                  \
+    if(X != NULL && H5_GLUE3(H5SL_LOCATE_,CMP,_EQ)(TYPE, X, KEY, HASHVAL) ) {    \
         /* What to do when a node is found */				\
-        H5_GLUE3(H5SL_LOCATE_,OP,_FOUND)(SLIST,X,UPDATE,I)              \
-    } /* end if */
+        H5_GLUE3(H5SL_LOCATE_,OP,_FOUND)(SLIST, X, UPDATE, _i)          \
+    } /* end if */                                                      \
+}
 
 /* Macro used to insert node */
-#define H5SL_INSERT(CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)       \
-    H5SL_LOCATE(INSERT, YES, CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)
+#define H5SL_INSERT(CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)          \
+    H5SL_LOCATE(INSERT, CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)
 
 /* Macro used to remove node */
-#define H5SL_REMOVE(CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)       \
-    H5SL_LOCATE(REMOVE, YES, CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)
+#define H5SL_REMOVE(CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)          \
+    H5SL_LOCATE(REMOVE, CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)
 
 /* Macro used to search for node */
-#define H5SL_SEARCH(CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)       \
-    H5SL_LOCATE(SEARCH, NO, CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)
+#define H5SL_SEARCH(CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)          \
+    H5SL_LOCATE(SEARCH, CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)
 
 /* Macro used to find a node */
-#define H5SL_FIND(CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)         \
-    H5SL_LOCATE(FIND, NO, CMP, SLIST, X, UPDATE, I, TYPE, KEY, CHECKED)
+#define H5SL_FIND(CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)            \
+    H5SL_LOCATE(FIND, CMP, SLIST, X, UPDATE, TYPE, KEY, HASHVAL)
 
 
 /* Private typedefs & structs */
@@ -154,6 +186,7 @@ struct H5SL_node_t {
     const void *key;                    /* Pointer to node's key */
     void *item;                         /* Pointer to node's item */
     size_t level;                       /* The level of this node */
+    uint32_t hashval;                   /* Hash value for key (only for strings, currently) */
     struct H5SL_node_t **forward;       /* Array of forward pointers from this node */
     struct H5SL_node_t *backward;       /* Backward pointer from this node */
 };
@@ -175,7 +208,7 @@ struct H5SL_t {
 
 /* Static functions */
 static size_t H5SL_random_level(int p1, size_t max_level);
-static H5SL_node_t * H5SL_new_node(size_t lvl, void *item, const void *key);
+static H5SL_node_t * H5SL_new_node(size_t lvl, void *item, const void *key, uint32_t hashval);
 static H5SL_node_t *H5SL_insert_common(H5SL_t *slist, void *item, const void *key);
 static herr_t H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
 static herr_t H5SL_close_common(H5SL_t *slist, H5SL_operator_t op, void *op_data);
@@ -287,24 +320,25 @@ H5SL_random_level(int p1, size_t max_level)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5SL_node_t *
-H5SL_new_node(size_t lvl, void *item, const void *key)
+H5SL_new_node(size_t lvl, void *item, const void *key, uint32_t hashval)
 {
     H5SL_node_t *ret_value;      /* New skip list node */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5SL_new_node);
+    FUNC_ENTER_NOAPI_NOINIT(H5SL_new_node)
 
     /* Allocate the node */
-    if((ret_value=H5FL_ARR_MALLOC(H5SL_node_ptr_t,(lvl+1)))==NULL)
-        HGOTO_ERROR(H5E_SLIST,H5E_NOSPACE,NULL,"memory allocation failed");
+    if(NULL == (ret_value = H5FL_ARR_MALLOC(H5SL_node_ptr_t, (lvl + 1))))
+        HGOTO_ERROR(H5E_SLIST, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Initialize node */
-    ret_value->key=key;
-    ret_value->item=item;
-    ret_value->level=lvl;
-    ret_value->forward=(H5SL_node_t **)((unsigned char *)ret_value+sizeof(H5SL_node_t));
+    ret_value->key = key;
+    ret_value->item = item;
+    ret_value->level = lvl;
+    ret_value->hashval = hashval;
+    ret_value->forward = (H5SL_node_t **)((unsigned char *)ret_value + sizeof(H5SL_node_t));
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5SL_new_node() */
 
 
@@ -333,8 +367,8 @@ static H5SL_node_t *
 H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
 {
     H5SL_node_t **update[H5SL_LEVEL_MAX];       /* 'update' vector */
-    H5SL_node_t *checked;                       /* Pointer to last node checked */
     H5SL_node_t *x;                             /* Current node to examine */
+    uint32_t hashval = 0;                       /* Hash value for key */
     size_t lvl;                                 /* Level of new node */
     int i;                                      /* Local index value */
     H5SL_node_t *ret_value;                     /* Return value */
@@ -356,27 +390,31 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
     x=slist->header;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_INSERT(SCALAR, slist, x, update, i, const int, key, checked)
+            H5SL_INSERT(SCALAR, slist, x, update, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_INSERT(SCALAR, slist, x, update, i, const haddr_t, key, checked)
+            H5SL_INSERT(SCALAR, slist, x, update, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_INSERT(STRING, slist, x, update, i, char *, key, checked)
+            H5SL_INSERT(STRING, slist, x, update, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_INSERT(SCALAR, slist, x, update, i, const hsize_t, key, checked)
+            H5SL_INSERT(SCALAR, slist, x, update, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_INSERT(SCALAR, slist, x, update, i, const unsigned, key, checked)
+            H5SL_INSERT(SCALAR, slist, x, update, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_INSERT(SCALAR, slist, x, update, i, const size_t, key, checked)
+            H5SL_INSERT(SCALAR, slist, x, update, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_INSERT(OBJ, slist, x, update, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
@@ -396,8 +434,8 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
     } /* end if */
 
     /* Create new node of proper level */
-    if((x=H5SL_new_node(lvl,item,key))==NULL)
-        HGOTO_ERROR(H5E_SLIST,H5E_NOSPACE,NULL,"can't create new skip list node");
+    if(NULL == (x = H5SL_new_node(lvl, item, key, hashval)))
+        HGOTO_ERROR(H5E_SLIST ,H5E_NOSPACE, NULL, "can't create new skip list node")
 
     /* Update the backward links */
     if(*update[0]!=NULL) {
@@ -571,7 +609,7 @@ H5SL_create(H5SL_type_t type, double p, size_t max_level)
     /* Check args */
     HDassert(p>0.0 && p<1.0);
     HDassert(max_level>0 && max_level<=H5SL_LEVEL_MAX);
-    HDassert(type>=H5SL_TYPE_INT && type<=H5SL_TYPE_SIZE);
+    HDassert(type>=H5SL_TYPE_INT && type<=H5SL_TYPE_OBJ);
 
     /* Allocate skip list structure */
     if((new_slist=H5FL_MALLOC(H5SL_t))==NULL)
@@ -588,8 +626,8 @@ H5SL_create(H5SL_type_t type, double p, size_t max_level)
     new_slist->nobjs=0;
 
     /* Allocate the header node */
-    if((header=H5SL_new_node(max_level-1,NULL,NULL))==NULL)
-        HGOTO_ERROR(H5E_SLIST,H5E_NOSPACE,NULL,"memory allocation failed");
+    if(NULL == (header = H5SL_new_node((max_level - 1), NULL, NULL, ULONG_MAX)))
+        HGOTO_ERROR(H5E_SLIST ,H5E_NOSPACE, NULL, "can't create new skip list node")
 
     /* Initialize header node's forward pointers */
     for(u=0; uheader;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_REMOVE(SCALAR, slist, x, update, i, const int, key, checked)
+            H5SL_REMOVE(SCALAR, slist, x, update, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_REMOVE(SCALAR, slist, x, update, i, const haddr_t, key, checked)
+            H5SL_REMOVE(SCALAR, slist, x, update, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_REMOVE(STRING, slist, x, update, i, char *, key, checked)
+            H5SL_REMOVE(STRING, slist, x, update, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_REMOVE(SCALAR, slist, x, update, i, const hsize_t, key, checked)
+            H5SL_REMOVE(SCALAR, slist, x, update, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_REMOVE(SCALAR, slist, x, update, i, const unsigned, key, checked)
+            H5SL_REMOVE(SCALAR, slist, x, update, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_REMOVE(SCALAR, slist, x, update, i, const size_t, key, checked)
+            H5SL_REMOVE(SCALAR, slist, x, update, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_REMOVE(OBJ, slist, x, update, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
@@ -911,9 +952,8 @@ H5SL_remove_first(H5SL_t *slist)
 void *
 H5SL_search(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *checked;                       /* Pointer to last node checked */
     H5SL_node_t *x;                             /* Current node to examine */
-    int i;                                      /* Local index value */
+    uint32_t hashval = 0;                       /* Hash value for key */
     void *ret_value;                            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_search);
@@ -933,27 +973,31 @@ H5SL_search(H5SL_t *slist, const void *key)
     x=slist->header;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const int, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const haddr_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_SEARCH(STRING, slist, x, -, i, char *, key, checked)
+            H5SL_SEARCH(STRING, slist, x, -, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const hsize_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const unsigned, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const size_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_SEARCH(OBJ, slist, x, -, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
@@ -990,9 +1034,8 @@ done:
 void *
 H5SL_less(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *checked;                       /* Pointer to last node checked */
     H5SL_node_t *x;                             /* Current node to examine */
-    int i;                                      /* Local index value */
+    uint32_t hashval = 0;                       /* Hash value for key */
     void *ret_value;                            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_less);
@@ -1012,27 +1055,31 @@ H5SL_less(H5SL_t *slist, const void *key)
     x=slist->header;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const int, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const haddr_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_SEARCH(STRING, slist, x, -, i, char *, key, checked)
+            H5SL_SEARCH(STRING, slist, x, -, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const hsize_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const unsigned, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const size_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_SEARCH(OBJ, slist, x, -, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
@@ -1082,9 +1129,8 @@ done:
 void *
 H5SL_greater(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *checked;                       /* Pointer to last node checked */
     H5SL_node_t *x;                             /* Current node to examine */
-    int i;                                      /* Local index value */
+    uint32_t hashval = 0;                       /* Hash value for key */
     void *ret_value;                            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_greater);
@@ -1104,27 +1150,31 @@ H5SL_greater(H5SL_t *slist, const void *key)
     x = slist->header;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const int, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const haddr_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_SEARCH(STRING, slist, x, -, i, char *, key, checked)
+            H5SL_SEARCH(STRING, slist, x, -, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const hsize_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const unsigned, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_SEARCH(SCALAR, slist, x, -, i, const size_t, key, checked)
+            H5SL_SEARCH(SCALAR, slist, x, -, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_SEARCH(OBJ, slist, x, -, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
@@ -1164,9 +1214,8 @@ done:
 H5SL_node_t *
 H5SL_find(H5SL_t *slist, const void *key)
 {
-    H5SL_node_t *checked;                       /* Pointer to last node checked */
     H5SL_node_t *x;                             /* Current node to examine */
-    int i;                                      /* Local index value */
+    uint32_t hashval = 0;                       /* Hash value for key */
     H5SL_node_t *ret_value;                     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_find);
@@ -1186,27 +1235,31 @@ H5SL_find(H5SL_t *slist, const void *key)
     x=slist->header;
     switch(slist->type) {
         case H5SL_TYPE_INT:
-            H5SL_FIND(SCALAR, slist, x, -, i, const int, key, checked)
+            H5SL_FIND(SCALAR, slist, x, -, const int, key, -)
             break;
 
         case H5SL_TYPE_HADDR:
-            H5SL_FIND(SCALAR, slist, x, -, i, const haddr_t, key, checked)
+            H5SL_FIND(SCALAR, slist, x, -, const haddr_t, key, -)
             break;
 
         case H5SL_TYPE_STR:
-            H5SL_FIND(STRING, slist, x, -, i, char *, key, checked)
+            H5SL_FIND(STRING, slist, x, -, char *, key, hashval)
             break;
 
         case H5SL_TYPE_HSIZE:
-            H5SL_FIND(SCALAR, slist, x, -, i, const hsize_t, key, checked)
+            H5SL_FIND(SCALAR, slist, x, -, const hsize_t, key, -)
             break;
 
         case H5SL_TYPE_UNSIGNED:
-            H5SL_FIND(SCALAR, slist, x, -, i, const unsigned, key, checked)
+            H5SL_FIND(SCALAR, slist, x, -, const unsigned, key, -)
             break;
 
         case H5SL_TYPE_SIZE:
-            H5SL_FIND(SCALAR, slist, x, -, i, const size_t, key, checked)
+            H5SL_FIND(SCALAR, slist, x, -, const size_t, key, -)
+            break;
+
+        case H5SL_TYPE_OBJ:
+            H5SL_FIND(OBJ, slist, x, -, const H5_obj_t, key, -)
             break;
     } /* end switch */
 
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index 98c1b84..9f73893 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -46,7 +46,8 @@ typedef enum {
     H5SL_TYPE_STR,      /* Skip list keys are 'char *'s (ie. strings) */
     H5SL_TYPE_HSIZE,    /* Skip list keys are 'hsize_t's */
     H5SL_TYPE_UNSIGNED, /* Skip list keys are 'unsigned's */
-    H5SL_TYPE_SIZE      /* Skip list keys are 'size_t's */
+    H5SL_TYPE_SIZE,     /* Skip list keys are 'size_t's */
+    H5SL_TYPE_OBJ       /* Skip list keys are 'H5_obj_t's */
 } H5SL_type_t;
 
 /**********/
diff --git a/src/H5SM.c b/src/H5SM.c
index 179a526..9607f23 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -220,7 +220,7 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
     /* Check for sharing attributes in this file, which means that creation
      *  indices must be tracked on object header message in the file.
      */
-    if(type_flags_used & H5O_MESG_ATTR_FLAG)
+    if(type_flags_used & H5O_SHMESG_ATTR_FLAG)
         f->shared->store_msg_crt_idx = TRUE;
 
     /* Write shared message information to the superblock extension */
@@ -263,22 +263,18 @@ H5SM_type_to_flag(unsigned type_id, unsigned *type_flag)
 
     /* Translate the H5O type_id into an H5SM type flag */
     switch(type_id) {
+        case H5O_FILL_ID:
+            type_id = H5O_FILL_NEW_ID;
+            /* Fall through... */
+
         case H5O_SDSPACE_ID:
-            *type_flag = H5O_MESG_SDSPACE_FLAG;
-            break;
         case H5O_DTYPE_ID:
-            *type_flag = H5O_MESG_DTYPE_FLAG;
-            break;
-        case H5O_FILL_ID:
         case H5O_FILL_NEW_ID:
-            *type_flag = H5O_MESG_FILL_FLAG;
-            break;
         case H5O_PLINE_ID:
-            *type_flag = H5O_MESG_PLINE_FLAG;
-            break;
         case H5O_ATTR_ID:
-            *type_flag = H5O_MESG_ATTR_FLAG;
+            *type_flag = (unsigned)1 << type_id;
             break;
+
         default:
             HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "unknown message type ID")
     } /* end switch */
@@ -307,7 +303,7 @@ done:
 ssize_t
 H5SM_get_index(const H5SM_master_table_t *table, unsigned type_id)
 {
-    ssize_t x;
+    size_t x;
     unsigned type_flag;
     ssize_t ret_value = FAIL;
 
@@ -322,7 +318,7 @@ H5SM_get_index(const H5SM_master_table_t *table, unsigned type_id)
      */
     for(x = 0; x < table->num_indexes; ++x)
         if(table->indexes[x].mesg_types & type_flag)
-            HGOTO_DONE(x)
+            HGOTO_DONE((ssize_t)x)
 
     /* At this point, ret_value is either the location of the correct
      * index or it's still FAIL because we didn't find an index.
@@ -1828,7 +1824,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
             /* Check for sharing attributes in this file, which means that creation
              *  indices must be tracked on object header message in the file.
              */
-            if(index_flags[u] & H5O_MESG_ATTR_FLAG)
+            if(index_flags[u] & H5O_SHMESG_ATTR_FLAG)
                 shared->store_msg_crt_idx = TRUE;
         } /* end for */
 
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 5d01fec..c603251 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -42,6 +42,7 @@ static hssize_t H5S_all_serial_size(const H5S_t *space);
 static herr_t H5S_all_serialize(const H5S_t *space, uint8_t *buf);
 static herr_t H5S_all_deserialize(H5S_t *space, const uint8_t *buf);
 static herr_t H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t H5S_all_offset(const H5S_t *space, hsize_t *off);
 static htri_t H5S_all_is_contiguous(const H5S_t *space);
 static htri_t H5S_all_is_single(const H5S_t *space);
 static htri_t H5S_all_is_regular(const H5S_t *space);
@@ -70,6 +71,7 @@ const H5S_select_class_t H5S_sel_all[1] = {{
     H5S_all_serialize,
     H5S_all_deserialize,
     H5S_all_bounds,
+    H5S_all_offset,
     H5S_all_is_contiguous,
     H5S_all_is_single,
     H5S_all_is_regular,
@@ -585,26 +587,61 @@ done:
 herr_t
 H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
-    int rank;                  /* Dataspace rank */
-    int i;                     /* index variable */
+    unsigned rank;                  /* Dataspace rank */
+    unsigned i;                     /* index variable */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_all_bounds);
+    FUNC_ENTER_NOAPI_NOFUNC(H5S_all_bounds)
 
-    assert(space);
-    assert(start);
-    assert(end);
+    HDassert(space);
+    HDassert(start);
+    HDassert(end);
 
     /* Get the dataspace extent rank */
-    rank=space->extent.rank;
+    rank = space->extent.rank;
 
     /* Just copy over the complete extent */
-    for(i=0; iextent.size[i]-1;
+    for(i = 0; i < rank; i++) {
+        start[i] = 0;
+        end[i] = space->extent.size[i] - 1;
     } /* end for */
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
-}   /* H5Sget_all_bounds() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+}   /* H5S_all_bounds() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
+    H5S_all_offset
+ PURPOSE
+    Gets the linear offset of the first element for the selection.
+ USAGE
+    herr_t H5S_all_offset(space, offset)
+        const H5S_t *space;     IN: Dataspace pointer of selection to query
+        hsize_t *offset;        OUT: Linear offset of first element in selection
+ RETURNS
+    Non-negative on success, negative on failure
+ DESCRIPTION
+    Retrieves the linear offset (in "units" of elements) of the first element
+    selected within the dataspace.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+    Calling this function on a "none" selection returns fail.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5S_all_offset(const H5S_t *space, hsize_t *offset)
+{
+    FUNC_ENTER_NOAPI_NOFUNC(H5S_all_offset)
+
+    HDassert(space);
+    HDassert(offset);
+
+    /* 'All' selections always start at offset 0 */
+    *offset = 0;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+}   /* H5S_all_offset() */
 
 
 /*--------------------------------------------------------------------------
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 8acbfd5..455a251 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -57,6 +57,7 @@ static hssize_t H5S_hyper_serial_size(const H5S_t *space);
 static herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t *buf);
 static herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf);
 static herr_t H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t H5S_hyper_offset(const H5S_t *space, hsize_t *offset);
 static htri_t H5S_hyper_is_contiguous(const H5S_t *space);
 static htri_t H5S_hyper_is_single(const H5S_t *space);
 static htri_t H5S_hyper_is_regular(const H5S_t *space);
@@ -90,6 +91,7 @@ const H5S_select_class_t H5S_sel_hyper[1] = {{
     H5S_hyper_serialize,
     H5S_hyper_deserialize,
     H5S_hyper_bounds,
+    H5S_hyper_offset,
     H5S_hyper_is_contiguous,
     H5S_hyper_is_single,
     H5S_hyper_is_regular,
@@ -275,12 +277,17 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
         /* Don't flatten adjacent elements into contiguous block if the
          * element size is 0.  This is for the H5S_select_shape_same() code.
          */
-        if(iter->elmt_size>0) {
+        if(iter->elmt_size > 0) {
             /* Check for any "contiguous" blocks that can be flattened */
-            for(u=rank-1; u>0; u--) {
-                if(tdiminfo[u].count==1 && tdiminfo[u].block==mem_size[u])
+            for(u = (rank - 1); u > 0; u--) {
+                if(tdiminfo[u].count == 1 && tdiminfo[u].block == mem_size[u]) {
                     cont_dim++;
+                    iter->u.hyp.flattened[u] = TRUE;
+                } /* end if */
+                else
+                    iter->u.hyp.flattened[u] = FALSE;
             } /* end for */
+            iter->u.hyp.flattened[0] = FALSE;
         } /* end if */
 
         /* Check if the regular selection can be "flattened" */
@@ -430,23 +437,59 @@ H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
     /* Check for a single "regular" hyperslab */
     if(iter->u.hyp.diminfo_valid) {
         /* Check if this is a "flattened" regular hyperslab selection */
-        if(iter->u.hyp.iter_rank!=0 && iter->u.hyp.iter_rankrank) {
-            unsigned flat_dim;  /* The rank of the flattened dimension */
+        if(iter->u.hyp.iter_rank != 0 && iter->u.hyp.iter_rank < iter->rank) {
+            int u, v;           /* Dimension indices */
+
+            /* Set the starting rank of both the "natural" & "flattened" dimensions */
+            u = iter->rank - 1;
+            v = iter->u.hyp.iter_rank - 1;
+
+            /* Construct the "natural" dimensions from a set of flattened coordinates */
+            while(u >= 0) {
+                if(iter->u.hyp.flattened[u]) {
+                    int begin = u;      /* The rank of the first flattened dimension */
+
+                    /* Walk up through as many flattened dimensions as possible */
+                    do {
+                        u--;
+                    } while(u >= 0 && iter->u.hyp.flattened[u]);
 
-            /* Get the rank of the flattened dimension */
-            flat_dim=iter->u.hyp.iter_rank-1;
+                    /* Compensate for possibly overshooting dim 0 */
+                    if(u < 0)
+                        u = 0;
 
-            /* Copy the coordinates up to where things got flattened */
-            HDmemcpy(coords,iter->u.hyp.off,sizeof(hsize_t)*flat_dim);
+                    /* Sanity check */
+                    HDassert(v >= 0);
 
-            /* Compute the coordinates for the flattened dimensions */
-            H5V_array_calc(iter->u.hyp.off[flat_dim],iter->rank-flat_dim,&(iter->dims[flat_dim]),&(coords[flat_dim]));
+                    /* Compute the coords for the flattened dimensions */
+                    H5V_array_calc(iter->u.hyp.off[v], (unsigned)((begin - u) + 1), &(iter->dims[u]), &(coords[u]));
+
+                    /* Continue to faster dimension in both indices */
+                    u--;
+                    v--;
+                } /* end if */
+                else {
+                    /* Walk up through as many non-flattened dimensions as possible */
+                    while(u >= 0 && !iter->u.hyp.flattened[u]) {
+                        /* Sanity check */
+                        HDassert(v >= 0);
+
+                        /* Copy the coordinate */
+                        coords[u] = iter->u.hyp.off[v];
+
+                        /* Continue to faster dimension in both indices */
+                        u--;
+                        v--;
+                    } /* end while */
+                } /* end else */
+            } /* end while */
+            HDassert(v < 0);
         } /* end if */
         else
-            HDmemcpy(coords,iter->u.hyp.off,sizeof(hsize_t)*iter->rank);
+            HDmemcpy(coords, iter->u.hyp.off, sizeof(hsize_t) * iter->rank);
     } /* end if */
     else
-        HDmemcpy(coords,iter->u.hyp.off,sizeof(hsize_t)*iter->rank);
+        HDmemcpy(coords, iter->u.hyp.off, sizeof(hsize_t) * iter->rank);
 
     FUNC_LEAVE_NOAPI(SUCCEED);
 }   /* H5S_hyper_iter_coords() */
@@ -2515,7 +2558,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
         hid_t dsid;             IN: Dataspace ID of selection to query
         hsize_t startblock;     IN: Hyperslab block to start with
         hsize_t numblocks;      IN: Number of hyperslab blocks to get
-        hsize_t *buf;           OUT: List of hyperslab blocks selected
+        hsize_t buf[];          OUT: List of hyperslab blocks selected
  RETURNS
     Non-negative on success, negative on failure
  DESCRIPTION
@@ -2536,13 +2579,14 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf)
+H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
+    hsize_t numblocks, hsize_t buf[/*numblocks*/])
 {
     H5S_t	*space = NULL;      /* Dataspace to modify selection of */
     herr_t ret_value;        /* return value */
 
     FUNC_ENTER_API(H5Sget_select_hyper_blocklist, FAIL);
-    H5TRACE4("e", "ihh*h", spaceid, startblock, numblocks, buf);
+    H5TRACE4("e", "ihh*[a2]h", spaceid, startblock, numblocks, buf);
 
     /* Check args */
     if(buf==NULL)
@@ -2708,6 +2752,114 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
+    H5S_hyper_offset
+ PURPOSE
+    Gets the linear offset of the first element for the selection.
+ USAGE
+    herr_t H5S_hyper_offset(space, offset)
+        const H5S_t *space;     IN: Dataspace pointer of selection to query
+        hsize_t *offset;        OUT: Linear offset of first element in selection
+ RETURNS
+    Non-negative on success, negative on failure
+ DESCRIPTION
+    Retrieves the linear offset (in "units" of elements) of the first element
+    selected within the dataspace.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+    Calling this function on a "none" selection returns fail.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
+{
+    const hssize_t *sel_offset; /* Pointer to the selection's offset */
+    const hsize_t *dim_size;    /* Pointer to a dataspace's extent */
+    hsize_t accum;              /* Accumulator for dimension sizes */
+    int rank;                   /* Dataspace rank */
+    int i;                      /* index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(H5S_hyper_offset, FAIL)
+
+    HDassert(space);
+    HDassert(offset);
+
+    /* Start at linear offset 0 */
+    *offset = 0;
+
+    /* Set up pointers to arrays of values */
+    rank = space->extent.rank;
+    sel_offset = space->select.offset;
+    dim_size = space->extent.size;
+
+    /* Check for a "regular" hyperslab selection */
+    if(space->select.sel_info.hslab->diminfo_valid) {
+        const H5S_hyper_dim_t *diminfo = space->select.sel_info.hslab->opt_diminfo; /* Local alias for diminfo */
+
+        /* Loop through starting coordinates, calculating the linear offset */
+        accum = 1;
+        for(i = (rank - 1); i >= 0; i--) {
+            hssize_t hyp_offset = (hssize_t)diminfo[i].start + sel_offset[i]; /* Hyperslab's offset in this dimension */
+
+            /* Check for offset moving selection out of the dataspace */
+            if(hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
+
+            /* Add the hyperslab's offset in this dimension to the total linear offset */
+            *offset += hyp_offset * accum;
+
+            /* Increase the accumulator */
+            accum *= dim_size[i];
+        } /* end for */
+    } /* end if */
+    else {
+        const H5S_hyper_span_t *span;           /* Hyperslab span node */
+        hsize_t dim_accum[H5S_MAX_RANK];        /* Accumulators, for each dimension */
+
+        /* Calculate the accumulator for each dimension */
+        accum = 1;
+        for(i = (rank - 1); i >= 0; i--) {
+            /* Set the accumulator for this dimension */
+            dim_accum[i] = accum;
+
+            /* Increase the accumulator */
+            accum *= dim_size[i];
+        } /* end for */
+
+        /* Get information for the first span, in the slowest changing dimension */
+        span = space->select.sel_info.hslab->span_lst->head;
+
+        /* Work down the spans, computing the linear offset */
+        i = 0;
+        while(span) {
+            hssize_t hyp_offset = (hssize_t)span->low + sel_offset[i]; /* Hyperslab's offset in this dimension */
+
+            /* Check for offset moving selection out of the dataspace */
+            if(hyp_offset < 0 || (hsize_t)hyp_offset >= dim_size[i])
+                HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
+
+            /* Add the hyperslab's offset in this dimension to the total linear offset */
+            *offset += hyp_offset * dim_accum[i];
+
+            /* Advance to first span in "down" dimension */
+            if(span->down) {
+                HDassert(span->down->head);
+                span = span->down->head;
+            } /* end if */
+            else
+                span = NULL;
+            i++;
+        } /* end while */
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}   /* H5S_hyper_offset() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
     H5S_hyper_is_contiguous
  PURPOSE
     Check if a hyperslab selection is contiguous within the dataspace extent.
@@ -2727,12 +2879,10 @@ done:
 htri_t
 H5S_hyper_is_contiguous(const H5S_t *space)
 {
-    H5S_hyper_span_info_t *spans;   /* Hyperslab span info node */
-    H5S_hyper_span_t *span;         /* Hyperslab span node */
-    unsigned u;                     /* index variable */
     unsigned small_contiguous,      /* Flag for small contiguous block */
         large_contiguous;           /* Flag for large contiguous block */
-    htri_t ret_value=FALSE;         /* return value */
+    unsigned u;                     /* index variable */
+    htri_t ret_value = FALSE;       /* Return value */
 
     FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_contiguous);
 
@@ -2791,6 +2941,9 @@ H5S_hyper_is_contiguous(const H5S_t *space)
             ret_value=TRUE;
     } /* end if */
     else {
+        H5S_hyper_span_info_t *spans;   /* Hyperslab span info node */
+        H5S_hyper_span_t *span;         /* Hyperslab span node */
+
         /*
          * For a hyperslab to be contiguous, it must have only one block and
          * (either it's size must be the same as the dataspace extent's in all
@@ -4127,35 +4280,37 @@ done:
  EXAMPLES
  REVISION LOG
 --------------------------------------------------------------------------*/
-herr_t
+htri_t
 H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset)
 {
     unsigned u;                         /* Local index variable */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t ret_value = FALSE;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_normalize_offset);
+    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_normalize_offset)
 
-    assert(space);
+    HDassert(space);
 
-    /* Check for 'all' selection, instead of a hyperslab selection */
-    /* (Technically, this check shouldn't be in the "hyperslab" routines...) */
-    if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_HYPERSLABS) {
+    /* Check for hyperslab selection & offset changed */
+    if(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS && space->select.offset_changed) {
         /* Copy & invert the selection offset */
-        for(u=0; uextent.rank; u++) {
+        for(u = 0; uextent.rank; u++) {
             old_offset[u] = space->select.offset[u];
             space->select.offset[u] = -space->select.offset[u];
         } /* end for */
 
         /* Call the existing 'adjust' routine */
-        if(H5S_hyper_adjust_s(space, space->select.offset)<0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization");
+        if(H5S_hyper_adjust_s(space, space->select.offset) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization")
 
         /* Zero out the selection offset */
         HDmemset(space->select.offset, 0, sizeof(hssize_t) * space->extent.rank);
+
+        /* Indicate that the offset was normalized */
+        ret_value = TRUE;
     } /* end if */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }   /* H5S_hyper_normalize_offset() */
 
 
@@ -4183,25 +4338,22 @@ done:
 herr_t
 H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_denormalize_offset);
+    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_denormalize_offset)
 
-    assert(space);
+    HDassert(space);
+    HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
 
-    /* Check for 'all' selection, instead of a hyperslab selection */
-    /* (Technically, this check shouldn't be in the "hyperslab" routines...) */
-    if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_HYPERSLABS) {
-        /* Call the existing 'adjust' routine */
-        if(H5S_hyper_adjust_s(space, old_offset)<0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization");
+    /* Call the existing 'adjust' routine */
+    if(H5S_hyper_adjust_s(space, old_offset) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADSELECT, FAIL, "can't perform hyperslab normalization")
 
-        /* Copy the selection offset over */
-        HDmemcpy(space->select.offset, old_offset, sizeof(hssize_t) * space->extent.rank);
-    } /* end if */
+    /* Copy the selection offset over */
+    HDmemcpy(space->select.offset, old_offset, sizeof(hssize_t) * space->extent.rank);
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }   /* H5S_hyper_denormalize_offset() */
 
 
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 89a1875..88ab67f 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -43,6 +43,7 @@ static hssize_t H5S_none_serial_size(const H5S_t *space);
 static herr_t H5S_none_serialize(const H5S_t *space, uint8_t *buf);
 static herr_t H5S_none_deserialize(H5S_t *space, const uint8_t *buf);
 static herr_t H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t H5S_none_offset(const H5S_t *space, hsize_t *off);
 static htri_t H5S_none_is_contiguous(const H5S_t *space);
 static htri_t H5S_none_is_single(const H5S_t *space);
 static htri_t H5S_none_is_regular(const H5S_t *space);
@@ -71,6 +72,7 @@ const H5S_select_class_t H5S_sel_none[1] = {{
     H5S_none_serialize,
     H5S_none_deserialize,
     H5S_none_bounds,
+    H5S_none_offset,
     H5S_none_is_contiguous,
     H5S_none_is_single,
     H5S_none_is_regular,
@@ -565,11 +567,43 @@ H5S_none_bounds(const H5S_t UNUSED *space, hsize_t UNUSED *start, hsize_t UNUSED
 
 /*--------------------------------------------------------------------------
  NAME
+    H5S_none_offset
+ PURPOSE
+    Gets the linear offset of the first element for the selection.
+ USAGE
+    herr_t H5S_none_offset(space, offset)
+        const H5S_t *space;     IN: Dataspace pointer of selection to query
+        hsize_t *offset;        OUT: Linear offset of first element in selection
+ RETURNS
+    Non-negative on success, negative on failure
+ DESCRIPTION
+    Retrieves the linear offset (in "units" of elements) of the first element
+    selected within the dataspace.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+    Calling this function on a "none" selection returns fail.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5S_none_offset(const H5S_t *space, hsize_t *offset)
+{
+    FUNC_ENTER_NOAPI_NOFUNC(H5S_none_offset)
+
+    HDassert(space);
+    HDassert(offset);
+
+    FUNC_LEAVE_NOAPI(FAIL)
+}   /* H5S_none_offset() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
     H5S_none_is_contiguous
  PURPOSE
     Check if a "none" selection is contiguous within the dataspace extent.
  USAGE
-    htri_t H5S_all_is_contiguous(space)
+    htri_t H5S_none_is_contiguous(space)
         H5S_t *space;           IN: Dataspace pointer to check
  RETURNS
     TRUE/FALSE/FAIL
@@ -767,7 +801,7 @@ done:
  PURPOSE
     Create a list of offsets & lengths for a selection
  USAGE
-    herr_t H5S_all_get_seq_list(space,flags,iter,maxseq,maxelem,nseq,nelem,off,len)
+    herr_t H5S_none_get_seq_list(space,flags,iter,maxseq,maxelem,nseq,nelem,off,len)
         H5S_t *space;           IN: Dataspace containing selection to use.
         unsigned flags;         IN: Flags for extra information about operation
         H5S_sel_iter_t *iter;   IN/OUT: Selection iterator describing last
@@ -816,4 +850,5 @@ H5S_none_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_
     *nelem=0;
 
     FUNC_LEAVE_NOAPI(SUCCEED);
-} /* end H5S_all_get_seq_list() */
+} /* end H5S_none_get_seq_list() */
+
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 71cc43b..e13e6be 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -133,8 +133,10 @@ typedef hssize_t (*H5S_sel_serial_size_func_t)(const H5S_t *space);
 typedef herr_t (*H5S_sel_serialize_func_t)(const H5S_t *space, uint8_t *buf);
 /* Method to store create selection from "serialized" form (a byte sequence suitable for storing on disk) */
 typedef herr_t (*H5S_sel_deserialize_func_t)(H5S_t *space, const uint8_t *buf);
-/* Method to determine to smallest n-D bounding box containing the current selection */
+/* Method to determine smallest n-D bounding box containing the current selection */
 typedef herr_t (*H5S_sel_bounds_func_t)(const H5S_t *space, hsize_t *start, hsize_t *end);
+/* Method to determine linear offset of initial element in selection within dataspace */
+typedef herr_t (*H5S_sel_offset_func_t)(const H5S_t *space, hsize_t *offset);
 /* Method to determine if current selection is contiguous */
 typedef htri_t (*H5S_sel_is_contiguous_func_t)(const H5S_t *space);
 /* Method to determine if current selection is a single block */
@@ -159,6 +161,7 @@ typedef struct {
     H5S_sel_serialize_func_t serialize;         /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */
     H5S_sel_deserialize_func_t deserialize;     /* Method to store create selection from "serialized" form (a byte sequence suitable for storing on disk) */
     H5S_sel_bounds_func_t bounds;               /* Method to determine to smallest n-D bounding box containing the current selection */
+    H5S_sel_offset_func_t offset;               /* Method to determine linear offset of initial element in selection within dataspace */
     H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */
     H5S_sel_is_single_func_t is_single;         /* Method to determine if current selection is a single block */
     H5S_sel_is_regular_func_t is_regular;       /* Method to determine if current selection is "regular" */
@@ -169,6 +172,7 @@ typedef struct {
 /* Selection information object */
 typedef struct {
     const H5S_select_class_t *type;     /* Pointer to selection's class info */
+    hbool_t offset_changed;             /* Indicate that the offset for the selection has been changed */
     hssize_t offset[H5S_MAX_RANK];      /* Offset within the extent */
     hsize_t num_elem;   /* Number of elements in selection */
     union {
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index eb37945..cf7751e 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -44,6 +44,7 @@ static hssize_t H5S_point_serial_size(const H5S_t *space);
 static herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf);
 static herr_t H5S_point_deserialize(H5S_t *space, const uint8_t *buf);
 static herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+static herr_t H5S_point_offset(const H5S_t *space, hsize_t *off);
 static htri_t H5S_point_is_contiguous(const H5S_t *space);
 static htri_t H5S_point_is_single(const H5S_t *space);
 static htri_t H5S_point_is_regular(const H5S_t *space);
@@ -72,6 +73,7 @@ const H5S_select_class_t H5S_sel_point[1] = {{
     H5S_point_serialize,
     H5S_point_deserialize,
     H5S_point_bounds,
+    H5S_point_offset,
     H5S_point_is_contiguous,
     H5S_point_is_single,
     H5S_point_is_regular,
@@ -380,71 +382,70 @@ H5S_point_iter_release (H5S_sel_iter_t UNUSED * iter)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t **_coord)
+H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *coord)
 {
     H5S_pnt_node_t *top, *curr, *new_node; /* Point selection nodes */
-    const hsize_t *coord=(const hsize_t *)_coord;     /* Pointer to the actual coordinates */
-    unsigned i;                 /* Counter */
-    herr_t      ret_value=SUCCEED;       /* Return value */
+    unsigned i;                         /* Counter */
+    herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_point_add);
+    FUNC_ENTER_NOAPI_NOINIT(H5S_point_add)
 
-    assert(space);
-    assert(num_elem>0);
-    assert(coord);
-    assert(op==H5S_SELECT_SET || op==H5S_SELECT_APPEND || op==H5S_SELECT_PREPEND);
+    HDassert(space);
+    HDassert(num_elem > 0);
+    HDassert(coord);
+    HDassert(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND);
 
-    top=curr=NULL;
-    for(i=0; ipnt = H5MM_malloc(space->extent.rank*sizeof(hsize_t)))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate coordinate information");
+        if(NULL == (new_node->pnt = H5MM_malloc(space->extent.rank * sizeof(hsize_t))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate coordinate information")
 
         /* Copy over the coordinates */
-        HDmemcpy(new_node->pnt,coord+(i*space->extent.rank),(space->extent.rank*sizeof(hsize_t)));
+        HDmemcpy(new_node->pnt, coord + (i * space->extent.rank), (space->extent.rank * sizeof(hsize_t)));
 
         /* Link into list */
-        new_node->next=NULL;
-        if(top==NULL)
-            top=new_node;
+        new_node->next = NULL;
+        if(top == NULL)
+            top = new_node;
         else
-            curr->next=new_node;
-        curr=new_node;
+            curr->next = new_node;
+        curr = new_node;
     } /* end for */
 
     /* Insert the list of points selected in the proper place */
-    if(op==H5S_SELECT_SET || op==H5S_SELECT_PREPEND) {
+    if(op == H5S_SELECT_SET || op == H5S_SELECT_PREPEND) {
         /* Append current list, if there is one */
-        if(space->select.sel_info.pnt_lst->head!=NULL)
-            curr->next=space->select.sel_info.pnt_lst->head;
+        if(space->select.sel_info.pnt_lst->head != NULL)
+            curr->next = space->select.sel_info.pnt_lst->head;
 
         /* Put new list in point selection */
-        space->select.sel_info.pnt_lst->head=top;
+        space->select.sel_info.pnt_lst->head = top;
     } /* end if */
     else {  /* op==H5S_SELECT_APPEND */
-        new_node=space->select.sel_info.pnt_lst->head;
-        if(new_node!=NULL) {
-            while(new_node->next!=NULL)
-                new_node=new_node->next;
+        new_node = space->select.sel_info.pnt_lst->head;
+        if(new_node != NULL) {
+            while(new_node->next != NULL)
+                new_node = new_node->next;
 
             /* Append new list to point selection */
-            new_node->next=top;
+            new_node->next = top;
         } /* end if */
         else
-            space->select.sel_info.pnt_lst->head=top;
+            space->select.sel_info.pnt_lst->head = top;
     } /* end else */
 
     /* Set the number of elements in the new selection */
-    if(op==H5S_SELECT_SET)
-        space->select.num_elem=num_elem;
+    if(op == H5S_SELECT_SET)
+        space->select.num_elem = num_elem;
     else
-        space->select.num_elem+=num_elem;
+        space->select.num_elem += num_elem;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }   /* H5S_point_add() */
 
 
@@ -505,7 +506,7 @@ H5S_point_release (H5S_t *space)
         hid_t dsid;             IN: Dataspace ID of selection to modify
         H5S_seloper_t op;       IN: Operation to perform on current selection
         size_t num_elem;        IN: Number of elements in COORD array.
-        const hsize_t **coord; IN: The location of each element selected
+        const hsize_t *coord;   IN: The location of each element selected
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
@@ -526,40 +527,38 @@ H5S_point_release (H5S_t *space)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem,
-    const hsize_t **coord)
+H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem,
+    const hsize_t *coord)
 {
-    herr_t ret_value=SUCCEED;  /* return value */
+    herr_t ret_value = SUCCEED;  /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_select_elements);
+    FUNC_ENTER_NOAPI_NOINIT(H5S_select_elements)
 
     /* Check args */
-    assert(space);
-    assert(num_elem);
-    assert(coord);
-    assert(op==H5S_SELECT_SET || op==H5S_SELECT_APPEND || op==H5S_SELECT_PREPEND);
+    HDassert(space);
+    HDassert(num_elem);
+    HDassert(coord);
+    HDassert(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND);
 
     /* If we are setting a new selection, remove current selection first */
-    if(op==H5S_SELECT_SET || H5S_GET_SELECT_TYPE(space)!=H5S_SEL_POINTS) {
-        if(H5S_SELECT_RELEASE(space)<0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release point selection");
-    } /* end if */
+    if(op == H5S_SELECT_SET || H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS)
+        if(H5S_SELECT_RELEASE(space) < 0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't release point selection")
 
     /* Allocate space for the point selection information if necessary */
-    if(H5S_GET_SELECT_TYPE(space)!=H5S_SEL_POINTS || space->select.sel_info.pnt_lst==NULL) {
-        if((space->select.sel_info.pnt_lst = H5FL_CALLOC(H5S_pnt_list_t))==NULL)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate element information");
-    } /* end if */
+    if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_POINTS || space->select.sel_info.pnt_lst == NULL)
+        if(NULL == (space->select.sel_info.pnt_lst = H5FL_CALLOC(H5S_pnt_list_t)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate element information")
 
     /* Add points to selection */
-    if(H5S_point_add(space,op,num_elem,coord)<0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert elements");
+    if(H5S_point_add(space, op, num_elem, coord) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL, "can't insert elements")
 
     /* Set selection type */
-    space->select.type=H5S_sel_point;
+    space->select.type = H5S_sel_point;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }   /* H5S_select_elements() */
 
 
@@ -965,7 +964,7 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
         hid_t dsid;             IN: Dataspace ID of selection to query
         hsize_t startpoint;     IN: Element point to start with
         hsize_t numpoints;      IN: Number of element points to get
-        hsize_t *buf;           OUT: List of element points selected
+        hsize_t buf[];          OUT: List of element points selected
  RETURNS
     Non-negative on success, negative on failure
  DESCRIPTION
@@ -985,13 +984,14 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf)
+H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
+    hsize_t numpoints, hsize_t buf[/*numpoints*/])
 {
     H5S_t	*space = NULL;      /* Dataspace to modify selection of */
     herr_t ret_value;        /* return value */
 
     FUNC_ENTER_API(H5Sget_select_elem_pointlist, FAIL);
-    H5TRACE4("e", "ihh*h", spaceid, startpoint, numpoints, buf);
+    H5TRACE4("e", "ihh*[a2]h", spaceid, startpoint, numpoints, buf);
 
     /* Check args */
     if(buf==NULL)
@@ -1038,48 +1038,114 @@ static herr_t
 H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 {
     H5S_pnt_node_t *node;       /* Point node */
-    int rank;                   /* Dataspace rank */
-    int i;                      /* index variable */
-    herr_t ret_value=SUCCEED;   /* Return value */
+    unsigned rank;              /* Dataspace rank */
+    unsigned u;                 /* index variable */
+    herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_point_bounds);
+    FUNC_ENTER_NOAPI_NOINIT(H5S_point_bounds)
 
-    assert(space);
-    assert(start);
-    assert(end);
+    HDassert(space);
+    HDassert(start);
+    HDassert(end);
 
     /* Get the dataspace extent rank */
-    rank=space->extent.rank;
+    rank = space->extent.rank;
 
     /* Set the start and end arrays up */
-    for(i=0; iselect.sel_info.pnt_lst->head;
-    while(node!=NULL) {
-        for(i=0; iselect.sel_info.pnt_lst->head;
+    while(node != NULL) {
+        for(u = 0; u < rank; u++) {
             /* Check for offset moving selection negative */
-            if(((hssize_t)node->pnt[i]+space->select.offset[i])<0)
+            if(((hssize_t)node->pnt[u] + space->select.offset[u]) < 0)
                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
 
-            if(start[i]>(node->pnt[i]+space->select.offset[i]))
-                start[i]=node->pnt[i]+space->select.offset[i];
-            if(end[i]<(node->pnt[i]+space->select.offset[i]))
-                end[i]=node->pnt[i]+space->select.offset[i];
+            if(start[u] > (node->pnt[u] + space->select.offset[u]))
+                start[u] = node->pnt[u] + space->select.offset[u];
+            if(end[u] < (node->pnt[u] + space->select.offset[u]))
+                end[u] = node->pnt[u] + space->select.offset[u];
         } /* end for */
-        node=node->next;
+        node = node->next;
       } /* end while */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }   /* H5S_point_bounds() */
 
 
 /*--------------------------------------------------------------------------
  NAME
+    H5S_point_offset
+ PURPOSE
+    Gets the linear offset of the first element for the selection.
+ USAGE
+    herr_t H5S_point_offset(space, offset)
+        const H5S_t *space;     IN: Dataspace pointer of selection to query
+        hsize_t *offset;        OUT: Linear offset of first element in selection
+ RETURNS
+    Non-negative on success, negative on failure
+ DESCRIPTION
+    Retrieves the linear offset (in "units" of elements) of the first element
+    selected within the dataspace.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+    Calling this function on a "none" selection returns fail.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5S_point_offset(const H5S_t *space, hsize_t *offset)
+{
+    const hsize_t *pnt;         /* Pointer to a selected point's coordinates */
+    const hssize_t *sel_offset; /* Pointer to the selection's offset */
+    const hsize_t *dim_size;    /* Pointer to a dataspace's extent */
+    hsize_t accum;              /* Accumulator for dimension sizes */
+    int rank;                   /* Dataspace rank */
+    int i;                      /* index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(H5S_point_offset, FAIL)
+
+    HDassert(space);
+    HDassert(offset);
+
+    /* Start at linear offset 0 */
+    *offset = 0;
+
+    /* Set up pointers to arrays of values */
+    pnt = space->select.sel_info.pnt_lst->head->pnt;
+    sel_offset = space->select.offset;
+    dim_size = space->extent.size;
+
+    /* Loop through coordinates, calculating the linear offset */
+    rank = space->extent.rank;
+    accum = 1;
+    for(i = (rank - 1); i >= 0; i--) {
+        hssize_t pnt_offset = (hssize_t)pnt[i] + sel_offset[i]; /* Point's offset in this dimension */
+
+        /* Check for offset moving selection out of the dataspace */
+        if(pnt_offset < 0 || (hsize_t)pnt_offset >= dim_size[i])
+            HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "offset moves selection out of bounds")
+
+        /* Add the point's offset in this dimension to the total linear offset */
+        *offset += pnt_offset * accum;
+
+        /* Increase the accumulator */
+        accum *= dim_size[i];
+    } /* end for */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+}   /* H5S_point_offset() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
     H5S_point_is_contiguous
  PURPOSE
     Check if a point selection is contiguous within the dataspace extent.
@@ -1258,7 +1324,7 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
         hid_t dsid;             IN: Dataspace ID of selection to modify
         H5S_seloper_t op;       IN: Operation to perform on current selection
         size_t num_elem;        IN: Number of elements in COORD array.
-        const hsize_t **coord; IN: The location of each element selected
+        const hsize_t *coord;   IN: The location of each element selected
  RETURNS
     Non-negative on success/Negative on failure
  DESCRIPTION
@@ -1280,32 +1346,32 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
 --------------------------------------------------------------------------*/
 herr_t
 H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem,
-    const hsize_t **coord)
+    const hsize_t *coord)
 {
-    H5S_t	*space = NULL;  /* Dataspace to modify selection of */
-    herr_t ret_value;  /* return value */
+    H5S_t *space = NULL;        /* Dataspace to modify selection of */
+    herr_t ret_value;           /* Return value */
 
-    FUNC_ENTER_API(H5Sselect_elements, FAIL);
-    H5TRACE4("e", "iSsz**h", spaceid, op, num_elem, coord);
+    FUNC_ENTER_API(H5Sselect_elements, FAIL)
+    H5TRACE4("e", "iSsz*h", spaceid, op, num_elem, coord);
 
     /* Check args */
-    if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace");
-    if (H5S_SCALAR==H5S_GET_EXTENT_TYPE(space))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_SCALAR space");
-    if (H5S_NULL==H5S_GET_EXTENT_TYPE(space))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_NULL space");
-    if(coord==NULL || num_elem==0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "elements not specified");
-    if(!(op==H5S_SELECT_SET || op==H5S_SELECT_APPEND || op==H5S_SELECT_PREPEND))
-        HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "unsupported operation attempted");
+    if(NULL == (space = H5I_object_verify(spaceid, H5I_DATASPACE)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
+    if(H5S_SCALAR == H5S_GET_EXTENT_TYPE(space))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_SCALAR space")
+    if(H5S_NULL == H5S_GET_EXTENT_TYPE(space))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "point doesn't support H5S_NULL space")
+    if(coord == NULL || num_elem == 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "elements not specified")
+    if(!(op == H5S_SELECT_SET || op == H5S_SELECT_APPEND || op == H5S_SELECT_PREPEND))
+        HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL, "unsupported operation attempted")
 
     /* Call the real element selection routine */
-    if((ret_value=H5S_select_elements(space,op,num_elem,coord))<0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't select elements");
+    if((ret_value = H5S_select_elements(space, op, num_elem, coord)) < 0)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't select elements")
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }   /* H5Sselect_elements() */
 
 
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index ec48de9..bd27f09 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -78,8 +78,9 @@ typedef struct {
 
     /* "Flattened" regular hyperslab selection fields */
     H5S_hyper_dim_t diminfo[H5S_MAX_RANK];   /* "Flattened" regular selection information */
-    hsize_t size[H5S_MAX_RANK];          /* "Flattened" dataspace extent information */
-    hssize_t sel_off[H5S_MAX_RANK];      /* "Flattened" selection offset information */
+    hsize_t size[H5S_MAX_RANK];         /* "Flattened" dataspace extent information */
+    hssize_t sel_off[H5S_MAX_RANK];     /* "Flattened" selection offset information */
+    hbool_t flattened[H5S_MAX_RANK];    /* Whether this dimension has been flattened */
 
     /* Irregular hyperslab selection fields */
     H5S_hyper_span_info_t *spans;  /* Pointer to copy of the span tree */
@@ -152,6 +153,7 @@ typedef struct H5S_iostats_t {
 #define H5S_SELECT_SERIAL_SIZE(S)       ((*(S)->select.type->serial_size)(S))
 #define H5S_SELECT_SERIALIZE(S,BUF)     ((*(S)->select.type->serialize)(S,BUF))
 #define H5S_SELECT_BOUNDS(S,START,END)  ((*(S)->select.type->bounds)(S,START,END))
+#define H5S_SELECT_OFFSET(S, OFFSET)    ((*(S)->select.type->offset)(S, OFFSET))
 #define H5S_SELECT_IS_CONTIGUOUS(S)     ((*(S)->select.type->is_contiguous)(S))
 #define H5S_SELECT_IS_SINGLE(S)         ((*(S)->select.type->is_single)(S))
 #define H5S_SELECT_IS_REGULAR(S)        ((*(S)->select.type->is_regular)(S))
@@ -175,6 +177,7 @@ typedef struct H5S_iostats_t {
 #define H5S_SELECT_SERIAL_SIZE(S)       (H5S_select_serial_size(S))
 #define H5S_SELECT_SERIALIZE(S,BUF)     (H5S_select_serialize(S,BUF))
 #define H5S_SELECT_BOUNDS(S,START,END)  (H5S_get_select_bounds(S,START,END))
+#define H5S_SELECT_OFFSET(S, OFFSET)    (H5S_get_select_offset(S, OFFSET))
 #define H5S_SELECT_IS_CONTIGUOUS(S)     (H5S_select_is_contiguous(S))
 #define H5S_SELECT_IS_SINGLE(S)         (H5S_select_is_single(S))
 #define H5S_SELECT_IS_REGULAR(S)        (H5S_select_is_regular(S))
@@ -205,10 +208,9 @@ H5_DLL hbool_t H5S_has_extent(const H5S_t *ds);
 H5_DLL int H5S_get_simple_extent_ndims(const H5S_t *ds);
 H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
     hsize_t max_dims[]/*out*/);
-H5_DLL herr_t H5S_write(struct H5O_loc_t *loc, const H5S_t *space,
-    hbool_t update_time, hid_t dxpl_id);
-H5_DLL herr_t H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh,
-    const H5S_t *ds);
+H5_DLL herr_t H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags,
+    H5S_t *ds);
+H5_DLL herr_t H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, H5S_t *ds);
 H5_DLL H5S_t *H5S_read(const struct H5O_loc_t *loc, hid_t dxpl_id);
 H5_DLL int H5S_set_extent(H5S_t *space, const hsize_t *size);
 H5_DLL herr_t H5S_set_extent_real(H5S_t *space, const hsize_t *size);
@@ -234,6 +236,7 @@ H5_DLL herr_t H5S_select_fill(const void *fill, size_t fill_size,
 H5_DLL htri_t H5S_select_valid(const H5S_t *space);
 H5_DLL hssize_t H5S_get_select_npoints(const H5S_t *space);
 H5_DLL herr_t H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end);
+H5_DLL herr_t H5S_get_select_offset(const H5S_t *space, hsize_t *offset);
 H5_DLL herr_t H5S_select_offset(H5S_t *space, const hssize_t *offset);
 H5_DLL herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection);
 H5_DLL htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
@@ -255,8 +258,8 @@ H5_DLL herr_t H5S_select_all(H5S_t *space, hbool_t rel_prev);
 H5_DLL herr_t H5S_select_none(H5S_t *space);
 
 /* Operations on point selections */
-H5_DLL herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op,
-    size_t num_elem, const hsize_t **coord);
+H5_DLL herr_t H5S_select_elements(H5S_t *space, H5S_seloper_t op,
+    size_t num_elem, const hsize_t *coord);
 
 /* Operations on hyperslab selections */
 H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hsize_t start[],
@@ -271,7 +274,7 @@ H5_DLL htri_t H5S_hyper_intersect (H5S_t *space1, H5S_t *space2);
 H5_DLL htri_t H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end);
 H5_DLL herr_t H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset);
 H5_DLL herr_t H5S_hyper_move(H5S_t *space, const hssize_t *offset);
-H5_DLL herr_t H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset);
+H5_DLL htri_t H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset);
 H5_DLL herr_t H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset);
 
 /* Operations on selection iterators */
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 4a49da2..43f79b9 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -126,8 +126,7 @@ H5_DLL hid_t H5Scombine_select(hid_t space1_id, H5S_seloper_t op,
                                   hid_t space2_id);
 #endif /* NEW_HYPERSLAB_API */
 H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op,
-				  size_t num_elemn,
-				  const hsize_t **coord);
+    size_t num_elem, const hsize_t *coord);
 H5_DLL H5S_class_t H5Sget_simple_extent_type(hid_t space_id);
 H5_DLL herr_t H5Sset_extent_none(hid_t space_id);
 H5_DLL herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id);
@@ -138,9 +137,12 @@ H5_DLL herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset);
 H5_DLL htri_t H5Sselect_valid(hid_t spaceid);
 H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid);
 H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid);
-H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf);
-H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf);
-H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end);
+H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
+    hsize_t numblocks, hsize_t buf[/*numblocks*/]);
+H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
+    hsize_t numpoints, hsize_t buf[/*numpoints*/]);
+H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[],
+    hsize_t end[]);
 H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid);
 
 #ifdef __cplusplus
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 31fd05e..ed3c740 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -62,17 +62,20 @@ static herr_t H5S_select_iter_next_block(H5S_sel_iter_t *iter);
 herr_t
 H5S_select_offset(H5S_t *space, const hssize_t *offset)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_select_offset);
+    FUNC_ENTER_NOAPI_NOFUNC(H5S_select_offset)
 
     /* Check args */
-    assert(space);
-    assert(space->extent.rank);
-    assert(offset);
+    HDassert(space);
+    HDassert(space->extent.rank);
+    HDassert(offset);
 
     /* Copy the offset over */
-    HDmemcpy(space->select.offset,offset,sizeof(hssize_t)*space->extent.rank);
+    HDmemcpy(space->select.offset, offset, sizeof(hssize_t)*space->extent.rank);
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
+    /* Indicate that the offset was changed */
+    space->select.offset_changed = TRUE;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
 }   /* H5S_select_offset() */
 
 
@@ -488,8 +491,8 @@ done:
  USAGE
     herr_t H5S_get_select_bounds(space, start, end)
         hid_t dsid;             IN: Dataspace ID of selection to query
-        hsize_t *start;         OUT: Starting coordinate of bounding box
-        hsize_t *end;           OUT: Opposite coordinate of bounding box
+        hsize_t start[];        OUT: Starting coordinate of bounding box
+        hsize_t end[];          OUT: Opposite coordinate of bounding box
  RETURNS
     Non-negative on success, negative on failure
  DESCRIPTION
@@ -511,7 +514,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end)
+H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[])
 {
     H5S_t	*space = NULL;      /* Dataspace to modify selection of */
     herr_t ret_value;        /* return value */
@@ -579,6 +582,46 @@ H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
 
 /*--------------------------------------------------------------------------
  NAME
+    H5S_get_select_offset
+ PURPOSE
+    Gets the linear offset of the first element for the selection.
+ USAGE
+    herr_t H5S_get_select_offset(space, offset)
+        const H5S_t *space;     IN: Dataspace pointer of selection to query
+        hsize_t *offset;        OUT: Linear offset of first element in selection
+ RETURNS
+    Non-negative on success, negative on failure
+ DESCRIPTION
+    Retrieves the linear offset (in "units" of elements) of the first element
+    selected within the dataspace.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+        The offset calculation _does_ include the current offset of the
+    selection within the dataspace extent.
+
+        Calling this function on a "none" selection returns fail.
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+herr_t
+H5S_get_select_offset(const H5S_t *space, hsize_t *offset)
+{
+    herr_t ret_value;        /* return value */
+
+    FUNC_ENTER_NOAPI_NOFUNC(H5S_get_select_offset)
+
+    /* Check args */
+    HDassert(space);
+    HDassert(offset);
+
+    ret_value = (*space->select.type->offset)(space, offset);
+
+    FUNC_LEAVE_NOAPI(ret_value)
+}   /* H5S_get_select_offset() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
     H5S_select_is_contiguous
  PURPOSE
     Determines if a selection is contiguous in the dataspace
@@ -758,10 +801,9 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
     /* Save the dataspace's rank */
     sel_iter->rank=space->extent.rank;
 
-    if(sel_iter->rank>0) {
-        /* Point to the dataspace dimensions */
-        sel_iter->dims=space->extent.size;
-    } /* end if */
+    /* Point to the dataspace dimensions, if there are any */
+    if(sel_iter->rank > 0)
+        sel_iter->dims = space->extent.size;
     else
         sel_iter->dims = NULL;
 
diff --git a/src/H5TS.c b/src/H5TS.c
index e311c29..a250067 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -96,10 +96,6 @@ H5TS_first_thread_init(void)
 {
     H5_g.H5_libinit_g = FALSE;
 
-    /* set the owner objects to initial values */
-    H5_g.init_lock.owner_thread = pthread_self();
-    H5_g.init_lock.owner_valid = FALSE;
-
     /* initialize global API mutex lock */
     pthread_mutex_init(&H5_g.init_lock.atomic_lock, NULL);
     pthread_cond_init(&H5_g.init_lock.cond_var, NULL);
@@ -150,26 +146,17 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
     if (ret_value)
         return ret_value;
 
-    if (mutex->owner_valid && pthread_equal(pthread_self(), mutex->owner_thread)) {
+    if(mutex->lock_count && pthread_equal(pthread_self(), mutex->owner_thread)) {
         /* already owned by self - increment count */
         mutex->lock_count++;
-    } else if (!mutex->owner_valid) {
-        /* no one else has locked it - set owner and grab lock */
+    } else {
+        /* if owned by other thread, wait for condition signal */
+        while(mutex->lock_count)
+            pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock);
+
+        /* After we've received the signal, take ownership of the mutex */
         mutex->owner_thread = pthread_self();
-        mutex->owner_valid = TRUE;
         mutex->lock_count = 1;
-    } else {
-        /* if already locked by someone else */
-        for (;;) {
-	    pthread_cond_wait(&mutex->cond_var, &mutex->atomic_lock);
-
-	    if (!mutex->owner_valid) {
-	        mutex->owner_thread = pthread_self();
-                mutex->owner_valid = TRUE;
-	        mutex->lock_count = 1;
-	        break;
-	    }
-        }
     }
 
     return pthread_mutex_unlock(&mutex->atomic_lock);
@@ -204,26 +191,26 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
 herr_t
 H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 {
-    herr_t ret_value;
+    herr_t ret_value;           /* Return value */
 
     ret_value = pthread_mutex_lock(&mutex->atomic_lock);
 
-    if (ret_value)
-	    return ret_value;
+    if(ret_value)
+        return ret_value;
 
     mutex->lock_count--;
 
-    if (mutex->lock_count == 0) {
-	mutex->owner_valid = FALSE;
-        ret_value = pthread_cond_signal(&mutex->cond_var);
+    ret_value = pthread_mutex_unlock(&mutex->atomic_lock);
 
-	if (ret_value) {
-	    pthread_mutex_unlock(&mutex->atomic_lock);
-	    return ret_value;
-	}
-    }
+    if(mutex->lock_count == 0) {
+        int err;
 
-    return pthread_mutex_unlock(&mutex->atomic_lock);
+        err = pthread_cond_signal(&mutex->cond_var);
+        if(err != 0)
+            ret_value = err;
+    } /* end if */
+
+    return ret_value;
 }
 
 /*--------------------------------------------------------------------------
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index f817120..0d0b620 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -37,7 +37,6 @@
 
 typedef struct H5TS_mutex_struct {
     pthread_t owner_thread;		/* current lock owner */
-    unsigned owner_valid;		/* if current lock owner info is valid */
     pthread_mutex_t atomic_lock;	/* lock for atomicity of new mechanism */
     pthread_cond_t cond_var;		/* condition variable */
     unsigned int lock_count;
diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 7a29d45..1b9265d 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -96,7 +96,6 @@ H5Z_class_t H5Z_NBIT[1] = {{
 #define H5Z_NBIT_ARRAY           2     /* Array datatype class */
 #define H5Z_NBIT_COMPOUND        3     /* Compound datatype class */
 #define H5Z_NBIT_NOOPTYPE        4     /* Other datatype class: nbit does no compression */
-#define H5Z_NBIT_USER_NPARMS     0     /* Number of parameters that users can set */
 #define H5Z_NBIT_MAX_NPARMS      4096  /* Max number of parameters for filter */
 #define H5Z_NBIT_ORDER_LE        0     /* Little endian for datatype byte order */
 #define H5Z_NBIT_ORDER_BE        1     /* Big endian for datatype byte order */
@@ -1409,4 +1408,4 @@ static void H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned c
 
    *buffer_size = j + 1; /* sometimes is catually j, but to be safe */
 }
-#endif /* H5_HAVE_FILTER_NZIP */
+#endif /* H5_HAVE_FILTER_NBIT */
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 1fac71c..7211a2b 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -74,6 +74,25 @@ typedef int H5Z_filter_t;
 #define H5_SZIP_NN_OPTION_MASK          32
 #define H5_SZIP_MAX_PIXELS_PER_BLOCK    32
 
+/* Macros for the shuffle filter */
+#define H5Z_SHUFFLE_USER_NPARMS    0    /* Number of parameters that users can set */
+#define H5Z_SHUFFLE_TOTAL_NPARMS   1    /* Total number of parameters for filter */
+ 
+/* Macros for the szip filter */
+#define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
+#define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
+#define H5Z_SZIP_PARM_MASK      0       /* "User" parameter for option mask */
+#define H5Z_SZIP_PARM_PPB       1       /* "User" parameter for pixels-per-block */
+#define H5Z_SZIP_PARM_BPP       2       /* "Local" parameter for bits-per-pixel */
+#define H5Z_SZIP_PARM_PPS       3       /* "Local" parameter for pixels-per-scanline */
+   
+/* Macros for the nbit filter */
+#define H5Z_NBIT_USER_NPARMS     0     /* Number of parameters that users can set */
+
+/* Macros for the scale offset filter */
+#define H5Z_SCALEOFFSET_USER_NPARMS      2    /* Number of parameters that users can set */
+
+
 /* Special parameters for ScaleOffset filter*/
 #define H5Z_SO_INT_MINBITS_DEFAULT 0
 typedef enum H5Z_SO_scale_type_t {
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index b970cdf..5ef3e7a 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -93,7 +93,6 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
 }};
 
 /* Local macros */
-#define H5Z_SCALEOFFSET_USER_NPARMS      2    /* Number of parameters that users can set */
 #define H5Z_SCALEOFFSET_TOTAL_NPARMS     20   /* Total number of parameters for filter */
 #define H5Z_SCALEOFFSET_PARM_SCALETYPE   0    /* "User" parameter for scale type */
 #define H5Z_SCALEOFFSET_PARM_SCALEFACTOR 1    /* "User" parameter for scale factor */
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index c203ed9..3f40707 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -44,8 +44,6 @@ const H5Z_class_t H5Z_SHUFFLE[1] = {{
 }};
 
 /* Local macros */
-#define H5Z_SHUFFLE_USER_NPARMS    0       /* Number of parameters that users can set */
-#define H5Z_SHUFFLE_TOTAL_NPARMS   1       /* Total number of parameters for filter */
 #define H5Z_SHUFFLE_PARM_SIZE      0       /* "Local" parameter for shuffling size */
 
 
diff --git a/src/H5Zszip.c b/src/H5Zszip.c
index cdc26aa..9201a80 100644
--- a/src/H5Zszip.c
+++ b/src/H5Zszip.c
@@ -51,13 +51,6 @@ H5Z_class_t H5Z_SZIP[1] = {{
     H5Z_filter_szip,		/* The actual filter function	*/
 }};
 
-/* Local macros */
-#define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
-#define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
-#define H5Z_SZIP_PARM_MASK      0       /* "User" parameter for option mask */
-#define H5Z_SZIP_PARM_PPB       1       /* "User" parameter for pixels-per-block */
-#define H5Z_SZIP_PARM_BPP       2       /* "Local" parameter for bits-per-pixel */
-#define H5Z_SZIP_PARM_PPS       3       /* "Local" parameter for pixels-per-scanline */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5checksum.c b/src/H5checksum.c
index f2e344d..e42f152 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -459,3 +459,36 @@ H5_checksum_metadata(const void *data, size_t len, uint32_t initval)
     FUNC_LEAVE_NOAPI(H5_checksum_lookup3(data, len, initval))
 } /* end H5_checksum_metadata() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5_hash_string
+ *
+ * Purpose:	Provide a simple & fast routine for hashing strings
+ *
+ * Note:        This algorithm is the 'djb2' algorithm described on this page:
+ *              http://www.cse.yorku.ca/~oz/hash.html
+ *
+ * Return:	hash of input string (can't fail)
+ *
+ * Programmer:	Quincey Koziol
+ *              Tuesday, December 11, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+uint32_t
+H5_hash_string(const char *str)
+{
+    uint32_t hash = 5381;
+    int c;
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_hash_string)
+
+    /* Sanity check */
+    HDassert(str);
+
+    while(c = *str++)
+        hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+
+    FUNC_LEAVE_NOAPI(hash)
+} /* end H5_hash_string() */
+
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 0c89e98..5c767ef 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -570,6 +570,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define if strict file format checks are enabled */
+#undef STRICT_FORMAT_CHECKS
+
 /* Define if your system supports pthread_attr_setscope(&attribute,
    PTHREAD_SCOPE_SYSTEM) call. */
 #undef SYSTEM_SCOPE_THREADS
diff --git a/src/H5private.h b/src/H5private.h
index ebbad21..343e652 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -485,6 +485,12 @@ typedef enum {
     H5_COPY_DEEP        /* Deep copy from source to destination, including duplicating fields pointed to */
 } H5_copy_depth_t;
 
+/* Unique object "position" */
+typedef struct {
+    unsigned long fileno;       /* The unique identifier for the file of the object */
+    haddr_t addr;               /* The unique address of the object's header in that file */
+} H5_obj_t;
+
 /*
  * Redefine all the POSIX functions.  We should never see a POSIX
  * function (or any other non-HDF5 function) in the source!
@@ -1473,6 +1479,7 @@ H5_DLL uint32_t H5_checksum_fletcher32(const void *data, size_t len);
 H5_DLL uint32_t H5_checksum_crc(const void *data, size_t len);
 H5_DLL uint32_t H5_checksum_lookup3(const void *data, size_t len, uint32_t initval);
 H5_DLL uint32_t H5_checksum_metadata(const void *data, size_t len, uint32_t initval);
+H5_DLL uint32_t H5_hash_string(const char *str);
 
 /* Functions for debugging */
 H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, uint8_t *buf,
diff --git a/src/H5public.h b/src/H5public.h
index 608e52c..06060dd 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -72,9 +72,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	0	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "beta4post1"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.0-beta4post1"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.0"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/H5trace.c b/src/H5trace.c
index 0ad99b2..926a590 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -647,6 +647,26 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
                     }
                     break;
 
+                case 'v':
+                    if(ptr) {
+                        if(vp)
+                            fprintf(out, "0x%lx", (unsigned long)vp);
+                        else
+                            fprintf(out, "NULL");
+                    } else {
+                        H5F_libver_t libver_vers = va_arg(ap, H5F_libver_t); /*lint !e64 Type mismatch not really occuring */
+
+                        switch(libver_vers) {
+                            case H5F_LIBVER_EARLIEST:
+                                fprintf(out, "H5F_LIBVER_EARLIEST");
+                                break;
+                            case H5F_LIBVER_LATEST:
+                                fprintf(out, "H5F_LIBVER_LATEST");
+                                break;
+                        }
+                    }
+                    break;
+
                 default:
                     fprintf(out, "BADTYPE(F%c)", type[1]);
                     goto error;
diff --git a/src/Makefile.am b/src/Makefile.am
index 75f84e6..5671533 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5F.c H5Fdbg.c H5Ffake.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5Ftest.c \
         H5FD.c H5FDcore.c  \
         H5FDdirect.c H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
-        H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
+        H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDspace.c H5FDstdio.c \
         H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSsection.c \
         H5G.c H5Gbtree2.c H5Gcompact.c H5Gdense.c H5Gdeprec.c H5Gent.c \
         H5Gint.c H5Glink.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 79d8f07..197191e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -89,37 +89,38 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo H5Fmount.lo \
 	H5Fsfile.lo H5Fsuper.lo H5Ftest.lo H5FD.lo H5FDcore.lo \
 	H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \
-	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDstdio.lo H5FL.lo \
-	H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo H5FSsection.lo H5G.lo \
-	H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo H5Gdeprec.lo H5Gent.lo \
-	H5Gint.lo H5Glink.lo H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo \
-	H5Goh.lo H5Gstab.lo H5Gtest.lo H5Gtraverse.lo H5HF.lo \
-	H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo H5HFdblock.lo \
-	H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo H5HFiblock.lo H5HFiter.lo \
-	H5HFman.lo H5HFsection.lo H5HFspace.lo H5HFstat.lo H5HFtest.lo \
-	H5HFtiny.lo H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo \
-	H5I.lo H5L.lo H5Lexternal.lo H5MF.lo H5MM.lo H5MP.lo \
-	H5MPtest.lo H5O.lo H5Oainfo.lo H5Oalloc.lo H5Oattr.lo \
-	H5Oattribute.lo H5Obogus.lo H5Obtreek.lo H5Ocache.lo \
-	H5Ocont.lo H5Ocopy.lo H5Odbg.lo H5Odrvinfo.lo H5Odtype.lo \
-	H5Oefl.lo H5Ofill.lo H5Oginfo.lo H5Olayout.lo H5Olinfo.lo \
-	H5Olink.lo H5Omdj_msg.lo H5Omessage.lo H5Omtime.lo H5Oname.lo \
-	H5Onull.lo H5Opline.lo H5Orefcount.lo H5Osdspace.lo \
-	H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo \
-	H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdeprec.lo H5Pdxpl.lo \
-	H5Pfapl.lo H5Pfcpl.lo H5Pfmpl.lo H5Pgcpl.lo H5Pint.lo \
-	H5Plapl.lo H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo H5Pstrcpl.lo \
-	H5Ptest.lo H5R.lo H5Rdeprec.lo H5RC.lo H5RS.lo H5S.lo \
-	H5Sall.lo H5Sdbg.lo H5Shyper.lo H5Smpio.lo H5Snone.lo \
-	H5Spoint.lo H5Sselect.lo H5Stest.lo H5SL.lo H5SM.lo \
-	H5SMbtree2.lo H5SMcache.lo H5SMtest.lo H5ST.lo H5T.lo \
-	H5Tarray.lo H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo \
-	H5Tcset.lo H5Tdbg.lo H5Tdeprec.lo H5Tenum.lo H5Tfields.lo \
-	H5Tfixed.lo H5Tfloat.lo H5Tinit.lo H5Tnative.lo H5Toffset.lo \
-	H5Toh.lo H5Topaque.lo H5Torder.lo H5Tpad.lo H5Tprecis.lo \
-	H5Tstrpad.lo H5Tvisit.lo H5Tvlen.lo H5TS.lo H5V.lo H5WB.lo \
-	H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
-	H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
+	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDspace.lo \
+	H5FDstdio.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \
+	H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo \
+	H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo H5Gloc.lo \
+	H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \
+	H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo \
+	H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \
+	H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \
+	H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \
+	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5L.lo \
+	H5Lexternal.lo H5MF.lo H5MM.lo H5MP.lo H5MPtest.lo H5O.lo \
+	H5Oainfo.lo H5Oalloc.lo H5Oattr.lo H5Oattribute.lo H5Obogus.lo \
+	H5Obtreek.lo H5Ocache.lo H5Ocont.lo H5Ocopy.lo H5Odbg.lo \
+	H5Odrvinfo.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \
+	H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omdj_msg.lo \
+	H5Omessage.lo H5Omtime.lo H5Oname.lo H5Onull.lo H5Opline.lo \
+	H5Orefcount.lo H5Osdspace.lo H5Oshared.lo H5Ostab.lo \
+	H5Oshmesg.lo H5Otest.lo H5Ounknown.lo H5P.lo H5Pacpl.lo \
+	H5Pdcpl.lo H5Pdeprec.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
+	H5Pfmpl.lo H5Pgcpl.lo H5Pint.lo H5Plapl.lo H5Plcpl.lo \
+	H5Pocpl.lo H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo H5R.lo \
+	H5Rdeprec.lo H5RC.lo H5RS.lo H5S.lo H5Sall.lo H5Sdbg.lo \
+	H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo H5Sselect.lo \
+	H5Stest.lo H5SL.lo H5SM.lo H5SMbtree2.lo H5SMcache.lo \
+	H5SMtest.lo H5ST.lo H5T.lo H5Tarray.lo H5Tbit.lo H5Tcommit.lo \
+	H5Tcompound.lo H5Tconv.lo H5Tcset.lo H5Tdbg.lo H5Tdeprec.lo \
+	H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo \
+	H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo \
+	H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvisit.lo H5Tvlen.lo \
+	H5TS.lo H5V.lo H5WB.lo H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo \
+	H5Znbit.lo H5Zshuffle.lo H5Zszip.lo H5Zscaleoffset.lo \
+	H5Ztrans.lo
 libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
 libhdf5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -270,6 +271,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
@@ -382,9 +384,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
-LT_VERS_INTERFACE = 4
-LT_VERS_REVISION = 4
-LT_VERS_AGE = 3
+LT_VERS_INTERFACE = 5
+LT_VERS_REVISION = 0
+LT_VERS_AGE = 0
 H5detect_CFLAGS = -g
 
 # Our main target, the HDF5 library
@@ -412,7 +414,7 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5F.c H5Fdbg.c H5Ffake.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5Ftest.c \
         H5FD.c H5FDcore.c  \
         H5FDdirect.c H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
-        H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
+        H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDspace.c H5FDstdio.c \
         H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSsection.c \
         H5G.c H5Gbtree2.c H5Gcompact.c H5Gdense.c H5Gdeprec.c H5Gent.c \
         H5Gint.c H5Glink.c \
@@ -632,6 +634,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpiposix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmulti.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsec2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDspace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstdio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FO.Plo@am__quote@
diff --git a/test/Makefile.am b/test/Makefile.am
index 9219d80..054877d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -59,7 +59,7 @@ check_PROGRAMS=$(TEST_PROG) error_test err_compat testmeta
 # --enable-build-all at configure time.
 # The gen_old_* files can only be compiled with older versions of the library
 # so do not appear in this list.
-BUILD_ALL_PROGS=gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
+BUILD_ALL_PROGS=gen_bad_ohdr gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
     gen_new_fill gen_new_group gen_new_mtime gen_new_super gen_noencoder \
     gen_nullspace gen_udlinks space_overflow
 
@@ -105,9 +105,9 @@ flush2.chkexe_: flush1.chkexe_
 CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5\
             tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 stab.h5 \
             extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2]\
-            links.h5 links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
-            stdio.h5 sec2.h5 dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 h5     \
-            tselect.h5 mtime.h5 unlink.h5 unicode.h5 \
+            links.h5 links[0-6]*.h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
+            stdio.h5 sec2.h5 dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5        \
+            tselect.h5 mtime.h5 unlink.h5 unicode.h5 coord.h5 \
             fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 ttime.h5 \
             trefer[1-3].h5 tvltypes.h5 tvlstr.h5 tvlstr2.h5 flush.h5         \
             enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5            \
@@ -121,7 +121,7 @@ CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
-    tgenprop.c th5o.c th5s.c theap.c tid.c titerate.c tmeta.c tmisc.c \
+    tgenprop.c th5o.c th5s.c tcoords.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
 
diff --git a/test/Makefile.in b/test/Makefile.in
index cf0ed18..1cda554 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -83,8 +83,8 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	vfd$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
 	dtransform$(EXEEXT) reserved$(EXEEXT) cross_read$(EXEEXT) \
 	btree2$(EXEEXT) fheap$(EXEEXT)
-am__EXEEXT_2 = gen_bogus$(EXEEXT) gen_cross$(EXEEXT) \
-	gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
+am__EXEEXT_2 = gen_bad_ohdr$(EXEEXT) gen_bogus$(EXEEXT) \
+	gen_cross$(EXEEXT) gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
 	gen_new_array$(EXEEXT) gen_new_fill$(EXEEXT) \
 	gen_new_group$(EXEEXT) gen_new_mtime$(EXEEXT) \
 	gen_new_super$(EXEEXT) gen_noencoder$(EXEEXT) \
@@ -187,6 +187,10 @@ flush2_SOURCES = flush2.c
 flush2_OBJECTS = flush2.$(OBJEXT)
 flush2_LDADD = $(LDADD)
 flush2_DEPENDENCIES = libh5test.la $(LIBHDF5)
+gen_bad_ohdr_SOURCES = gen_bad_ohdr.c
+gen_bad_ohdr_OBJECTS = gen_bad_ohdr.$(OBJEXT)
+gen_bad_ohdr_LDADD = $(LDADD)
+gen_bad_ohdr_DEPENDENCIES = libh5test.la $(LIBHDF5)
 gen_bogus_SOURCES = gen_bogus.c
 gen_bogus_OBJECTS = gen_bogus.$(OBJEXT)
 gen_bogus_LDADD = $(LDADD)
@@ -302,7 +306,7 @@ stab_DEPENDENCIES = libh5test.la $(LIBHDF5)
 am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \
 	tattr.$(OBJEXT) tchecksum.$(OBJEXT) tconfig.$(OBJEXT) \
 	tfile.$(OBJEXT) tgenprop.$(OBJEXT) th5o.$(OBJEXT) \
-	th5s.$(OBJEXT) theap.$(OBJEXT) tid.$(OBJEXT) \
+	th5s.$(OBJEXT) tcoords.$(OBJEXT) theap.$(OBJEXT) tid.$(OBJEXT) \
 	titerate.$(OBJEXT) tmeta.$(OBJEXT) tmisc.$(OBJEXT) \
 	trefer.$(OBJEXT) trefstr.$(OBJEXT) tselect.$(OBJEXT) \
 	tskiplist.$(OBJEXT) tsohm.$(OBJEXT) ttime.$(OBJEXT) \
@@ -345,9 +349,9 @@ SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \
 	cache2.c cache2_api.c cache2_journal.c cache_api.c cmpd_dset.c \
 	cross_read.c dangle.c dsets.c dt_arith.c dtransform.c dtypes.c \
 	enum.c err_compat.c error_test.c extend.c external.c fheap.c \
-	fillval.c flush1.c flush2.c gen_bogus.c gen_cross.c \
-	gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \
-	gen_new_group.c gen_new_mtime.c gen_new_super.c \
+	fillval.c flush1.c flush2.c gen_bad_ohdr.c gen_bogus.c \
+	gen_cross.c gen_deflate.c gen_filters.c gen_new_array.c \
+	gen_new_fill.c gen_new_group.c gen_new_mtime.c gen_new_super.c \
 	gen_noencoder.c gen_nullspace.c gen_udlinks.c getname.c \
 	gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c \
 	ntypes.c objcopy.c ohdr.c pool.c reserved.c set_extent.c \
@@ -358,13 +362,14 @@ DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c \
 	cmpd_dset.c cross_read.c dangle.c dsets.c dt_arith.c \
 	dtransform.c dtypes.c enum.c err_compat.c error_test.c \
 	extend.c external.c fheap.c fillval.c flush1.c flush2.c \
-	gen_bogus.c gen_cross.c gen_deflate.c gen_filters.c \
-	gen_new_array.c gen_new_fill.c gen_new_group.c gen_new_mtime.c \
-	gen_new_super.c gen_noencoder.c gen_nullspace.c gen_udlinks.c \
-	getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c \
-	mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c \
-	set_extent.c space_overflow.c stab.c $(testhdf5_SOURCES) \
-	testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c
+	gen_bad_ohdr.c gen_bogus.c gen_cross.c gen_deflate.c \
+	gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c \
+	gen_new_mtime.c gen_new_super.c gen_noencoder.c \
+	gen_nullspace.c gen_udlinks.c getname.c gheap.c hyperslab.c \
+	istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c \
+	ohdr.c pool.c reserved.c set_extent.c space_overflow.c stab.c \
+	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \
+	vfd.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -486,6 +491,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
@@ -604,10 +610,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
 	tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 stab.h5 \
 	extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
-	dt_arith[1-2] links.h5 links[1-3].h5 big.data \
+	dt_arith[1-2] links.h5 links[0-6]*.h5 big.data \
 	big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
-	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 h5 tselect.h5 \
-	mtime.h5 unlink.h5 unicode.h5 fillval_[0-9].h5 fillval.raw \
+	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
+	unlink.h5 unicode.h5 coord.h5 fillval_[0-9].h5 fillval.raw \
 	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
 	tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
 	tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
@@ -647,7 +653,7 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api cache2 cache2_api \
 # --enable-build-all at configure time.
 # The gen_old_* files can only be compiled with older versions of the library
 # so do not appear in this list.
-BUILD_ALL_PROGS = gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
+BUILD_ALL_PROGS = gen_bad_ohdr gen_bogus gen_cross gen_deflate gen_filters gen_new_array \
     gen_new_fill gen_new_group gen_new_mtime gen_new_super gen_noencoder \
     gen_nullspace gen_udlinks space_overflow
 
@@ -668,7 +674,7 @@ ttsafe_SOURCES = ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES = testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
-    tgenprop.c th5o.c th5s.c theap.c tid.c titerate.c tmeta.c tmisc.c \
+    tgenprop.c th5o.c th5s.c tcoords.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
 
@@ -823,6 +829,9 @@ flush1$(EXEEXT): $(flush1_OBJECTS) $(flush1_DEPENDENCIES)
 flush2$(EXEEXT): $(flush2_OBJECTS) $(flush2_DEPENDENCIES) 
 	@rm -f flush2$(EXEEXT)
 	$(LINK) $(flush2_OBJECTS) $(flush2_LDADD) $(LIBS)
+gen_bad_ohdr$(EXEEXT): $(gen_bad_ohdr_OBJECTS) $(gen_bad_ohdr_DEPENDENCIES) 
+	@rm -f gen_bad_ohdr$(EXEEXT)
+	$(LINK) $(gen_bad_ohdr_OBJECTS) $(gen_bad_ohdr_LDADD) $(LIBS)
 gen_bogus$(EXEEXT): $(gen_bogus_OBJECTS) $(gen_bogus_DEPENDENCIES) 
 	@rm -f gen_bogus$(EXEEXT)
 	$(LINK) $(gen_bogus_OBJECTS) $(gen_bogus_LDADD) $(LIBS)
@@ -955,6 +964,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fillval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flush1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flush2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_bad_ohdr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_bogus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_cross.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_deflate.Po@am__quote@
@@ -988,6 +998,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tattr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tchecksum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tconfig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcoords.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testframe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testhdf5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testmeta.Po@am__quote@
diff --git a/test/cache2_journal.c b/test/cache2_journal.c
index da66f3e..a8cf7d4 100644
--- a/test/cache2_journal.c
+++ b/test/cache2_journal.c
@@ -1646,13 +1646,13 @@ open_exiting_file_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* call H5Pset_latest_format() on the fapl_id */
+    /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_latest_format(fapl_id, TRUE) < 0 ) {
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
-            failure_mssg2 = "H5Pset_latest_format() failed.\n";
+            failure_mssg2 = "H5Pset_libver_bounds() failed.\n";
         }
     }
 
@@ -1913,13 +1913,13 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* call H5Pset_latest_format() on the fapl_id */
+    /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_latest_format(fapl_id, TRUE) < 0 ) {
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
-            failure_mssg2 = "H5Pset_latest_format() failed.\n";
+            failure_mssg2 = "H5Pset_libver_bounds() failed.\n";
         }
     }
 
@@ -3982,13 +3982,13 @@ check_mdj_config_block_IO(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* call H5Pset_latest_format() on the fapl_id */
+    /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_latest_format(fapl_id, TRUE) < 0 ) {
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
-            failure_mssg2 = "H5Pset_latest_format() failed.\n";
+            failure_mssg2 = "H5Pset_libver_bounds() failed.\n";
         }
     }
 
@@ -4619,13 +4619,13 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* call H5Pset_latest_format() on the fapl_id */
+    /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_latest_format(fapl_id, TRUE) < 0 ) {
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
-            failure_mssg2 = "H5Pset_latest_format() failed.\n";
+            failure_mssg2 = "H5Pset_libver_bounds() failed.\n";
         }
     }
 
diff --git a/test/dsets.c b/test/dsets.c
index 8719441..3435087 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -6025,7 +6025,7 @@ test_random_chunks(void)
     if((m = H5Screate_simple(1, msize, NULL)) < 0) TEST_ERROR;
 
     /* Select the random points for writing */
-    if(H5Sselect_elements(s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord) < 0) TEST_ERROR;
+    if(H5Sselect_elements(s, H5S_SELECT_SET, NPOINTS, coord) < 0) TEST_ERROR;
 
     /* Write into dataset */
     if(H5Dwrite(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, wbuf) < 0) TEST_ERROR;
@@ -6050,7 +6050,7 @@ test_random_chunks(void)
     if((m = H5Screate_simple(1, msize, NULL)) < 0) TEST_ERROR;
 
     /* Select the random points for reading */
-    if(H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord) < 0) TEST_ERROR;
+    if(H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord) < 0) TEST_ERROR;
 
     /* Read from dataset */
     if(H5Dread(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, rbuf) < 0) TEST_ERROR;
@@ -6059,7 +6059,8 @@ test_random_chunks(void)
     for(i = 0; i < NPOINTS; i++)
         if(rbuf[i] != wbuf[i]){
             printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n",__LINE__,(unsigned)i,wbuf[i],(unsigned)i,rbuf[i]);
-                TEST_ERROR;
+            printf("             coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0], (unsigned long)coord[i][1]);
+            TEST_ERROR;
         } /* end if */
 
     /* Close resources */
@@ -6117,7 +6118,7 @@ test_random_chunks(void)
     if((m = H5Screate_simple(1, msize, NULL)) < 0) TEST_ERROR;
 
     /* Select the random points for writing */
-    if(H5Sselect_elements(s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord) < 0) TEST_ERROR;
+    if(H5Sselect_elements(s, H5S_SELECT_SET, NPOINTS, coord) < 0) TEST_ERROR;
 
     /* Write into dataset */
     if(H5Dwrite(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, wbuf) < 0) TEST_ERROR;
@@ -6142,7 +6143,7 @@ test_random_chunks(void)
     if((m = H5Screate_simple(1, msize, NULL)) < 0) TEST_ERROR;
 
     /* Select the random points for reading */
-    if(H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord) < 0) TEST_ERROR;
+    if(H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord) < 0) TEST_ERROR;
 
     /* Read from dataset */
     if(H5Dread(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, rbuf) < 0) TEST_ERROR;
@@ -6404,8 +6405,8 @@ main(void)
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
 	h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
 
diff --git a/test/dtypes.c b/test/dtypes.c
index f01c5e3..0388003 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -4410,10 +4410,10 @@ test_latest(void)
         FAIL_STACK_ERROR
 
 
-    /* Set the 'use the latest format' flag in the FAPL */
+    /* Set the 'use the latest format' bounds in the FAPL */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_latest_format(fapl, TRUE) < 0)
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         FAIL_STACK_ERROR
 
     /* Create file using default FAPL */
diff --git a/test/external.c b/test/external.c
index 769cd16..d05889e 100644
--- a/test/external.c
+++ b/test/external.c
@@ -841,7 +841,6 @@ test_4 (hid_t fapl)
     hid_t       fid, gid, xid, xid2;
     char	filename[1024];		/*file name			*/
     char        pathname[1024];
-    char        linked_pathname[1024];
     char       *srcdir = getenv("srcdir"); /*where the src code is located*/
     const char *envval = NULL;
 
@@ -879,7 +878,7 @@ test_4 (hid_t fapl)
 	    goto error;
 
         /* Reopen the file */
-        if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
 	    goto error;
 
         /* Open the external link */
diff --git a/test/family_v1.6_00000.h5 b/test/family_v1.6_00000.h5
deleted file mode 100644
index 5b69c93..0000000
Binary files a/test/family_v1.6_00000.h5 and /dev/null differ
diff --git a/test/family_v1.6_00001.h5 b/test/family_v1.6_00001.h5
deleted file mode 100644
index bf55b32..0000000
Binary files a/test/family_v1.6_00001.h5 and /dev/null differ
diff --git a/test/family_v1.6_00002.h5 b/test/family_v1.6_00002.h5
deleted file mode 100644
index 9bd0891..0000000
Binary files a/test/family_v1.6_00002.h5 and /dev/null differ
diff --git a/test/family_v1.6_00003.h5 b/test/family_v1.6_00003.h5
deleted file mode 100644
index fedce2a..0000000
Binary files a/test/family_v1.6_00003.h5 and /dev/null differ
diff --git a/test/family_v16_00000.h5 b/test/family_v16_00000.h5
new file mode 100644
index 0000000..5b69c93
Binary files /dev/null and b/test/family_v16_00000.h5 differ
diff --git a/test/family_v16_00001.h5 b/test/family_v16_00001.h5
new file mode 100644
index 0000000..bf55b32
Binary files /dev/null and b/test/family_v16_00001.h5 differ
diff --git a/test/family_v16_00002.h5 b/test/family_v16_00002.h5
new file mode 100644
index 0000000..9bd0891
Binary files /dev/null and b/test/family_v16_00002.h5 differ
diff --git a/test/family_v16_00003.h5 b/test/family_v16_00003.h5
new file mode 100644
index 0000000..fedce2a
Binary files /dev/null and b/test/family_v16_00003.h5 differ
diff --git a/test/fheap.c b/test/fheap.c
index 0556a04..263d3a9 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -14400,7 +14400,9 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+#ifdef NOT_YET
     h5_stat_size_t       file_size;              /* Size of file currently */
+#endif /* NOT_YET */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
     size_t      obj_size;               /* Size of object */
     size_t      robj_size;              /* Size of object read */
@@ -14513,6 +14515,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
+#ifdef NOT_YET
     /* Get the size of the file */
     if((file_size = h5_get_file_size(filename)) < 0)
         TEST_ERROR
@@ -14523,6 +14526,7 @@ HDfprintf(stderr, "empty_size = %lu, file_size = %lu\n", (unsigned long)empty_si
     /* Verify the file is correct size */
     if(file_size != empty_size)
         TEST_ERROR
+#endif /* NOT_YET */
 
     /* Free resources */
     H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
@@ -15749,6 +15753,7 @@ curr_test = FHEAP_TEST_NORMAL;
         } /* end switch */
 
         /* Test fractal heap creation */
+#ifndef QAK
         nerrors += test_create(fapl, &small_cparam, &tparam);
         nerrors += test_reopen(fapl, &small_cparam, &tparam);
         nerrors += test_open_twice(fapl, &small_cparam, &tparam);
@@ -15756,6 +15761,9 @@ curr_test = FHEAP_TEST_NORMAL;
         nerrors += test_id_limits(fapl, &small_cparam);
         nerrors += test_filtered_create(fapl, &small_cparam);
         nerrors += test_size(fapl, &small_cparam);
+#else /* QAK */
+HDfprintf(stderr, "Uncomment tests!\n");
+#endif /* QAK */
 
 #ifndef QAK2
 #ifndef QAK
@@ -16049,8 +16057,8 @@ HDfprintf(stderr, "Uncomment tests!\n");
             tparam.del_dir = del_dir;
 
             /* Controlled tests */
+/* XXX: Re-enable file size checks in these tests, after the file has persistent free space tracking working */
             nerrors += test_filtered_man_root_direct(fapl, &small_cparam, &tparam);
-/* XXX: Re-enable file size checks in this test, after the file has persistent free space tracking working */
             nerrors += test_filtered_man_root_indirect(fapl, &small_cparam, &tparam);
 
             /* Random tests, with compressed blocks */
diff --git a/test/fillval.c b/test/fillval.c
index acbd2b9..2cf1191 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -2142,8 +2142,8 @@ main(int argc, char *argv[])
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
         /* Loop over using new group format */
         for(new_format = FALSE; new_format <= TRUE; new_format++) {
diff --git a/test/flush2.c b/test/flush2.c
index dbb0a82..5ec5300 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -196,7 +196,8 @@ main(void)
 #if defined _WIN32 && defined _HDF5USEDLL_
 	SKIPPED();
 	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-
+#elif defined H5_VMS
+        SKIPPED();
 #else
         H5_FAILED()
         goto error;
@@ -218,7 +219,8 @@ main(void)
 #if defined _WIN32 && defined _HDF5USEDLL_
 	SKIPPED();
 	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-
+#elif defined H5_VMS
+        SKIPPED();
 #else
         H5_FAILED()
         goto error;
diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c
new file mode 100644
index 0000000..d04996d
--- /dev/null
+++ b/test/gen_bad_ohdr.c
@@ -0,0 +1,103 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Programmer:  Quincey Koziol 
+ *              Jan  5, 2008
+ *
+ * Purpose:     This program is run to generate an HDF5 data file with a
+ *              root group that contains the incorrect # of object header
+ *              messages.  It must be built/run with a copy of the library
+ *              that has been built with the "H5O_ENABLE_BAD_MESG_COUNT" macro
+ *              defined.
+ */
+
+#include "hdf5.h"
+#include "H5private.h"
+#include "H5Oprivate.h"
+
+#define FILENAME "tbad_msg_count.h5"
+#define GROUPNAME "Group"
+#define ATTRNAME1 "Attribute #1"
+#define ATTRNAME2 "Attribute #2"
+
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
+#ifndef FALSE
+#define FALSE 0
+#endif /* FALSE */
+
+int main(void)
+{
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
+    hid_t fid = -1;             /* File ID */
+    hid_t gid = -1;             /* Group ID */
+    hid_t sid = -1;             /* Dataspace ID */
+    hid_t aid = -1;             /* Attribute ID */
+    hid_t gcpl = -1;            /* Group creation property list ID */
+    hbool_t store_bad_mesg_count;       /* Flag for storing a bad message count */
+
+    /* Create test file */
+    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+
+    /* Create group creation property list */
+    if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) goto error;
+
+    /* Add property for storing bad message count */
+    store_bad_mesg_count = TRUE;
+    if(H5Pinsert2(gcpl, H5O_BAD_MESG_COUNT_NAME, H5O_BAD_MESG_COUNT_SIZE, &store_bad_mesg_count, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
+
+    /* Create group with bad object header message count */
+    if((gid = H5Gcreate2(fid, GROUPNAME, H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) goto error;
+
+    /* Close group creation property list */
+    if(H5Pclose(gcpl) < 0) goto error;
+
+    /* Create dataspace for attributes */
+    if((sid = H5Screate(H5S_SCALAR)) < 0) goto error;
+
+    /* Create attribute on root group */
+    if((aid = H5Acreate2(gid, ATTRNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+    if(H5Aclose(aid) < 0) goto error;
+
+    /* Create another attribute on root group */
+    if((aid = H5Acreate2(gid, ATTRNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+    if(H5Aclose(aid) < 0) goto error;
+
+    /* Close dataspace */
+    if(H5Sclose(sid) < 0) goto error;
+
+    /* Close group */
+    if(H5Gclose(gid) < 0) goto error;
+
+    /* Close file */
+    if(H5Fclose(fid) < 0) goto error;
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose(aid);
+        H5Sclose(sid);
+        H5Pclose(gcpl);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+#else /* H5O_ENABLE_BAD_MESG_COUNT */
+    HDputs("H5O_BAD_MESG_COUNT compiler macro not defined!");
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
+    return 1;
+}
+
diff --git a/test/gen_new_group.c b/test/gen_new_group.c
index 1a57b6f..6d16031 100644
--- a/test/gen_new_group.c
+++ b/test/gen_new_group.c
@@ -57,8 +57,8 @@ int main(void)
     /* Copy the file access property list */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) goto error;
 
-    /* Set the "use the latest version of the format" flag for creating objects in the file */
-    if(H5Pset_latest_format(fapl, TRUE) < 0) goto error;
+    /* Set the "use the latest version of the format" bounds for creating objects in the file */
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) goto error;
 
     /* Create file for test groups */
     if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl)) <0) goto error;
diff --git a/test/getname.c b/test/getname.c
index 685bfbf..954790f 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -65,11 +65,11 @@ check_name(hid_t id, const char *chk_name, const char *chk_user_path)
 
     /* Get name */
     *name = '\0';
-    if(H5Iget_name(id, name, NAME_BUF_SIZE) < 0) goto error;
+    if(H5Iget_name(id, name, NAME_BUF_SIZE) < 0) TEST_ERROR
 
     /* Get user path */
     *user_path = '\0';
-    if(H5G_user_path_test(id, user_path, &user_path_len, &user_path_hidden) < 0) goto error;
+    if(H5G_user_path_test(id, user_path, &user_path_len, &user_path_hidden) < 0) TEST_ERROR
 
     /* Check on name from H5Iget_name() */
     if(HDstrcmp(name, chk_name)) goto error;
@@ -78,7 +78,7 @@ check_name(hid_t id, const char *chk_name, const char *chk_user_path)
     if(HDstrcmp(user_path, chk_user_path)) goto error;
 
     /* Check that if user path is hidden, the name from H5Iget_name() and the user path should be different */
-    if(user_path_hidden && !HDstrcmp(chk_name, chk_user_path)) goto error;
+    if(user_path_hidden && !HDstrcmp(chk_name, chk_user_path)) TEST_ERROR
 
     /* Everything matches */
     return 0;
@@ -713,10 +713,10 @@ test_main(hid_t file_id, hid_t fapl)
     PASSED();
 
 
-/*-------------------------------------------------------------------------
-    * Test H5Iget_name with H5Fmount; long name
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * Test H5Iget_name with H5Fmount; long name
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("H5Iget_name with H5Fmount; long name");
 
@@ -726,9 +726,9 @@ test_main(hid_t file_id, hid_t fapl)
     if((group3_id = H5Gcreate2(file_id, "/g13/g1/g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Close */
-    H5Gclose(group_id);
-    H5Gclose(group2_id);
-    H5Gclose(group3_id);
+    if(H5Gclose(group_id) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group2_id) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group3_id) < 0) FAIL_STACK_ERROR
 
     /* Create second file and group "g" in it */
     file1_id = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
@@ -1144,6 +1144,7 @@ test_main(hid_t file_id, hid_t fapl)
     char    name2[SMALL_NAME_BUF_SIZE];
 
     /* Get name */
+    *name2 = '\0';
     name_len=H5Iget_name(group_id, name2, SMALL_NAME_BUF_SIZE);
 
     /* Check that name is longer */
@@ -1182,6 +1183,7 @@ test_main(hid_t file_id, hid_t fapl)
     if(!name3) TEST_ERROR
 
     /* Get name with dynamic buffer */
+    *name3 = '\0';
     if(H5Iget_name(group_id, name3, name_len + 1) < 0) TEST_ERROR
 
     /* Verify */
@@ -1189,6 +1191,7 @@ test_main(hid_t file_id, hid_t fapl)
     *name3 = '\0';
 
     /* Get name with smaller buffer */
+    *name3 = '\0';
     if(H5Iget_name(group_id, name3, 3) < 0) TEST_ERROR
 
     /* Verify */
@@ -2513,80 +2516,96 @@ test_obj_ref(hid_t fapl)
 
     TESTING("getting path to normal dataset in root group"); 
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[0])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(dataset2,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Dataset3") == 0) &&(i == 9))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[0], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Dataset3") == 0) &&(i == 9))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset in /Group1"); 
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[1])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(dataset2,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1/Dataset2") == 0) &&(i == 16))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Dataset2") == 0) &&(i == 16))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to /Group1"); 
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[2])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(group,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(group, (char*)buf, sizeof(buf));
     if(H5Gclose(group) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1") == 0) &&(i == 7))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[2],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[2], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1") == 0) &&(i == 7))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to datatype in /Group1"); 
     if((tid1 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[3])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(tid1,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(tid1, (char*)buf, sizeof(buf));
     if(H5Tclose(tid1) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1/Datatype1") == 0) &&(i == 17))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[3],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[3], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Datatype1") == 0) &&(i == 17))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset in nested group"); 
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[4])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(dataset2,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1/Group2/Dataset4") == 0) &&(i == 23))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Group2/Dataset4") == 0) &&(i == 23))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to nested group"); 
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[5])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(group,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(group, (char*)buf, sizeof(buf));
     if(H5Gclose(group) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1/Group2") == 0) &&(i == 14))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[5],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[5], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Group2") == 0) &&(i == 14))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to dataset created via hard link"); 
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[6])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(dataset2,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/Group1/Dataset5") == 0) &&(i == 16))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[6],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[6], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/Group1/Dataset5") == 0) &&(i == 16))) TEST_ERROR
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
     TESTING("getting path to root group"); 
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[7])) < 0) FAIL_STACK_ERROR
-    i = H5Iget_name(group,(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Iget_name(group, (char*)buf, sizeof(buf));
     if(H5Gclose(group) < 0) FAIL_STACK_ERROR
     if(!((HDstrcmp(buf, "/") == 0) &&(i == 1))) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[7],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[7], (char*)buf, sizeof(buf));
     if(!((HDstrcmp(buf, "/") == 0) &&(i == 1))) TEST_ERROR
     PASSED()
 
@@ -2596,10 +2615,12 @@ test_obj_ref(hid_t fapl)
 
     TESTING("getting path to dataset hidden by a mounted file");
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[4])) < 0) FAIL_STACK_ERROR
+    *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(i != 0) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[4], (char*)buf, sizeof(buf));
     if(i != 0) TEST_ERROR
     PASSED()
 
@@ -2610,10 +2631,12 @@ test_obj_ref(hid_t fapl)
         FAIL_STACK_ERROR
  
     TESTING("getting path to dataset that has been unlinked"); 
+    *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
     if(i != 0) TEST_ERROR
-    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1],(char*)buf, sizeof(buf));
+    *buf = '\0';
+    i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1], (char*)buf, sizeof(buf));
     if(i != 0) TEST_ERROR
     PASSED()
     
@@ -2702,7 +2725,7 @@ test_reg_ref(hid_t fapl)
     /* Create a reference to elements selection */
     if((status = H5Sselect_none(space_id)) < 0)
 	TEST_ERROR
-    if((status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points,(const hsize_t **)coord)) < 0)
+    if((status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord)) < 0)
 	TEST_ERROR
     if((status = H5Rcreate(&ref[1], file_id, REFREG_DSETNAMEV, H5R_DATASET_REGION, space_id)) < 0)
 	TEST_ERROR
@@ -2735,7 +2758,8 @@ test_reg_ref(hid_t fapl)
 
     /* Get name of the dataset the first region reference points to using H5Rget_name */
     TESTING("H5Rget_name to get name from region reference(hyperslab)");
-    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0],(char*)buf1, NAME_BUF_SIZE);
+    *buf1 = '\0';
+    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, NAME_BUF_SIZE);
     if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR 
     PASSED()
 
@@ -2745,7 +2769,8 @@ test_reg_ref(hid_t fapl)
     dsetv_id = H5Rdereference(dsetr_id, H5R_DATASET_REGION, &ref_out[0]);
 
     /* Get name of the dataset the first region reference points using H5Iget_name */
-    name_size2 = H5Iget_name(dsetv_id,(char*)buf2, NAME_BUF_SIZE); 
+    *buf2 = '\0';
+    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE); 
     if(!((HDstrcmp(buf2, "/MATRIX") == 0) &&(name_size2 == 7))) TEST_ERROR
 
     if((status = H5Dclose(dsetv_id)) < 0) TEST_ERROR
@@ -2754,7 +2779,8 @@ test_reg_ref(hid_t fapl)
 
     /* Get name of the dataset the second region reference points to using H5Rget_name */
     TESTING("H5Rget_name to get name from region reference(pnt selec)");
-    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[1],(char*)buf1, NAME_BUF_SIZE);      
+    *buf1 = '\0';
+    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[1], (char*)buf1, NAME_BUF_SIZE);      
     if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
     PASSED()
 
@@ -2764,7 +2790,8 @@ test_reg_ref(hid_t fapl)
     if((dsetv_id = H5Rdereference(dsetr_id, H5R_DATASET_REGION, &ref_out[1])) < 0) TEST_ERROR
 
     /* Get name of the dataset the first region reference points using H5Iget_name */
-    name_size2 = H5Iget_name(dsetv_id,(char*)buf2, NAME_BUF_SIZE); 
+    *buf2 = '\0';
+    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE); 
     if(!((HDstrcmp(buf2, "/MATRIX") == 0) &&(name_size2 == 7))) TEST_ERROR
 
     if((status = H5Dclose(dsetv_id)) < 0) TEST_ERROR
diff --git a/test/h5test.c b/test/h5test.c
index db56860..6445ce6 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -210,13 +210,24 @@ h5_cleanup(const char *base_name[], hid_t fapl)
 void
 h5_reset(void)
 {
-    char	filename[1024];
-
     HDfflush(stdout);
     HDfflush(stderr);
     H5close();
     H5Eset_auto2(H5E_DEFAULT, h5_errors, NULL);
 
+/*
+ * I commented this chunk of code out because it's not clear what diagnostics
+ *      were being output and under what circumstances, and creating this file
+ *      is throwing off debugging some of the tests.  I can't see any _direct_
+ *      harm in keeping this section of code, but I can't see any _direct_
+ *      benefit right now either.  If we figure out under which circumstances
+ *      diagnostics are being output, we should enable this behavior based on
+ *      appropriate configure flags/macros.  QAK - 2007/12/20
+ */
+#ifdef OLD_WAY
+{
+    char	filename[1024];
+
     /*
      * Cause the library to emit some diagnostics early so they don't
      * interfere with other formatted output.
@@ -231,6 +242,8 @@ h5_reset(void)
 	HDunlink(filename);
     } H5E_END_TRY;
 }
+#endif /* OLD_WAY */
+}
 
 
 /*-------------------------------------------------------------------------
@@ -584,9 +597,10 @@ h5_fileaccess(void)
 	 * and copy buffer size to the default values. */
 	if (H5Pset_fapl_direct(fapl, 1024, 4096, 8*4096)<0) return -1;
 #endif
-    } else if (!HDstrcmp(name, "latest")) {
+    } else if(!HDstrcmp(name, "latest")) {
 	/* use the latest format */
-	if (H5Pset_latest_format(fapl, TRUE)<0) return -1;
+	if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+            return -1;
     } else {
 	/* Unknown driver */
 	return -1;
diff --git a/test/links.c b/test/links.c
index 0a164d9..1bff4c6 100644
--- a/test/links.c
+++ b/test/links.c
@@ -32,6 +32,9 @@
 #define H5G_TESTING
 #include "H5Gpkg.h"		/* Groups 				*/
 
+/* File for external link test.  Created with gen_udlinks.c */
+#define LINKED_FILE  "be_extlink2.h5"
+
 const char *FILENAME[] = {
     "links0",
     "links1",
@@ -42,6 +45,7 @@ const char *FILENAME[] = {
     "links4c",
     "links4d",
     "links5",
+    "links6",
     NULL
 };
 
@@ -95,6 +99,156 @@ typedef struct {
     hbool_t *visited;           /* Pointer to array of "visited link" flags */
 } link_iter_info_t;
 
+/* Link visit structs */
+typedef struct {
+    const char *path;           /* Path to link */
+    H5L_type_t type;            /* Type of link */
+} link_visit_t;
+static const link_visit_t lvisit0[] = {
+    {"Dataset_zero", 0},
+    {"Group1", 0},
+    {"Group1/Dataset_one", 0},
+    {"Group1/Group2", 0},
+    {"Group1/Group2/Dataset_two", 0},
+    {"Group1/Group2/Type_two", 0},
+    {"Group1/Group2/hard_zero", 0},
+    {"Group1/Type_one", 0},
+    {"Group1/hard_one", 0},
+    {"Type_zero", 0},
+    {"ext_dangle", 64},
+    {"ext_one", 64},
+    {"hard_one", 0},
+    {"hard_two", 0},
+    {"hard_zero", 0},
+    {"soft_dangle", 1},
+    {"soft_one", 1},
+    {"soft_two", 1}
+};
+static const link_visit_t lvisit1[] = {
+    {"Dataset_one", 0},
+    {"Group2", 0},
+    {"Group2/Dataset_two", 0},
+    {"Group2/Type_two", 0},
+    {"Group2/hard_zero", 0},
+    {"Group2/hard_zero/Dataset_zero", 0},
+    {"Group2/hard_zero/Group1", 0},
+    {"Group2/hard_zero/Type_zero", 0},
+    {"Group2/hard_zero/ext_dangle", 64},
+    {"Group2/hard_zero/ext_one", 64},
+    {"Group2/hard_zero/hard_one", 0},
+    {"Group2/hard_zero/hard_two", 0},
+    {"Group2/hard_zero/hard_zero", 0},
+    {"Group2/hard_zero/soft_dangle", 1},
+    {"Group2/hard_zero/soft_one", 1},
+    {"Group2/hard_zero/soft_two", 1},
+    {"Type_one", 0},
+    {"hard_one", 0}
+};
+static const link_visit_t lvisit2[] = {
+    {"Dataset_two", 0},
+    {"Type_two", 0},
+    {"hard_zero", 0},
+    {"hard_zero/Dataset_zero", 0},
+    {"hard_zero/Group1", 0},
+    {"hard_zero/Group1/Dataset_one", 0},
+    {"hard_zero/Group1/Group2", 0},
+    {"hard_zero/Group1/Type_one", 0},
+    {"hard_zero/Group1/hard_one", 0},
+    {"hard_zero/Type_zero", 0},
+    {"hard_zero/ext_dangle", 64},
+    {"hard_zero/ext_one", 64},
+    {"hard_zero/hard_one", 0},
+    {"hard_zero/hard_two", 0},
+    {"hard_zero/hard_zero", 0},
+    {"hard_zero/soft_dangle", 1},
+    {"hard_zero/soft_one", 1},
+    {"hard_zero/soft_two", 1}
+};
+
+typedef struct {
+    unsigned idx;               /* Index in link visit structure */
+    const link_visit_t *info;   /* Pointer to the link visit structure to use */
+} lvisit_ud_t;
+
+
+/* Object visit structs */
+typedef struct {
+    const char *path;           /* Path to object */
+    H5O_type_t type;            /* Type of object */
+} obj_visit_t;
+static const obj_visit_t ovisit0_old[] = {
+    {".", 0},
+    {"Dataset_zero", 1},
+    {"Group1", 0},
+    {"Group1/Dataset_one", 1},
+    {"Group1/Group2", 0},
+    {"Group1/Group2/Dataset_two", 1},
+    {"Group1/Group2/Type_two", 2},
+    {"Group1/Type_one", 2},
+    {"Type_zero", 2}
+};
+static const obj_visit_t ovisit0_new[] = {
+    {".", 0},
+    {"Dataset_zero", 1},
+    {"Group1", 0},
+    {"Group1/Dataset_one", 1},
+    {"Group1/Group2", 0},
+    {"Group1/Group2/Dataset_two", 1},
+    {"Group1/Group2/Type_two", 2},
+    {"Group1/Type_one", 2},
+    {"Type_zero", 2}
+};
+static const obj_visit_t ovisit1_old[] = {
+    {".", 0},
+    {"Dataset_one", 1},
+    {"Group2", 0},
+    {"Group2/Dataset_two", 1},
+    {"Group2/Type_two", 2},
+    {"Group2/hard_zero", 0},
+    {"Group2/hard_zero/Dataset_zero", 1},
+    {"Group2/hard_zero/Type_zero", 2},
+    {"Type_one", 2}
+};
+static const obj_visit_t ovisit1_new[] = {
+    {".", 0},
+    {"Dataset_one", 1},
+    {"Group2", 0},
+    {"Group2/Dataset_two", 1},
+    {"Group2/Type_two", 2},
+    {"Group2/hard_zero", 0},
+    {"Group2/hard_zero/Dataset_zero", 1},
+    {"Group2/hard_zero/Type_zero", 2},
+    {"Type_one", 2}
+};
+static const obj_visit_t ovisit2_old[] = {
+    {".", 0},
+    {"Dataset_two", 1},
+    {"Type_two", 2},
+    {"hard_zero", 0},
+    {"hard_zero/Dataset_zero", 1},
+    {"hard_zero/Group1", 0},
+    {"hard_zero/Group1/Dataset_one", 1},
+    {"hard_zero/Group1/Type_one", 2},
+    {"hard_zero/Type_zero", 2}
+};
+static const obj_visit_t ovisit2_new[] = {
+    {".", 0},
+    {"Dataset_two", 1},
+    {"Type_two", 2},
+    {"hard_zero", 0},
+    {"hard_zero/Dataset_zero", 1},
+    {"hard_zero/Group1", 0},
+    {"hard_zero/Group1/Dataset_one", 1},
+    {"hard_zero/Group1/Type_one", 2},
+    {"hard_zero/Type_zero", 2}
+};
+
+typedef struct {
+    unsigned idx;               /* Index in object visit structure */
+    const obj_visit_t *info;    /* Pointer to the object visit structure to use */
+} ovisit_ud_t;
+
+
 
 /*-------------------------------------------------------------------------
  * Function:	mklinks
@@ -5164,6 +5318,473 @@ error:
     return -1;
 } /* end check_all_closed() */
 
+
+
+/*-------------------------------------------------------------------------
+ * Function:    build_visit_file
+ *
+ * Purpose:     Build an "interesting" file to use for visiting links & objects
+ *
+ * Return:      Success:        >0, File ID for file built
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Saturday, November 24, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static hid_t
+build_visit_file(hid_t fapl)
+{
+    hid_t fid = -1;                     /* File ID */
+    hid_t gid = -1, gid2 = -1;          /* Group IDs */
+    hid_t sid = (-1);                   /* Dataspace ID */
+    hid_t did = (-1);                   /* Dataset ID */
+    hid_t tid = (-1);                   /* Datatype ID */
+    char filename[NAME_BUF_SIZE];
+    char pathname[1024];                /* Path of external link file */
+    char *srcdir = getenv("srcdir");    /* where the src code is located */
+
+    h5_fixname(FILENAME[9], fapl, filename, sizeof filename);
+    
+    /* Create file for visiting */
+    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+
+    /* Create group */
+    if((gid = H5Gcreate2(fid, "/Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+
+    /* Create nested group */
+    if((gid2 = H5Gcreate2(gid, "Group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+
+    /* Close groups */
+    if(H5Gclose(gid2) < 0) TEST_ERROR
+    if(H5Gclose(gid) < 0) TEST_ERROR
+
+
+    /* Create soft links to groups created */
+    if(H5Lcreate_soft("/Group1", fid, "/soft_one", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Lcreate_soft("/Group1/Group2", fid, "/soft_two", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+    /* Create dangling soft link */
+    if(H5Lcreate_soft("nowhere", fid, "/soft_dangle", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+
+    /* Create hard links to all groups */
+    if(H5Lcreate_hard(fid, "/", fid, "hard_zero", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Lcreate_hard(fid, "/Group1", fid, "hard_one", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Lcreate_hard(fid, "/Group1/Group2", fid, "hard_two", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+    /* Create loops w/hard links */
+    if(H5Lcreate_hard(fid, "/Group1", fid, "/Group1/hard_one", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Lcreate_hard(fid, "/", fid, "/Group1/Group2/hard_zero", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+    /* Create external link to existing file */
+    pathname[0] = '\0';
+    /* Generate correct name for test file by prepending the source path */
+    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(LINKED_FILE) + 1) < sizeof(pathname))) {
+        HDstrcpy(pathname, srcdir);
+        HDstrcat(pathname, "/");
+    }
+    HDstrcat(pathname, LINKED_FILE);
+
+    if(H5Lcreate_external(pathname, "/group", fid, "/ext_one", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+    /* Create dangling external link to non-existant file */
+    if(H5Lcreate_external("foo.h5", "/group", fid, "/ext_dangle", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+
+    /* Create dataset in each group */
+    if((sid = H5Screate(H5S_SCALAR)) < 0) TEST_ERROR
+
+    if((did = H5Dcreate2(fid, "/Dataset_zero", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+    if(H5Dclose(did) < 0) TEST_ERROR
+
+    if((did = H5Dcreate2(fid, "/Group1/Dataset_one", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+    if(H5Dclose(did) < 0) TEST_ERROR
+
+    if((did = H5Dcreate2(fid, "/Group1/Group2/Dataset_two", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+    if(H5Dclose(did) < 0) TEST_ERROR
+
+    if(H5Sclose(sid) < 0) TEST_ERROR
+
+    /* Create named datatype in each group */
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if(H5Tcommit2(fid, "/Type_zero", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Tclose(tid) < 0) TEST_ERROR
+
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if(H5Tcommit2(fid, "/Group1/Type_one", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Tclose(tid) < 0) TEST_ERROR
+
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if(H5Tcommit2(fid, "/Group1/Group2/Type_two", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Tclose(tid) < 0) TEST_ERROR
+
+    return(fid);
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end build_visit_file() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    visit_link_cb
+ *
+ * Purpose:     Callback routine for visiting links in a file
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Saturday, November 24, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+visit_link_cb(hid_t UNUSED group_id, const char *name, const H5L_info_t *linfo,
+    void *_op_data)
+{
+    lvisit_ud_t *op_data = (lvisit_ud_t *)_op_data;
+
+    /* Check for correct link information */
+    if(HDstrcmp(op_data->info[op_data->idx].path, name)) return(H5_ITER_ERROR);
+    if(op_data->info[op_data->idx].type != linfo->type) return(H5_ITER_ERROR);
+
+    /* Advance to next location in expected output */
+    op_data->idx++;
+
+    return(H5_ITER_CONT);
+} /* end visit_link_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    link_visit
+ *
+ * Purpose:     Test the link visiting routine
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Saturday, November 24, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+link_visit(hid_t fapl, hbool_t new_format)
+{
+    lvisit_ud_t udata;          /* User-data for visiting */
+    hid_t fid = -1;
+    hid_t gid = -1;             /* Group ID */
+
+    if(new_format)
+        TESTING("link visiting (w/new group format)")
+    else
+        TESTING("link visiting")
+
+    /* Construct "interesting" file to visit */
+    if((fid = build_visit_file(fapl)) < 0) TEST_ERROR
+
+    /* Visit all the links reachable from the root group (with file ID) */
+    udata.idx = 0;
+    udata.info = lvisit0;
+    if(H5Lvisit(fid, H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata) < 0) FAIL_STACK_ERROR
+
+    /* Visit all the links reachable from the root group (with group ID) */
+    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit0;
+    if(H5Lvisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Visit all the links reachable from each internal group */
+    if((gid = H5Gopen2(fid, "/Group1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit1;
+    if(H5Lvisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1/Group2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit2;
+    if(H5Lvisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Close file created */
+    if(H5Fclose(fid) < 0) TEST_ERROR
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end link_visit() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    link_visit_by_name
+ *
+ * Purpose:     Test the link visiting "by name" routine
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Saturday, November 24, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+link_visit_by_name(hid_t fapl, hbool_t new_format)
+{
+    lvisit_ud_t udata;          /* User-data for visiting */
+    hid_t fid = -1;
+    hid_t gid = -1;             /* Group ID */
+
+    if(new_format)
+        TESTING("link visiting by name (w/new group format)")
+    else
+        TESTING("link visiting by name")
+
+    /* Construct "interesting" file to visit */
+    if((fid = build_visit_file(fapl)) < 0) TEST_ERROR
+
+    /* Visit all the links reachable from the root group (with file ID) */
+    udata.idx = 0;
+    udata.info = lvisit0;
+    if(H5Lvisit_by_name(fid, "/", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    /* Visit all the links reachable from the root group (with group ID) */
+    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit0;
+    if(H5Lvisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Visit all the links reachable from each internal group */
+    udata.idx = 0;
+    udata.info = lvisit1;
+    if(H5Lvisit_by_name(fid, "/Group1", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit1;
+    if(H5Lvisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+    udata.idx = 0;
+    udata.info = lvisit2;
+    if(H5Lvisit_by_name(fid, "/Group1/Group2", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1/Group2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = lvisit2;
+    if(H5Lvisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_link_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Close file created */
+    if(H5Fclose(fid) < 0) TEST_ERROR
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end link_visit_by_name() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    visit_obj_cb
+ *
+ * Purpose:     Callback routine for visiting objects in a file
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Sunday, November 25, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+visit_obj_cb(hid_t UNUSED group_id, const char *name, const H5O_info_t *oinfo,
+    void *_op_data)
+{
+    ovisit_ud_t *op_data = (ovisit_ud_t *)_op_data;
+
+    /* Check for correct object information */
+    if(HDstrcmp(op_data->info[op_data->idx].path, name)) return(H5_ITER_ERROR);
+    if(op_data->info[op_data->idx].type != oinfo->type) return(H5_ITER_ERROR);
+
+    /* Advance to next location in expected output */
+    op_data->idx++;
+
+    return(H5_ITER_CONT);
+} /* end visit_obj_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    obj_visit
+ *
+ * Purpose:     Test the object visiting routine
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Sunday, November 25, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+obj_visit(hid_t fapl, hbool_t new_format)
+{
+    ovisit_ud_t udata;          /* User-data for visiting */
+    hid_t fid = -1;
+    hid_t gid = -1;             /* Group ID */
+
+    if(new_format)
+        TESTING("object visiting (w/new group format)")
+    else
+        TESTING("object visiting")
+
+    /* Construct "interesting" file to visit */
+    if((fid = build_visit_file(fapl)) < 0) TEST_ERROR
+
+    /* Visit all the objects reachable from the root group (with file ID) */
+    udata.idx = 0;
+    udata.info = new_format ? ovisit0_new : ovisit0_old;
+    if(H5Ovisit(fid, H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata) < 0) FAIL_STACK_ERROR
+
+    /* Visit all the objects reachable from the root group (with group ID) */
+    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit0_new : ovisit0_old;
+    if(H5Ovisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Visit all the objects reachable from each internal group */
+    if((gid = H5Gopen2(fid, "/Group1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit1_new : ovisit1_old;
+    if(H5Ovisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1/Group2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit2_new : ovisit2_old;
+    if(H5Ovisit(gid, H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Close file created */
+    if(H5Fclose(fid) < 0) TEST_ERROR
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end obj_visit() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    obj_visit_by_name
+ *
+ * Purpose:     Test the object visiting "by name" routine
+ *
+ * Return:      Success:        0
+ *              Failure:        -1
+ *
+ * Programmer:  Quincey Koziol
+ *              Sunday, November 25, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+obj_visit_by_name(hid_t fapl, hbool_t new_format)
+{
+    ovisit_ud_t udata;          /* User-data for visiting */
+    hid_t fid = -1;
+    hid_t gid = -1;             /* Group ID */
+
+    if(new_format)
+        TESTING("object visiting by name (w/new group format)")
+    else
+        TESTING("object visiting by name")
+
+    /* Construct "interesting" file to visit */
+    if((fid = build_visit_file(fapl)) < 0) TEST_ERROR
+
+    /* Visit all the objects reachable from the root group (with file ID) */
+    udata.idx = 0;
+    udata.info = new_format ? ovisit0_new : ovisit0_old;
+    if(H5Ovisit_by_name(fid, "/", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    /* Visit all the objects reachable from the root group (with group ID) */
+    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit0_new : ovisit0_old;
+    if(H5Ovisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Visit all the objects reachable from each internal group */
+    udata.idx = 0;
+    udata.info = new_format ? ovisit1_new : ovisit1_old;
+    if(H5Ovisit_by_name(fid, "/Group1", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit1_new : ovisit1_old;
+    if(H5Ovisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    udata.idx = 0;
+    udata.info = new_format ? ovisit2_new : ovisit2_old;
+    if(H5Ovisit_by_name(fid, "/Group1/Group2", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+
+    if((gid = H5Gopen2(fid, "/Group1/Group2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    udata.idx = 0;
+    udata.info = new_format ? ovisit2_new : ovisit2_old;
+    if(H5Ovisit_by_name(gid, ".", H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
+
+
+    /* Close file created */
+    if(H5Fclose(fid) < 0) TEST_ERROR
+
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end obj_visit_by_name() */
+
 
 /*-------------------------------------------------------------------------
  * Function:    corder_create_empty
@@ -9590,49 +10211,57 @@ main(void)
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
         /* Loop over using new group format */
         for(new_format = FALSE; new_format <= TRUE; new_format++) {
+            hid_t my_fapl;
+
+            /* Check for FAPL to use */
+            if(new_format)
+                my_fapl = fapl2;
+            else
+                my_fapl = fapl;
+
             /* General tests... (on both old & new format groups */
-            nerrors += mklinks((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += cklinks((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += new_links((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += ck_new_links((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += long_links((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += toomany((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += mklinks(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += cklinks(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += new_links(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += ck_new_links(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += long_links(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += toomany(my_fapl, new_format) < 0 ? 1 : 0;
 
             /* Test new H5L link creation routine */
-            nerrors += test_lcpl((new_format ? fapl2 : fapl), new_format);
-            nerrors += test_move((new_format ? fapl2 : fapl), new_format);
-            nerrors += test_copy((new_format ? fapl2 : fapl), new_format);
-            nerrors += test_move_preserves((new_format ? fapl2 : fapl), new_format);
+            nerrors += test_lcpl(my_fapl, new_format);
+            nerrors += test_move(my_fapl, new_format);
+            nerrors += test_copy(my_fapl, new_format);
+            nerrors += test_move_preserves(my_fapl, new_format);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-            nerrors += test_deprec((new_format ? fapl2 : fapl), new_format);
+            nerrors += test_deprec(my_fapl, new_format);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 #ifndef H5_CANNOT_OPEN_TWICE
-            nerrors += external_link_root((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0;
 #endif /* H5_CANNOT_OPEN_TWICE */
-            nerrors += external_link_path((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_mult((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_path(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_mult(my_fapl, new_format) < 0 ? 1 : 0;
 #ifndef H5_CANNOT_OPEN_TWICE
-            nerrors += external_link_self((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_pingpong((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_toomany((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_self(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_pingpong(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_toomany(my_fapl, new_format) < 0 ? 1 : 0;
 #endif /* H5_CANNOT_OPEN_TWICE */
-            nerrors += external_link_dangling((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_recursive((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_query((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_unlink_compact((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_unlink_dense((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_move((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_ride((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_dangling(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_recursive(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_query(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_unlink_compact(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_unlink_dense(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_move(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_ride(my_fapl, new_format) < 0 ? 1 : 0;
 #ifndef H5_CANNOT_OPEN_TWICE
-            nerrors += external_link_closing((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_closing(my_fapl, new_format) < 0 ? 1 : 0;
 #endif /* H5_CANNOT_OPEN_TWICE */
-            nerrors += external_link_endian((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += external_link_strong((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += external_link_endian(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += external_link_strong(my_fapl, new_format) < 0 ? 1 : 0;
 
             /* These tests assume that external links are a form of UD links,
              * so assume that everything that passed for external links
@@ -9642,13 +10271,20 @@ main(void)
                 nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0;     /* requires new format groups */
                 nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0;        /* requires new format groups */
             } /* end if */
-            nerrors += ud_callbacks((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += ud_link_errors((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += lapl_udata((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += lapl_nlinks((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-            nerrors += linkinfo((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
-
-            nerrors += check_all_closed((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
+            nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += ud_link_errors(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += lapl_udata(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += lapl_nlinks(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += linkinfo(my_fapl, new_format) < 0 ? 1 : 0;
+
+            /* Misc. extra tests, useful for both new & old format files */
+            nerrors += link_visit(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += link_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += obj_visit(my_fapl, new_format) < 0 ? 1 : 0;
+            nerrors += obj_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
+
+            /* Keep this test last, it's testing files that are used above */
+            nerrors += check_all_closed(my_fapl, new_format) < 0 ? 1 : 0;
         } /* end for */
 
         /* New group revision feature tests */
diff --git a/test/mount.c b/test/mount.c
index 2ce9a2a..e6aa881 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -1170,6 +1170,7 @@ test_mount_after_close(hid_t fapl)
     if((gidABMX = H5Gopen2(gidAB, "M/X", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name(gidABMX, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
     if(HDstrcmp(objname, "/A/B/M/X")) TEST_ERROR
 
@@ -1180,6 +1181,7 @@ test_mount_after_close(hid_t fapl)
     if((gidABC = H5Gopen2(gidAB, "C", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name(gidABC, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
     if(HDstrcmp(objname, "/A/B/C")) TEST_ERROR
 
@@ -1190,6 +1192,7 @@ test_mount_after_close(hid_t fapl)
     if((gidABT = H5Gopen2(gidAB, "T", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name(gidABT, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
     if(HDstrcmp(objname, "/A/B/T")) TEST_ERROR
 
@@ -1200,6 +1203,7 @@ test_mount_after_close(hid_t fapl)
     if((didABMXYD = H5Dopen2(gidAB, "M/X/Y/D", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name(didABMXYD, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
     if(HDstrcmp(objname, "/A/B/M/X/Y/D")) TEST_ERROR
 
@@ -1370,6 +1374,7 @@ test_mount_after_unmount(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name( gidAMXX, objname, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(objname, "/A/M/X/X"))
@@ -1389,6 +1394,7 @@ test_mount_after_unmount(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(objname, "/A/M/X/M/Y"))
@@ -1435,6 +1441,7 @@ test_mount_after_unmount(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *objname = '\0';
     if(H5Iget_name( gidBMZ, objname, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(objname, "/B/M/Z"))
@@ -2721,6 +2728,7 @@ test_mult_mount(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if(H5Iget_name(gidAMT, name, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(name, "/A/M/T"))
@@ -2738,6 +2746,7 @@ test_mult_mount(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if(H5Iget_name(gidBS, name, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(name, "/B/S"))
@@ -2924,6 +2933,7 @@ test_nested_survive(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/A/M"))
@@ -2934,9 +2944,10 @@ test_nested_survive(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/M"))
+    if(name_len != 0 || HDstrcmp(name, ""))
         TEST_ERROR
 
     /* Open object in file #3 through file #1 mount path (should fail) */
@@ -2951,6 +2962,7 @@ test_nested_survive(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if(H5Iget_name(gidMS, name, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(name, "/M/S"))
@@ -2969,6 +2981,7 @@ test_nested_survive(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if(H5Iget_name(gidAMS, name, (size_t)NAME_BUF_SIZE ) < 0)
         TEST_ERROR
     if(HDstrcmp(name, "/A/M/S"))
@@ -3122,6 +3135,7 @@ test_close_parent(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "M" is still defined */
+    *name = '\0';
     if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/A/M"))
@@ -3132,6 +3146,7 @@ test_close_parent(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "M" is defined in its file */
+    *name = '\0';
     if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/M"))
@@ -3407,6 +3422,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/A/E/M"))
@@ -3417,6 +3433,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check name */
+    *name = '\0';
     if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/B/I/Q"))
@@ -3477,6 +3494,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "K" is correct */
+    *name = '\0';
     if((name_len = H5Iget_name(gidK, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/D/K"))
@@ -3497,6 +3515,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "O" is correct */
+    *name = '\0';
     if((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/B/H/O"))
@@ -3506,12 +3525,14 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "M" is defined in its file */
+    *name = '\0';
     if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/E/M"))
         TEST_ERROR
 
     /* Check the name of "Q" is still defined */
+    *name = '\0';
     if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/B/I/Q"))
@@ -3539,6 +3560,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "Q" is defined in its file */
+    *name = '\0';
     if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/I/Q"))
@@ -3549,6 +3571,7 @@ test_cut_graph(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "O" is correct */
+    *name = '\0';
     if((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/H/O"))
@@ -3719,6 +3742,7 @@ test_symlink(hid_t fapl)
         TEST_ERROR
 
     /* Check the name of "L" is correct */
+    *name = '\0';
     if((name_len = H5Iget_name(gidL, name, (size_t)NAME_BUF_SIZE )) < 0)
         TEST_ERROR
     if(name_len == 0 || HDstrcmp(name, "/L"))
diff --git a/test/objcopy.c b/test/objcopy.c
index 69a6769..5fdbdba 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -325,7 +325,7 @@ attach_reg_ref_attr(hid_t file_id, hid_t loc_id)
 
     /* create reg_ref of point selection */
     if(H5Sselect_none(space_id) < 0) TEST_ERROR
-    if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t **)coord) < 0) TEST_ERROR
+    if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord) < 0) TEST_ERROR
     if(H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR
 
     /* create reg_ref attribute */
@@ -408,7 +408,7 @@ create_reg_ref_dataset(hid_t file_id, hid_t loc_id)
     if(H5Sselect_hyperslab(space_id,H5S_SELECT_SET,start,NULL,count,NULL) < 0) TEST_ERROR
     if(H5Rcreate(&ref[0], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR
     if(H5Sselect_none(space_id) < 0) TEST_ERROR
-    if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t **)coord) < 0) TEST_ERROR
+    if(H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord) < 0) TEST_ERROR
     if(H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id) < 0) TEST_ERROR
     if(H5Dwrite(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT,ref) < 0) TEST_ERROR
     if(H5Dclose(dsetr_id) < 0) TEST_ERROR
@@ -7175,13 +7175,13 @@ main(void)
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
         /* Create an FCPL with sharing enabled */
         if((fcpl_shared = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR
         if(H5Pset_shared_mesg_nindexes(fcpl_shared, 1) < 0) TEST_ERROR
-        if(H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_MESG_ALL_FLAG, (size_t) 10) < 0) TEST_ERROR 
+        if(H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_SHMESG_ALL_FLAG, (size_t) 10) < 0) TEST_ERROR 
 
         /* Test in all configurations */
         for(configuration = 0; configuration <= MAX_CONFIGURATION; configuration++) {
diff --git a/test/ohdr.c b/test/ohdr.c
index 0ff5ac0..08fd860 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -89,7 +89,7 @@ main(void)
             HDputs("Using default file format:");
 
         /* Set the format to use for the file */
-        if (H5Pset_latest_format(fapl, b) < 0) FAIL_STACK_ERROR
+        if (H5Pset_libver_bounds(fapl, (b ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST) < 0) FAIL_STACK_ERROR
 
         /* Create the file to operate on */
         if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
diff --git a/test/stab.c b/test/stab.c
index 732ac5b..2b9a84d 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -1128,8 +1128,8 @@ main(void)
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
         /* Loop over using new group format */
         for(new_format = FALSE; new_format <= TRUE; new_format++) {
diff --git a/test/tattr.c b/test/tattr.c
index a6ea79e..d448397 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -2769,7 +2769,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
     unsigned    max_compact;    /* Maximum # of attributes to store compactly */
     unsigned    min_dense;      /* Minimum # of attributes to store "densely" */
     unsigned    nshared_indices;        /* # of shared message indices */
-    hbool_t     latest_format;  /* Whether we're using the latest version of the format or not */
+    H5F_libver_t low, high;     /* File format bounds */
     htri_t	is_empty;	/* Are there any attributes? */
     htri_t	is_dense;	/* Are attributes stored densely? */
     unsigned    u;              /* Local index variable */
@@ -2817,9 +2817,9 @@ test_attr_big(hid_t fcpl, hid_t fapl)
     ret = H5Pget_shared_mesg_nindexes(fcpl, &nshared_indices);
     CHECK(ret, FAIL, "H5Pget_shared_mesg_nindexes");
 
-    /* Retrieve the "use the latest version of the format" flag for creating objects in the file */
-    ret = H5Pget_latest_format(fapl, &latest_format);
-    CHECK(ret, FAIL, "H5Pget_latest_format");
+    /* Retrieve the format bounds for creating objects in the file */
+    ret = H5Pget_libver_bounds(fapl, &low, &high);
+    CHECK(ret, FAIL, "H5Pget_libver_bounds");
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid, DSET1_NAME, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
@@ -2881,7 +2881,7 @@ test_attr_big(hid_t fcpl, hid_t fapl)
     u = 2;
     sprintf(attrname, "attr %02u", u);
     attr = H5Acreate2(dataset, attrname, H5T_NATIVE_UINT, big_sid, H5P_DEFAULT, H5P_DEFAULT);
-    if(latest_format) {
+    if(low == H5F_LIBVER_LATEST) {
         CHECK(attr, FAIL, "H5Acreate2");
 
         /* Close attribute */
@@ -7274,7 +7274,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
             /* Make attributes > 500 bytes shared */
             ret = H5Pset_shared_mesg_nindexes(my_fcpl, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end if */
         else {
@@ -7284,13 +7284,13 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
             /* Make attributes > 500 bytes shared */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
 
             /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_MESG_DTYPE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_SHMESG_DTYPE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_MESG_SDSPACE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_SHMESG_SDSPACE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end else */
 
@@ -7600,7 +7600,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
             /* Make attributes > 500 bytes shared */
             ret = H5Pset_shared_mesg_nindexes(my_fcpl, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end if */
         else {
@@ -7610,13 +7610,13 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
             /* Make attributes > 500 bytes shared */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
 
             /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_MESG_DTYPE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_SHMESG_DTYPE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_MESG_SDSPACE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_SHMESG_SDSPACE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end else */
 
@@ -8041,7 +8041,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
             /* Make attributes > 500 bytes shared */
             ret = H5Pset_shared_mesg_nindexes(my_fcpl, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end if */
         else {
@@ -8051,13 +8051,13 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
             /* Make attributes > 500 bytes shared */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
 
             /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_MESG_DTYPE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_SHMESG_DTYPE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_MESG_SDSPACE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_SHMESG_SDSPACE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end else */
 
@@ -8405,7 +8405,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
             /* Make attributes > 500 bytes shared */
             ret = H5Pset_shared_mesg_nindexes(my_fcpl, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end if */
         else {
@@ -8415,13 +8415,13 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
             CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
             /* Make attributes > 500 bytes shared */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)500);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)500);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
 
             /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_MESG_DTYPE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)1, H5O_SHMESG_DTYPE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
-            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_MESG_SDSPACE_FLAG, (unsigned)1);
+            ret = H5Pset_shared_mesg_index(my_fcpl, (unsigned)2, H5O_SHMESG_SDSPACE_FLAG, (unsigned)1);
             CHECK_I(ret, "H5Pset_shared_mesg_index");
         } /* end else */
 
@@ -8864,9 +8864,9 @@ test_attr(void)
     fapl2 = H5Pcopy(fapl);
     CHECK(fapl2, FAIL, "H5Pcopy");
 
-    /* Set the "use the latest version of the format" flag for creating objects in the file */
-    ret = H5Pset_latest_format(fapl2, TRUE);
-    CHECK(ret, FAIL, "H5Pset_latest_format");
+    /* Set the "use the latest version of the format" bounds for creating objects in the file */
+    ret = H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+    CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
     /* Create a default file creation property list */
     fcpl = H5Pcreate(H5P_FILE_CREATE);
@@ -8879,7 +8879,7 @@ test_attr(void)
     /* Make attributes > 1 byte shared (i.e. all of them :-) */
     ret = H5Pset_shared_mesg_nindexes(fcpl2, (unsigned)1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl2, (unsigned)0, H5O_MESG_ATTR_FLAG, (unsigned)1);
+    ret = H5Pset_shared_mesg_index(fcpl2, (unsigned)0, H5O_SHMESG_ATTR_FLAG, (unsigned)1);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Loop over using new group format */
diff --git a/test/tbad_msg_count.h5 b/test/tbad_msg_count.h5
new file mode 100644
index 0000000..ca5eb65
Binary files /dev/null and b/test/tbad_msg_count.h5 differ
diff --git a/test/tcoords.c b/test/tcoords.c
new file mode 100644
index 0000000..ab921d8
--- /dev/null
+++ b/test/tcoords.c
@@ -0,0 +1,507 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/***********************************************************
+*
+* Test program:	 tcoords
+*
+* Test the element coordinates for dataspace selection.  For
+* chunked dataset, when the hyperslab selection of some 
+* dimensions is full, the library optimize it by "flattenning"
+* the fully selected dimensions.  This program tests if the
+* coordinates of selected elements are correctly calculated.
+*
+*************************************************************/
+
+#include "testhdf5.h"
+
+#define FILENAME   "coord.h5"
+
+/***********************************************************
+**
+** test_single_end(): Test full hyperslab selection of only 
+** one block.
+** 
+*************************************************************/
+static void test_single_end(hid_t file)
+{
+    hid_t sid, plid, did, msid;
+    herr_t ret;                 /* Generic error return */
+    int i, j, k;
+    hsize_t da_dims[4] = { 2, 3, 6, 2 };
+    hsize_t da_chunksize[4] = { 1, 3, 3, 2 };
+    int da_buffer[2][3][6][2];
+
+    /* For testing the full selection in the fastest-growing end */
+    int mem1_buffer[1][1][6][2];
+    hsize_t mem1_dims[4] = { 1, 1, 6, 2 };
+    hsize_t da_elmts1[12][4] = { {0, 0, 0, 0},
+                                 {0, 0, 0, 1},
+                                 {0, 0, 1, 0},
+                                 {0, 0, 1, 1},
+                                 {0, 0, 2, 0},
+                                 {0, 0, 2, 1},
+                                 {0, 0, 3, 0},
+                                 {0, 0, 3, 1},
+                                 {0, 0, 4, 0},
+                                 {0, 0, 4, 1},
+                                 {0, 0, 5, 0},
+                                 {0, 0, 5, 1} };
+
+    /* For testing the full selection in the slowest-growing end */
+    int mem2_buffer[2][3][1][1];
+    hsize_t mem2_dims[4] = { 2, 3, 1, 1 };
+    hsize_t da_elmts2[6][4] = { {0, 0, 0, 0},
+                                {0, 1, 0, 0},
+                                {0, 2, 0, 0},
+                                {1, 0, 0, 0},
+                                {1, 1, 0, 0},
+                                {1, 2, 0, 0} };
+
+    /* For testing the full selection in the middle dimensions */
+    int mem3_buffer[1][3][6][1];
+    hsize_t mem3_dims[4] = { 1, 3, 6, 1 };
+    hsize_t mem3_start[4] = { 0, 0, 0, 0 };
+    hsize_t mem3_count[4] = { 1, 1, 1, 1 };
+    hsize_t mem3_stride[4] = { 1, 1, 1, 1 };
+    hsize_t mem3_block[4] = { 1, 3, 6, 1 };
+
+    /* Create and write the dataset */
+    sid = H5Screate_simple(4, da_dims, da_dims);
+    CHECK(sid, FAIL, "H5Screate_simple");
+
+    plid = H5Pcreate(H5P_DATASET_CREATE);
+    CHECK(plid, FAIL, "H5Pcreate");
+
+    ret = H5Pset_chunk(plid, 4, da_chunksize);
+    CHECK(ret, FAIL, "H5Pset_chunk");
+
+    did = H5Dcreate2(file, "single_end", H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dcreate2");
+
+    for(i=0; i<2; i++) {
+        for(j=0; j<3; j++) {
+            for(k=0; k<6; k++) {
+                da_buffer[i][j][k][0] = i*100 + j*10 + k;
+                da_buffer[i][j][k][0] = i*100 + j*10 + k + 1;
+            }
+        }
+    }
+
+    ret = H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, da_buffer);
+    CHECK(ret, FAIL, "H5Dwrite");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+  
+    /* ****** Case 1: ******
+     * Testing the full selection in the fastest-growing end */
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_elements(sid, H5S_SELECT_SET, 12, da_elmts1);
+    CHECK(ret, FAIL, "H5Sselect_elements");
+
+    msid = H5Screate_simple(4, mem1_dims, mem1_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem1_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<6; i++)
+        for(j=0; j<2; j++)
+            if(da_buffer[0][0][i][j] != mem1_buffer[0][0][i][j]) {
+                TestErrPrintf("Read different values than written at index 0,0,%d,%d\n", i, j);
+            }
+
+    /* ****** Case 2: ******
+     * Testing the full selection in the slowest-growing end */
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_elements(sid, H5S_SELECT_SET, 6, da_elmts2);
+    CHECK(ret, FAIL, "H5Sselect_elements");
+
+    msid = H5Screate_simple(4, mem2_dims, mem2_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem2_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<2; i++)
+        for(j=0; j<3; j++)
+            if(da_buffer[i][j][0][0] != mem2_buffer[i][j][0][0]) {
+                TestErrPrintf("Read different values than written at index %d,%d,0,0\n", i, j);
+            }
+
+    /* ****** Case 3: ******
+     * Testing the full selection in the middle dimensions */
+    did = H5Dopen2(file, "single_end", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem3_start, mem3_stride, mem3_count, mem3_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(4, mem3_dims, mem3_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem3_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<3; i++)
+        for(j=0; j<6; j++)
+            if(da_buffer[0][i][j][0] != mem3_buffer[0][i][j][0]) {
+                TestErrPrintf("Read different values than written at index 0,%d,%d,0\n", i, j);
+            }
+
+
+    ret = H5Sclose(sid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    ret = H5Pclose(plid);
+    CHECK(ret, FAIL, "H5Pclose");
+}
+
+
+/***********************************************************
+**
+** test_multiple_end(): Test full hyperslab selection of 
+** multiple blocks.
+** 
+*************************************************************/
+static void test_multiple_ends(hid_t file)
+{
+    hid_t sid, plid, did, msid;
+    herr_t ret;                 /* Generic error return */
+    int i, j, k, l, m, n, p;
+    hsize_t da_dims[8] = { 4, 5, 3, 4, 2, 3, 6, 2 };
+    hsize_t da_chunksize[8] = { 1, 5, 3, 2, 2, 3, 3, 2 };
+    int da_buffer[4][5][3][4][2][3][6][2];
+
+    /* For testing the full selections in the fastest-growing end and in the middle dimensions */
+    int mem1_buffer[1][1][1][4][2][1][6][2];
+    hsize_t mem1_dims[8] = { 1, 1, 1, 4, 2, 1, 6, 2 };
+    hsize_t mem1_start[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    hsize_t mem1_count[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem1_stride[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem1_block[8] = { 1, 1, 1, 4, 2, 1, 6, 2 };
+
+    /* For testing the full selections in the slowest-growing end and in the middle dimensions */
+    int mem2_buffer[4][5][1][4][2][1][1][1];
+    hsize_t mem2_dims[8] = { 4, 5, 1, 4, 2, 1, 1, 1 };
+    hsize_t mem2_start[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    hsize_t mem2_count[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem2_stride[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem2_block[8] = { 4, 5, 1, 4, 2, 1, 1, 1 };
+
+    /* For testing two unadjacent full selections in the middle dimensions */
+    int mem3_buffer[1][5][3][1][1][3][6][1];
+    hsize_t mem3_dims[8] = { 1, 5, 3, 1, 1, 3, 6, 1 };
+    hsize_t mem3_start[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    hsize_t mem3_count[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem3_stride[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem3_block[8] = { 1, 5, 3, 1, 1, 3, 6, 1 };
+
+    /* For testing the full selections in the fastest-growing end and the slowest-growing end */
+    int mem4_buffer[4][5][1][1][1][1][6][2];
+    hsize_t mem4_dims[8] = { 4, 5, 1, 1, 1, 1, 6, 2 };
+    hsize_t mem4_start[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    hsize_t mem4_count[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem4_stride[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem4_block[8] = { 4, 5, 1, 1, 1, 1, 6, 2 };
+
+    /* For testing the full selections in the fastest-growing end and slowest-growing end,
+     * also in the middle dimensions */
+    int mem5_buffer[4][5][1][4][2][1][6][2];
+    hsize_t mem5_dims[8] = { 4, 5, 1, 4, 2, 1, 6, 2 };
+    hsize_t mem5_start[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    hsize_t mem5_count[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem5_stride[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
+    hsize_t mem5_block[8] = { 4, 5, 1, 4, 2, 1, 6, 2 };
+
+    /* Create and write the dataset */
+    sid = H5Screate_simple(8, da_dims, da_dims);
+    CHECK(sid, FAIL, "H5Screate_simple");
+
+    plid = H5Pcreate(H5P_DATASET_CREATE);
+    CHECK(plid, FAIL, "H5Pcreate");
+
+    ret = H5Pset_chunk(plid, 8, da_chunksize);
+    CHECK(ret, FAIL, "H5Pset_chunk");
+
+    did = H5Dcreate2(file, "multiple_ends", H5T_NATIVE_INT, sid, H5P_DEFAULT, plid, H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dcreate2");
+
+    for(i=0; i<4; i++)
+        for(j=0; j<5; j++)
+            for(k=0; k<3; k++)
+                for(l=0; l<4; l++)
+                    for(m=0; m<2; m++)
+                        for(n=0; n<3; n++)
+                            for(p=0; p<6; p++) {                
+                                da_buffer[i][j][k][l][m][n][p][0] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p;
+                                da_buffer[i][j][k][l][m][n][p][1] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p + 1;
+                            }
+
+    ret = H5Dwrite(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, da_buffer);
+    CHECK(ret, FAIL, "H5Dwrite");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    /* ****** Case 1: ******
+     * Testing the full selections in the fastest-growing end and in the middle dimensions*/
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem1_start, mem1_stride, mem1_count, mem1_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(8, mem1_dims, mem1_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem1_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<4; i++)
+        for(j=0; j<2; j++)
+            for(k=0; k<6; k++)
+                for(l=0; l<2; l++)
+                    if(da_buffer[0][0][0][i][j][0][k][l] != mem1_buffer[0][0][0][i][j][0][k][l]) {
+                        TestErrPrintf("Read different values than written at index 0,0,0,%d,%d,0,%d,%d\n", i, j, k, l);
+                    }
+
+    /* ****** Case 2: ******
+     * Testing the full selections in the slowest-growing end and in the middle dimensions*/
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem2_start, mem2_stride, mem2_count, mem2_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(8, mem2_dims, mem2_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem2_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<4; i++)
+        for(j=0; j<5; j++)
+            for(k=0; k<4; k++)
+                for(l=0; l<2; l++)
+                    if(da_buffer[i][j][0][k][l][0][0][0] != mem2_buffer[i][j][0][k][l][0][0][0]) {
+                        TestErrPrintf("Read different values than written at index %d,%d,0,%d,%d,0,0,0\n", i, j, k, l);
+                    }
+
+    /* ****** Case 3: ******
+     * Testing two unadjacent full selections in the middle dimensions */
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem3_start, mem3_stride, mem3_count, mem3_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(8, mem3_dims, mem3_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem3_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<5; i++)
+        for(j=0; j<3; j++)
+            for(k=0; k<3; k++)
+                for(l=0; l<6; l++)
+                    if(da_buffer[0][i][j][0][0][k][l][0] != mem3_buffer[0][i][j][0][0][k][l][0]) {
+                        TestErrPrintf("Read different values than written at index 0,%d,%d,0,0,%d,%d,0\n", i, j, k, l);
+                    }
+
+    /* ****** Case 4: ******
+     * Testing the full selections in the fastest-growing end and the slowest-growing end */
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem4_start, mem4_stride, mem4_count, mem4_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(8, mem4_dims, mem4_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem4_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<4; i++)
+        for(j=0; j<5; j++)
+            for(k=0; k<6; k++)
+                for(l=0; l<2; l++)
+                    if(da_buffer[i][j][0][0][0][0][k][l] != mem4_buffer[i][j][0][0][0][0][k][l]) {
+                        TestErrPrintf("Read different values than written at index %d,%d,0,0,0,0,%d,%d\n", i, j, k, l);
+                    }
+
+
+    /* ****** Case 5: ******
+     * Testing the full selections in the fastest-growing end and the slowest-growing end, 
+     * and also in the middle dimensions */
+    did = H5Dopen2(file, "multiple_ends", H5P_DEFAULT);
+    CHECK(did, FAIL, "H5Dopen");
+
+    /* Select the elements in the dataset */
+    ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, mem5_start, mem5_stride, mem5_count, mem5_block);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    msid = H5Screate_simple(8, mem5_dims, mem5_dims);
+    CHECK(msid, FAIL, "H5Screate_simple");
+
+    ret = H5Sselect_all(msid);
+    CHECK(ret, FAIL, "H5Sselect_all");
+
+    ret = H5Dread(did, H5T_NATIVE_INT, msid, sid, H5P_DEFAULT, mem5_buffer);
+    CHECK(ret, FAIL, "H5Dread");
+
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    ret = H5Sclose(msid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    for(i=0; i<4; i++)
+        for(j=0; j<5; j++)
+            for(k=0; k<4; k++)
+                for(l=0; l<2; l++)
+                    for(m=0; m<6; m++)
+                        for(n=0; n<2; n++)
+                            if(da_buffer[i][j][0][k][l][0][m][n] != mem5_buffer[i][j][0][k][l][0][m][n]) {
+                                TestErrPrintf("Read different values than written at index %d,%d,0,%d,%d,0,%d,%d\n", i, j, k, l, m, n);
+                            }
+
+
+    ret = H5Sclose(sid);
+    CHECK(ret, FAIL, "H5Sclose");
+
+    ret = H5Pclose(plid);
+    CHECK(ret, FAIL, "H5Pclose");
+}
+
+
+/****************************************************************
+**
+**  test_coords(): Main testing routine.
+**
+****************************************************************/
+void test_coords(void)
+{
+    hid_t fid;
+    herr_t ret;                 /* Generic error return */
+
+    fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK(fid, FAIL, "H5Fcreate");
+
+    test_single_end(fid);
+    test_multiple_ends(fid);
+
+    ret = H5Fclose(fid);
+    CHECK(ret, FAIL, "H5Fclose");
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	cleanup_coords
+ *
+ * Purpose:	Cleanup temporary test files
+ *
+ * Return:	none
+ *
+ * Programmer:	Raymond Lu
+ *              20 Dec. 2007
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+void
+cleanup_coords(void)
+{
+    remove(FILENAME);
+}
diff --git a/test/testhdf5.c b/test/testhdf5.c
index d98407d..866be42 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -55,6 +55,7 @@ main(int argc, char *argv[])
     AddTest("file", test_file, cleanup_file, "Low-Level File I/O", NULL);
     AddTest("objects", test_h5o, cleanup_h5o, "Generic Object Functions", NULL);
     AddTest("h5s",  test_h5s,  cleanup_h5s,  "Dataspaces", NULL);
+    AddTest("coords",  test_coords,  cleanup_coords,  "Dataspace coordinates", NULL);
     AddTest("sohm", test_sohm, cleanup_sohm,  "Shared Object Header Messages", NULL);
     AddTest("attr", test_attr, cleanup_attr,  "Attributes", NULL);
     AddTest("select", test_select, cleanup_select,  "Selections", NULL);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 45ad476..ed8b049 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -133,6 +133,7 @@ void                    test_file(void);
 void                    test_h5o(void);
 void                    test_h5t(void);
 void                    test_h5s(void);
+void                    test_coords(void);
 void                    test_h5d(void);
 void                    test_attr(void);
 void                    test_select(void);
@@ -156,6 +157,7 @@ void                    cleanup_checksum(void);
 void                    cleanup_file(void);
 void                    cleanup_h5o(void);
 void                    cleanup_h5s(void);
+void                    cleanup_coords(void);
 void                    cleanup_attr(void);
 void                    cleanup_select(void);
 void                    cleanup_time(void);
diff --git a/test/th5o.c b/test/th5o.c
index d913e47..e6071e9 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -581,9 +581,9 @@ test_h5o_plist(void)
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     CHECK(fapl, FAIL, "H5Pcreate");
 
-    /* Set the "use the latest version of the format" flag for creating objects in the file */
-    ret = H5Pset_latest_format(fapl, TRUE);
-    CHECK(ret, FAIL, "H5Pset_latest_format");
+    /* Set the "use the latest version of the format" bounds for creating objects in the file */
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+    CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
     /* Create a new HDF5 file */
     fid = H5Fcreate(TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
@@ -796,13 +796,13 @@ test_h5o_link(void)
     /* Loop over using new group format */
     for(new_format = FALSE; new_format <= TRUE; new_format++) {
 
-        /* Make a FAPL that uses the "use the latest version of the format" flag */
+        /* Make a FAPL that uses the "use the latest version of the format" bounds */
         fapl_id = H5Pcreate(H5P_FILE_ACCESS);
         CHECK(fapl_id, FAIL, "H5Pcreate");
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        ret = H5Pset_latest_format(fapl_id, new_format);
-        CHECK(ret, FAIL, "H5Pset_latest_format");
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        ret = H5Pset_libver_bounds(fapl_id, (new_format ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST);
+        CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
         /* Create a new HDF5 file */
         file_id = H5Fcreate(TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
diff --git a/test/th5s.c b/test/th5s.c
index 6808679..983838e 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -378,7 +378,7 @@ test_h5s_null(void)
         hsize_t	coord[1][1]; /* Coordinates for point selection */
 
         coord[0][0]=0;
-	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t **)coord);
+	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, coord);
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Sselect_elements");
 
diff --git a/test/titerate.c b/test/titerate.c
index 8df1563..d41df84 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -934,9 +934,9 @@ test_iterate(void)
     fapl2 = H5Pcopy(fapl);
     CHECK(fapl2, FAIL, "H5Pcopy");
 
-    /* Set the "use the latest version of the format" flag for creating objects in the file */
-    ret = H5Pset_latest_format(fapl2, TRUE);
-    CHECK(ret, FAIL, "H5Pset_latest_format");
+    /* Set the "use the latest version of the format" bounds for creating objects in the file */
+    ret = H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+    CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
     /* These next tests use the same file */
     for(new_format = FALSE; new_format <= TRUE; new_format++) {
diff --git a/test/tmisc.c b/test/tmisc.c
index df950ea..7543ceb 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -295,6 +295,11 @@ unsigned m13_rdata[MISC13_DIM1][MISC13_DIM2];          /* Data read from dataset
 /* Definitions for misc. test #26 */
 #define MISC26_FILE             "dcpl_file"
 
+/* Definitions for misc. test #27 */
+/* (Note that this test file is generated by the "gen_bad_ohdr.c" code) */
+#define MISC27_FILE             "tbad_msg_count.h5"
+#define MISC27_GROUP            "Group"
+
 /****************************************************************
 **
 **  test_misc1(): test unlinking a dataset from a group and immediately
@@ -1709,7 +1714,7 @@ test_misc10(void)
     hid_t       dcpl;           /* Dataset creation property list */
     hid_t       space, type;    /* Old dataset's dataspace & datatype */
     char testfile[512]="";          /* Character buffer for corrected test file name */
-    char *srcdir = getenv("srcdir");    /* Pointer to the directory the source code is located within */
+    char *srcdir = HDgetenv("srcdir");    /* Pointer to the directory the source code is located within */
     herr_t      ret;
 
     /* Output message about test being performed */
@@ -4601,8 +4606,8 @@ test_misc25c(void)
     /* Compose file access property list */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     CHECK(fapl, FAIL, "H5Pcreate");
-    ret = H5Pset_latest_format(fapl, 1);
-    CHECK(ret, FAIL, "H5Pset_latest_format");
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
+    CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
     /* Create the file */
     fid = H5Fcreate(MISC25C_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
@@ -4796,6 +4801,59 @@ test_misc26(void)
     CHECK_I(ret, "H5Pclose");
 }
 
+
+/****************************************************************
+**
+**  test_misc27(): Ensure that objects with incorrect # of object
+**                      header messages are handled appropriately.
+**
+** (Note that this test file is generated by the "gen_bad_ohdr.c" code)
+**
+****************************************************************/
+static void
+test_misc27(void)
+{
+    hid_t fid;          /* File ID */
+    hid_t gid;          /* Group ID */
+    char testfile[512]="";          /* Character buffer for corrected test file name */
+    char *srcdir = HDgetenv("srcdir");    /* Pointer to the directory the source code is located within */
+    herr_t ret;         /* Generic return value */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Corrupt object header handling\n"));
+
+    /* Generate the correct name for the test file, by prepending the source path */
+    if(srcdir && ((HDstrlen(srcdir) + HDstrlen(MISC27_FILE) + 1) < sizeof(testfile))) {
+        HDstrcpy(testfile, srcdir);
+        HDstrcat(testfile, "/");
+    }
+    HDstrcat(testfile, MISC27_FILE);
+
+    /* Open the file */
+    fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT);
+    CHECK(fid, FAIL, "H5Fopen");
+
+#ifdef H5_STRICT_FORMAT_CHECKS
+    /* Open group with incorrect # of object header messages (should fail) */
+    H5E_BEGIN_TRY {
+        gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
+    } H5E_END_TRY;
+    VERIFY(gid, FAIL, "H5Gopen2");
+#else /* H5_STRICT_FORMAT_CHECKS */
+    /* Open group with incorrect # of object header messages */
+    gid = H5Gopen2(fid, MISC27_GROUP, H5P_DEFAULT);
+    CHECK(gid, FAIL, "H5Gopen2");
+
+    /* Close group */
+    ret = H5Gclose(gid);
+    CHECK(ret, FAIL, "H5Gclose");
+#endif /* H5_STRICT_FORMAT_CHECKS */
+
+    /* Close file */
+    ret = H5Fclose(fid);
+    CHECK(ret, FAIL, "H5Fclose");
+} /* end test_misc27() */
+
 /****************************************************************
 **
 **  test_misc(): Main misc. test routine.
@@ -4837,6 +4895,7 @@ test_misc(void)
     test_misc25b();     /* Exercise null object header message merge bug on existing file */
     test_misc25c();     /* Exercise another null object header message merge bug */
     test_misc26();      /* Test closing property lists with long filter pipelines */
+    test_misc27();      /* Test opening file with object that has bad # of object header messages */
 
 
 } /* test_misc() */
diff --git a/test/trefer.c b/test/trefer.c
index 70ad2e7..f8e2287 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -407,7 +407,7 @@ test_reference_region(void)
     coord1[7][0] = 9; coord1[7][1] = 0;
     coord1[8][0] = 7; coord1[8][1] = 1;
     coord1[9][0] = 3; coord1[9][1] = 3;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     ret = (int)H5Sget_select_npoints(sid2);
@@ -679,7 +679,7 @@ test_reference_region_1D(void)
     coord1[7][0] = 89;
     coord1[8][0] = 97;
     coord1[9][0] = 03;
-    ret = H5Sselect_elements(sid3, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid3, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     ret = (int)H5Sget_select_npoints(sid3);
@@ -1264,7 +1264,7 @@ test_reference_compat(void)
     coord1[7][0] = 9; coord1[7][1] = 0;
     coord1[8][0] = 7; coord1[8][1] = 1;
     coord1[9][0] = 3; coord1[9][1] = 3;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Create second dataset region */
diff --git a/test/tselect.c b/test/tselect.c
index 3f18eb9..23afc46 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -447,7 +447,7 @@ test_select_point(hid_t xfer_plist)
     coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4;
     coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6;
     coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -472,7 +472,7 @@ test_select_point(hid_t xfer_plist)
     coord1[7][0]=1; coord1[7][1]=14; coord1[7][2]= 6;
     coord1[8][0]=2; coord1[8][1]= 2; coord1[8][2]= 5;
     coord1[9][0]=0; coord1[9][1]= 6; coord1[9][2]=13;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_APPEND, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_APPEND, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -497,7 +497,7 @@ test_select_point(hid_t xfer_plist)
     coord2[7][0]=29; coord2[7][1]= 4;
     coord2[8][0]= 8; coord2[8][1]= 8;
     coord2[9][0]=19; coord2[9][1]=17;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord2);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -526,7 +526,7 @@ test_select_point(hid_t xfer_plist)
     coord2[7][0]=12; coord2[7][1]= 2;
     coord2[8][0]=21; coord2[8][1]=12;
     coord2[9][0]= 9; coord2[9][1]=18;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_PREPEND, (size_t)POINT1_NPOINTS, (const hsize_t **)coord2);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_PREPEND, (size_t)POINT1_NPOINTS, coord2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -568,7 +568,7 @@ test_select_point(hid_t xfer_plist)
     coord3[7][0]= 1; coord3[7][1]=22;
     coord3[8][0]=12; coord3[8][1]=21;
     coord3[9][0]=11; coord3[9][1]= 6;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord3);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord3);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -592,7 +592,7 @@ test_select_point(hid_t xfer_plist)
     coord3[7][0]= 9; coord3[7][1]=16;
     coord3[8][0]=12; coord3[8][1]=22;
     coord3[9][0]=13; coord3[9][1]= 9;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_APPEND, (size_t)POINT1_NPOINTS, (const hsize_t **)coord3);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_APPEND, (size_t)POINT1_NPOINTS, coord3);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Verify correct elements selected */
@@ -945,7 +945,7 @@ test_select_combo(void)
     coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4;
     coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6;
     coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Select 1x10 hyperslab for writing memory dataset */
@@ -1780,7 +1780,7 @@ test_select_point_copy(void)
     coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4;
     coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6;
     coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Select sequence of ten points for write dataset */
@@ -1794,7 +1794,7 @@ test_select_point_copy(void)
     coord2[7][0]=29; coord2[7][1]= 4;
     coord2[8][0]= 8; coord2[8][1]= 8;
     coord2[9][0]=19; coord2[9][1]=17;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord2);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Make a copy of the dataspace to write */
@@ -1838,7 +1838,7 @@ test_select_point_copy(void)
     coord3[7][0]= 1; coord3[7][1]=22;
     coord3[8][0]=12; coord3[8][1]=21;
     coord3[9][0]=11; coord3[9][1]= 6;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord3);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord3);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Make a copy of the dataspace to read */
@@ -2227,7 +2227,7 @@ test_select_point_offset(void)
     coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4;
     coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6;
     coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Check a valid offset */
@@ -2262,7 +2262,7 @@ test_select_point_offset(void)
     coord2[7][0]=23; coord2[7][1]= 4;
     coord2[8][0]= 8; coord2[8][1]= 8;
     coord2[9][0]=19; coord2[9][1]=17;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord2);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Choose a valid offset for the memory dataspace */
@@ -2298,7 +2298,7 @@ test_select_point_offset(void)
     coord3[7][0]= 1; coord3[7][1]=22;
     coord3[8][0]=12; coord3[8][1]=21;
     coord3[9][0]=11; coord3[9][1]= 6;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord3);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord3);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Read selection from disk */
@@ -4248,7 +4248,7 @@ test_select_point_chunk(void)
     points[6][1]=1;
     points[7][0]=6;    /* In same chunk as point #3, but "earlier" in chunk */
     points[7][1]=6;
-    ret = H5Sselect_elements(pnt1_space, H5S_SELECT_SET, (size_t)SPACE7_NPOINTS, (const hsize_t **)points);
+    ret = H5Sselect_elements(pnt1_space, H5S_SELECT_SET, (size_t)SPACE7_NPOINTS, points);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Create 1st hyperslab selection */
@@ -4284,7 +4284,7 @@ test_select_point_chunk(void)
     points[6][1]=2;
     points[7][0]=7;    /* In same chunk as point #3, but "earlier" in chunk */
     points[7][1]=7;
-    ret = H5Sselect_elements(pnt2_space, H5S_SELECT_SET, (size_t)SPACE7_NPOINTS, (const hsize_t **)points);
+    ret = H5Sselect_elements(pnt2_space, H5S_SELECT_SET, (size_t)SPACE7_NPOINTS, points);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Create 2nd hyperslab selection */
@@ -5038,7 +5038,7 @@ test_select_fill_point(hssize_t *offset)
     CHECK(sid1, FAIL, "H5Screate_simple");
 
     /* Select "point" selection */
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET,num_points,(const hsize_t **)points);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET,num_points,points);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     if(offset!=NULL) {
@@ -5576,7 +5576,7 @@ test_scalar_select(void)
 
     /* Select one element in memory with a point selection */
     coord1[0]=0; coord1[1]= 2;
-    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)1, (const hsize_t **)&coord1);
+    ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)1, &coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Write single point to disk */
@@ -5695,7 +5695,7 @@ test_scalar_select2(void)
     /* Select one element in memory with a point selection */
     coord1[0]=0;
     H5E_BEGIN_TRY {
-    	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t **)&coord1);
+    	ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, &coord1);
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Sselect_elements");
 
@@ -5763,7 +5763,7 @@ test_scalar_select3(void)
 
     /* Select one element in file with a point selection */
     coord1[0] = 0; coord1[1] = 2;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)1, (const hsize_t **)&coord1);
+    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)1, &coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Write single point to disk */
@@ -5924,7 +5924,7 @@ test_shape_same(void)
 
     /* Select sequence of ten points for multiple point selection */
     coord1[0][0] = 2; coord1[0][1] = 2;
-    ret = H5Sselect_elements(single_pt_sid, H5S_SELECT_SET, (size_t)1, (const hsize_t **)coord1);
+    ret = H5Sselect_elements(single_pt_sid, H5S_SELECT_SET, (size_t)1, coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Create dataspace for multiple point selection */
@@ -5942,7 +5942,7 @@ test_shape_same(void)
     coord2[7][0]=1; coord2[7][1]=0;
     coord2[8][0]=5; coord2[8][1]=1;
     coord2[9][0]=9; coord2[9][1]=3;
-    ret = H5Sselect_elements(mult_pt_sid, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord2);
+    ret = H5Sselect_elements(mult_pt_sid, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, coord2);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
     /* Create dataspace for single hyperslab selection */
@@ -6343,7 +6343,7 @@ test_shape_same(void)
                 for(v=1; v<(SPACE9_DIM2-1); v++) {
                     coord2[v-1][0]=u; coord2[v-1][1]=v;
                 } /* end for */
-                ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,(SPACE9_DIM2-2),(const hsize_t **)coord2);
+                ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,(SPACE9_DIM2-2),coord2);
                 CHECK(ret, FAIL, "H5Sselect_elements");
             } /* end for */
 
@@ -6457,7 +6457,7 @@ test_shape_same(void)
                 for(v=0; vi,sorted_data[u].i,"H5SL_next");
+        VERIFY(found_item->i, hashed_data[u].i, "H5SL_next");
         u++;
         node=H5SL_next(node);
     } /* end while */
diff --git a/test/tsohm.c b/test/tsohm.c
index c985493..abdbe77 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -33,10 +33,10 @@ const unsigned def_minsizes[H5O_SHMESG_MAX_NINDEXES] = {250,250,250,250,250,250}
 /* Non-default SOHM values for testing */
 #define TEST_NUM_INDEXES 4
 const unsigned test_type_flags[H5O_SHMESG_MAX_NINDEXES] =
-                {H5O_MESG_FILL_FLAG,
-                 H5O_MESG_DTYPE_FLAG | H5O_MESG_ATTR_FLAG,
-                 H5O_MESG_SDSPACE_FLAG,
-                 H5O_MESG_PLINE_FLAG,
+                {H5O_SHMESG_FILL_FLAG,
+                 H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_ATTR_FLAG,
+                 H5O_SHMESG_SDSPACE_FLAG,
+                 H5O_SHMESG_PLINE_FLAG,
                  0, 0};
 const unsigned test_minsizes[H5O_SHMESG_MAX_NINDEXES] = {0, 2, 40, 100, 3, 1000};
 #define TEST_L2B 65
@@ -326,20 +326,20 @@ static void test_sohm_fcpl(void)
         VERIFY(ret, -1, "H5Pset_shared_mesg_index");
 
         /* Setting an unknown flag (all flags + 1) should fail */
-        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ALL_FLAG + 1, 15);
+        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ALL_FLAG + 1, 15);
         VERIFY(ret, -1, "H5Pset_shared_mesg_index");
 
         /* Try setting two different indexes to hold fill messages.  They
          * should hold even very small messages for testing, even though we
          * wouldn't really want to share such tiny messages in the real world.
          */
-        ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_FILL_FLAG, 15);
+        ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_FILL_FLAG, 15);
         CHECK_I(ret, "H5Pset_shared_mesg_index");
-        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_FILL_FLAG, 15);
+        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_FILL_FLAG, 15);
         CHECK_I(ret, "H5Pset_shared_mesg_index");
         fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
         VERIFY(fid, -1, "H5Fcreate");
-        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_DTYPE_FLAG | H5O_MESG_FILL_FLAG, 15);
+        ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG, 15);
         CHECK_I(ret, "H5Pset_shared_mesg_index");
         fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
         VERIFY(fid, -1, "H5Fcreate");
@@ -733,7 +733,7 @@ static void test_sohm_size1(void)
     h5_stat_size_t sohm_btree_final_filesize2;
     H5O_info_t  oinfo;
     unsigned    num_indexes = 1;
-    unsigned    index_flags = H5O_MESG_DTYPE_FLAG;
+    unsigned    index_flags = H5O_SHMESG_DTYPE_FLAG;
     unsigned    min_mesg_size = 50;
     unsigned    list_max = 11;
     unsigned    btree_min = 10;
@@ -1097,42 +1097,42 @@ static void test_sohm_attrs(void)
     /* Run tests with only one kind of message to be shared */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ATTR_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ATTR_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     /* Verify */
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
 
     /* Run with any two types shared */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_DTYPE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ATTR_FLAG | H5O_MESG_DTYPE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ATTR_FLAG | H5O_SHMESG_DTYPE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
     
     /* Run test with all three kinds of message shared */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_DTYPE_FLAG | H5O_MESG_ATTR_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_ATTR_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
@@ -1141,19 +1141,19 @@ static void test_sohm_attrs(void)
     /* Try using two indexes */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ATTR_FLAG | H5O_MESG_DTYPE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ATTR_FLAG | H5O_SHMESG_DTYPE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_SDSPACE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_SDSPACE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
 
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ATTR_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
@@ -1162,7 +1162,7 @@ static void test_sohm_attrs(void)
     /* One index for each kind of message */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 3);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_MESG_SDSPACE_FLAG, 2);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_SHMESG_SDSPACE_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
 
     sohm_attr_helper(fcpl_id);
@@ -1980,7 +1980,7 @@ static void test_sohm_size2(int close_reopen)
 
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Set the indexes to use a medium-sized list */
@@ -2028,11 +2028,11 @@ static void test_sohm_size2(int close_reopen)
 
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 3);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_DTYPE_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_FILL_FLAG | H5O_MESG_PLINE_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_FILL_FLAG | H5O_SHMESG_PLINE_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_MESG_ATTR_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_SHMESG_ATTR_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Use lists that are the same size as the "medium" list on the previous
@@ -2057,11 +2057,11 @@ static void test_sohm_size2(int close_reopen)
 
     /* Edit the same property list (this should work) and don't share all messages.
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_PLINE_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_PLINE_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_DTYPE_FLAG | H5O_MESG_FILL_FLAG, 100000);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG, 100000);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_MESG_ATTR_FLAG | H5O_MESG_SDSPACE_FLAG, 20);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 2, H5O_SHMESG_ATTR_FLAG | H5O_SHMESG_SDSPACE_FLAG, 20);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Use "normal-sized" lists. */
@@ -2084,7 +2084,7 @@ static void test_sohm_size2(int close_reopen)
     /* Change the second index to hold only gigantic messages.  Result should
      * be the same as the previous file.
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_DTYPE_FLAG | H5O_MESG_FILL_FLAG, 100000);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG, 100000);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Get the file size & verify its contents */
@@ -2099,7 +2099,7 @@ static void test_sohm_size2(int close_reopen)
      * as one gains from sharing them.
      */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 1);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 1);
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 1000, 900);
 
     /* Get the file size & verify its contents */
@@ -2107,7 +2107,7 @@ static void test_sohm_size2(int close_reopen)
     size2_verify();
 
     /* Create the same file but don't share the really tiny messages */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 100);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 100);
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 1000, 900);
 
     /* Get the file size & verify its contents */
@@ -2786,7 +2786,7 @@ test_sohm_delete(void)
     CHECK_I(fcpl_id, "H5Pcreate");
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
 
@@ -2814,9 +2814,9 @@ test_sohm_delete(void)
     /* Use two indexes */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_DTYPE_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_DTYPE_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Use big list indexes */
@@ -2844,7 +2844,7 @@ test_sohm_delete(void)
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
     for(x=DELETE_MIN_MESG_SIZE; x<=DELETE_MAX_MESG_SIZE; x += 10) {
-        ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, (size_t) x);
+        ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, (size_t) x);
         CHECK_I(ret, "H5Pset_shared_mesg_phase_change");
         delete_helper(fcpl_id, dspace_id, dcpl_id);
     }
@@ -2992,9 +2992,9 @@ test_sohm_delete_revert(void)
     CHECK_I(fcpl_id, "H5Pcreate");
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG, 10);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG, 10);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_SDSPACE_FLAG, 10);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_SDSPACE_FLAG, 10);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Call the helper function to test this FCPL. */
@@ -3011,7 +3011,7 @@ test_sohm_delete_revert(void)
     /* Try sharing all messages */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 10);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 10);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
     ret = H5Pset_shared_mesg_phase_change(fcpl_id, 10, 5);
     CHECK_I(ret, "H5Pset_shared_mesg_phase_change");
@@ -3038,7 +3038,7 @@ test_sohm_delete_revert(void)
     /* Try with shared messages enabled, but when messages are too big
      * to be shared.
      */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 35);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 35);
     CHECK_I(ret, "H5Pset_shared_mesg_phase_change");
     ret = test_sohm_delete_revert_helper(fcpl_id);
     CHECK_I(ret, "test_sohm_delete_revert_helper");
@@ -3138,7 +3138,7 @@ test_sohm_extlink(void)
     CHECK_I(fcpl_id, "H5Pcreate");
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     /* Test using external links when the source or destination file uses
@@ -3686,7 +3686,7 @@ test_sohm_extend_dset(void)
 
 
     /* Only dataspaces */
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     ret = test_sohm_extend_dset_helper(fcpl_id, FALSE);
@@ -3697,7 +3697,7 @@ test_sohm_extend_dset(void)
     /* All messages */
     ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
-    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 16);
+    ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 16);
     CHECK_I(ret, "H5Pset_shared_mesg_index");
 
     ret = test_sohm_extend_dset_helper(fcpl_id, FALSE);
diff --git a/test/unlink.c b/test/unlink.c
index 7ebfc35..868f765 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -2441,8 +2441,8 @@ main(void)
         /* Copy the file access property list */
         if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
 
-        /* Set the "use the latest version of the format" flag for creating objects in the file */
-        if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR
+        /* Set the "use the latest version of the format" bounds for creating objects in the file */
+        if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
         /* Test with old & new format groups */
         for(new_format = FALSE; new_format <= TRUE; new_format++) {
diff --git a/test/vfd.c b/test/vfd.c
index 5598ddd..b5ca096 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -49,7 +49,7 @@ const char *FILENAME[] = {
     NULL
 };
 
-#define COMPAT_BASENAME "family_v1.6_"
+#define COMPAT_BASENAME "family_v16_"
 
 
 /*-------------------------------------------------------------------------
@@ -787,7 +787,7 @@ error:
  *              The source file was created by the test/file_handle.c
  *              of the v1.6 library.  Then tools/misc/h5repart.c was
  *              used to concantenated.  The command was "h5repart -m 5k
- *              family_file%05d.h5 family_v1.6_%05d.h5".
+ *              family_file%05d.h5 family_v16_%05d.h5".
  *
  * Return:      Success:        0
  *              Failure:        -1
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index e812e78..1d2e1a1 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -233,6 +233,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 332118b..5b114be 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -1598,7 +1598,7 @@ void io_mode_confusion(void)
                        mpi_rank, fcn_name);
 
         status = H5Sselect_elements(filespace, H5S_SELECT_SET, N,
-                                   (const hsize_t **)&coord);
+                                   &coord);
         VRFY((status >= 0 ), "H5Sselect_elements() failed");
     } else { /* select nothing */
         if(verbose )
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 674b0af..8ed72c4 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -193,6 +193,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index 9eb5425..f21e156 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -210,6 +210,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index cadb0d0..216b2bb 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -199,8 +199,8 @@ main (int argc, const char *argv[])
  unsigned     flag=0;
  unsigned     verbose=0;
  unsigned     parents=0;
- hid_t        ocpl_id;          /* Object copy property list */
- hid_t        lcpl_id;          /* Link creation property list */
+ hid_t        ocpl_id = (-1);          /* Object copy property list */
+ hid_t        lcpl_id = (-1);          /* Link creation property list */
  char         str_flag[20];
  int          opt;
 
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 79c6ab6..92dbbe3 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -217,6 +217,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 802cc37..357bb32 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -52,175 +52,6 @@ static struct long_options l_opts[] = {
  *
  *-------------------------------------------------------------------------
  */
-#if 0
-#define OLD
-#endif
-
-#if defined (OLD)
-
-void parse_command_line(int argc, 
-                 const char* argv[], 
-                 const char** fname1, 
-                 const char** fname2,
-                 const char** objname1, 
-                 const char** objname2, 
-                 diff_opt_t* options)
-{
- int        i;
- const char *s = NULL;
-
- /* process the command-line */
- memset(options, 0, sizeof (diff_opt_t));
-
-/*-------------------------------------------------------------------------
- * initial check of command line options
- *-------------------------------------------------------------------------
- */
-
- if ( argv[1] && (strcmp("-V",argv[1])==0) )
- {
-     print_version("h5diff");
-     h5diff_exit(EXIT_SUCCESS);
-     
- }
-
- if ( argc==2 && (strcmp("-h",argv[1])==0) )
-  usage();
-
- if ( argc<3 )
- {
-  usage();
- }
-
-/*-------------------------------------------------------------------------
- * file names are first
- *-------------------------------------------------------------------------
- */
- if ( argc>=3 )
- {
-  *fname1 = argv[1];
-  *fname2 = argv[2];
- }
-/*-------------------------------------------------------------------------
- * parse command line options
- *-------------------------------------------------------------------------
- */
- for (i=3; im_verbose = 1;
-     break;
-    case 'q':
-     /* use quiet mode; supress the message "0 differences found" */
-     options->m_quiet = 1;
-     break;
-    case 'r':
-     options->m_report = 1;
-     break;
-    case 'd':
-     /* if it is not another option */
-     if ( id=1;
-      if ( check_p_input(argv[i+1])==-1)
-      {
-       printf("<-d %s> is not a valid option\n", argv[i+1] );
-       usage();
-      }
-      options->delta = atof(argv[i+1]);
-      i++; /* go to next */
-     }
-     else
-     {
-      printf("Not a valid -d option\n");
-      usage();
-     }
-     break;
-    case 'p':
-     if ( ip=1;
-      if ( check_p_input(argv[i+1])==-1)
-      {
-       printf("<-p %s> is not a valid option\n", argv[i+1] );
-       usage();
-      }
-      options->percent = atof(argv[i+1]);
-      i++; /* go to next */
-     }
-     else
-     {
-      printf("Not a valid -p option\n");
-      usage();
-     }
-     break;
-    case 'n':
-     if ( in=1;
-      if ( check_n_input(argv[i+1])==-1)
-      {
-       printf("<-n %s> is not a valid option\n", argv[i+1] );
-       usage();
-      }
-      options->count = atol(argv[i+1]);
-      i++; /* go to next */
-     }
-     else
-     {
-      printf("Not a valid -n option\n");
-      usage();
-     }
-     break;
-    } /*switch*/
-   } /*for*/
-  } /*if*/
-
-  else /* not single-letter switches */
-
-  {
-   /* check if it is not a -d, -p parameter */
-   if ( '-'==argv[i-1][0] && ('d'==argv[i-1][1] ||'p'==argv[i-1][1] ))
-    continue;
-   else
-   {
-    if ( *objname1==NULL )
-     *objname1 = argv[i];
-    if ( *objname2==NULL )
-    {
-     /* check if we have a second object name */
-     if ( i+1m_quiet || options->err_stat)
-  return;
-
- if (options->cmn_objs==0)
- {
-  printf("No common objects found. Files are not comparable.\n");
-  if (!options->m_verbose)
-   printf("Use -v for a list of objects.\n");
- }
-
- if (options->not_cmp==1)
+ void  print_info(diff_opt_t* options)
  {
-  printf("--------------------------------\n");
-  printf("Some objects are not comparable\n");
-  printf("--------------------------------\n");
-  if (!options->m_verbose)
-   printf("Use -v for a list of objects.\n");
+     if (options->m_quiet || options->err_stat)
+         return;
+     
+     if (options->cmn_objs==0)
+     {
+         printf("No common objects found. Files are not comparable.\n");
+         if (!options->m_verbose)
+             printf("Use -v for a list of objects.\n");
+     }
+     
+     if (options->not_cmp==1)
+     {
+         printf("--------------------------------\n");
+         printf("Some objects are not comparable\n");
+         printf("--------------------------------\n");
+         if (!options->m_verbose)
+             printf("Use -v for a list of objects.\n");
+     }
+     
  }
 
-}
-
 /*-------------------------------------------------------------------------
  * Function: check_n_input
  *
@@ -382,22 +210,22 @@ void  print_info(diff_opt_t* options)
  */
 int check_n_input( const char *str )
 {
- unsigned i;
- char c;
-
- for ( i = 0; i < strlen(str); i++)
- {
-  c = str[i];
-  if ( i==0 )
-  {
-   if ( c < 49 || c > 57  ) /* ascii values between 1 and 9 */
-    return -1;
-  }
-  else
-   if ( c < 48 || c > 57  ) /* 0 also */
-    return -1;
- }
- return 1;
+    unsigned i;
+    char c;
+    
+    for ( i = 0; i < strlen(str); i++)
+    {
+        c = str[i];
+        if ( i==0 )
+        {
+            if ( c < 49 || c > 57  ) /* ascii values between 1 and 9 */
+                return -1;
+        }
+        else
+            if ( c < 48 || c > 57  ) /* 0 also */
+                return -1;
+    }
+    return 1;
 }
 
 /*-------------------------------------------------------------------------
@@ -417,20 +245,20 @@ int check_n_input( const char *str )
  */
 int check_p_input( const char *str )
 {
- double x;
-
- /*
- the atof return value on a hexadecimal input is different
- on some systems; we do a character check for this
- */
- if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
-  return -1;
-
- x=atof(str);
- if (x<=0)
-  return -1;
-
- return 1;
+    double x;
+    
+    /*
+    the atof return value on a hexadecimal input is different
+    on some systems; we do a character check for this
+    */
+    if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
+        return -1;
+    
+    x=atof(str);
+    if (x<=0)
+        return -1;
+    
+    return 1;
 }
 
 /*-------------------------------------------------------------------------
@@ -450,20 +278,20 @@ int check_p_input( const char *str )
  */
 int check_d_input( const char *str )
 {
- double x;
-
- /*
- the atof return value on a hexadecimal input is different
- on some systems; we do a character check for this
- */
- if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
-  return -1;
-
- x=atof(str);
- if (x <=0)
-  return -1;
-
- return 1;
+    double x;
+    
+    /*
+    the atof return value on a hexadecimal input is different
+    on some systems; we do a character check for this
+    */
+    if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
+        return -1;
+    
+    x=atof(str);
+    if (x <=0)
+        return -1;
+    
+    return 1;
 }
 
 /*-------------------------------------------------------------------------
@@ -476,68 +304,6 @@ int check_d_input( const char *str )
  *-------------------------------------------------------------------------
  */
 
-#if defined (OLD)
-void usage(void)
-{
- printf("usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] \n");
- printf("\n");
- printf("file1             File name of the first HDF5 file\n");
- printf("file2             File name of the second HDF5 file\n");
- printf("[obj1]            Name of an HDF5 object, in absolute path\n");
- printf("[obj2]            Name of an HDF5 object, in absolute path\n");
- printf("[OPTIONS] are:\n");
- printf("[-h]              Print out this information\n");
- printf("[-V]              Print HDF5 library version number and exit\n");
- printf("[-r]              Report mode. Print differences\n");
- printf("[-v]              Verbose mode. Print differences, list of objects, warnings\n");
- printf("[-q]              Quiet mode. Do not do output\n");
- printf("[-n count]        Print difference up to count number\n");
- printf("[-d delta]        Print difference when it is greater than limit delta\n");
- printf("[-p relative]     Print difference when it is greater than a relative limit\n");
- printf("\n");
- printf("Items in [] are optional\n");
- printf("[obj1] and [obj2] are HDF5 objects (datasets, groups, datatypes or links)\n");
- printf("The 'count' value must be a positive integer\n");
- printf("The 'delta' and 'relative' values must be positive numbers\n");
- printf("The -d compare criteria is |a - b| > delta\n");
- printf("The -p compare criteria is |(b-a)/a| > relative\n");
- printf("\n");
- printf("h5diff has four modes of output:\n");
- printf(" Normal mode: print the number of differences found and where they occured\n");
- printf(" Report mode: print the above plus the differences\n");
- printf(" Verbose mode: print the above plus a list of objects and warnings\n");
- printf(" Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)\n");
- printf("\n");
- printf("Examples of use:\n");
- printf("\n");
- printf("1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
- printf("\n");
- printf("   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
- printf("\n");
- printf("2) h5diff file1 file2 /g1/dset1\n");
- printf("\n");
- printf("   Compares object '/g1/dset1' in both files\n");
- printf("\n");
- printf("3) h5diff file1 file2\n");
- printf("\n");
- printf("   Compares all objects in both files\n");
- printf("\n");
- printf("Note)  file1 and file2 can be the same file. Use\n");
- printf("\n");
- printf("   h5diff file1 file1 /g1/dset1 /g1/dset2\n");
- printf("\n");
- printf("   to compare '/g1/dset1' and '/g1/dset2' in the same file\n");
- printf("\n");
- printf("If no objects are specified, h5diff only compares objects with the same ");
- printf("absolute path in both files. The compare criteria is: ");
- printf("1) datasets: numerical array differences 2) groups: name string difference ");
- printf("3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value\n");
-
-}
-
-
-#else
-
 void usage(void)
 {
  printf("usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] \n");
@@ -610,7 +376,6 @@ void usage(void)
 
 }
 
-#endif
 
 /*-------------------------------------------------------------------------
  * Function: h5diff_exit
@@ -631,14 +396,14 @@ void usage(void)
 void h5diff_exit(int status)
 {
 #ifdef H5_HAVE_PARALLEL
- /* if in parallel mode, dismiss workers, close down MPI, then exit */
- if((g_nTasks > 1) && g_Parallel) {
-  phdiff_dismiss_workers();
-  MPI_Barrier(MPI_COMM_WORLD);
- }
- if(g_Parallel)
-  MPI_Finalize();
+    /* if in parallel mode, dismiss workers, close down MPI, then exit */
+    if((g_nTasks > 1) && g_Parallel) {
+        phdiff_dismiss_workers();
+        MPI_Barrier(MPI_COMM_WORLD);
+    }
+    if(g_Parallel)
+        MPI_Finalize();
 #endif
- exit(status);
+    exit(status);
 }
 
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 51e0a83..735dc0f 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -249,10 +249,12 @@ int test_basic(const char *fname1,
     
      
    /*-------------------------------------------------------------------------
-    * NaNs in floating point
+    * NaNs in H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
     */
     {
+
+#if 1
         float data15[6];
         float data16[6];
 
@@ -272,10 +274,78 @@ int test_basic(const char *fname1,
 
         write_dset(gid1,1,dims1,"fp15",H5T_NATIVE_FLOAT,data15);
         write_dset(gid1,1,dims1,"fp16",H5T_NATIVE_FLOAT,data16);
+#else
+
+#define NU_ELMTS 1000000
+
+        hsize_t i;
+
+        hsize_t dims2[1] = { NU_ELMTS };
+
+        float *data15 = malloc (NU_ELMTS * sizeof(float) );
+        float *data16 = malloc (NU_ELMTS * sizeof(float) );
+
+        data15[0] = (float) sqrt( (double)-1 );
+        data15[1] = 1;
+        data15[2] = (float) sqrt( (double)-1 );
+        data15[3] = 1;
+        data15[4] = 1;
+        data15[5] = 1;
+
+        data16[0] = (float) sqrt( (double)-1 );
+        data16[1] = (float) sqrt( (double)-1 );
+        data16[2] = 1;
+        data16[3] = 1;
+        data16[4] = 1;
+        data16[5] = 1;
+
+        for ( i = 6; i < NU_ELMTS; i++ )
+        {
+            data15[i] = /*data15[0];*/ 2;
+            data16[i] = 1;
+        }
+
+        write_dset(gid1,1,dims2,"fp15",H5T_NATIVE_FLOAT,data15);
+        write_dset(gid1,1,dims2,"fp16",H5T_NATIVE_FLOAT,data16);
 
+        free( data15 );
+        free( data16 );
+#endif
+
+    }
+
+       
         
+   /*-------------------------------------------------------------------------
+    * NaNs in H5T_NATIVE_DOUBLE
+    *-------------------------------------------------------------------------
+    */
+    {
+
+        double data17[6];
+        double data18[6];
+
+        data17[0] = sqrt( (double)-1 );
+        data17[1] = 1;
+        data17[2] = sqrt( (double)-1 );
+        data17[3] = 1;
+        data17[4] = 1;
+        data17[5] = 1;
+
+        data18[0] = (float) sqrt( (double)-1 );
+        data18[1] = (float) sqrt( (double)-1 );
+        data18[2] = 1;
+        data18[3] = 1;
+        data18[4] = 1;
+        data18[5] = 1;
+
+        write_dset(gid1,1,dims1,"fp17",H5T_NATIVE_DOUBLE,data17);
+        write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18);
 
     }
+        
+
+  
     
    /*-------------------------------------------------------------------------
     * close
@@ -2385,7 +2455,7 @@ void gen_datareg(hid_t fid,
   coord[3][0]=2; coord[3][1]=5;
   coord[4][0]=1; coord[4][1]=7;
  }
- H5Sselect_elements(sid1,H5S_SELECT_SET,5,(const hsize_t **)coord);
+ H5Sselect_elements(sid1,H5S_SELECT_SET,5,coord);
  H5Sget_select_npoints(sid1);
 
  /* store second dataset region */
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 4bb4ad9..03f729b 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -215,6 +215,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index c69c5d70..70d889f 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -610,7 +610,7 @@ usage(const char *prog)
     fprintf(stdout, "  OPTIONS\n");
     fprintf(stdout, "     -h, --help           Print a usage message and exit\n");
     fprintf(stdout, "     -n, --contents       Print a list of the file contents and exit\n");
-    fprintf(stdout, "     -B, --bootblock      Print the content of the boot block\n");
+    fprintf(stdout, "     -B, --superblock     Print the content of the super block\n");
     fprintf(stdout, "     -H, --header         Print the header only; no data is displayed\n");
     fprintf(stdout, "     -A, --onlyattr       Print the header and value of attributes\n");
     fprintf(stdout, "     -i, --object-ids     Print the object ids\n");
@@ -620,7 +620,7 @@ usage(const char *prog)
     fprintf(stdout, "     -a P, --attribute=P  Print the specified attribute\n");
     fprintf(stdout, "     -d P, --dataset=P    Print the specified dataset\n");
     fprintf(stdout, "     -y, --noindex        Do not print array indices with the data\n");
-    fprintf(stdout, "     -p,   --properties   Print dataset filters, storage layout and fill value\n");
+    fprintf(stdout, "     -p, --properties     Print dataset filters, storage layout and fill value\n");
     fprintf(stdout, "     -f D, --filedriver=D Specify which driver to open the file with\n");
     fprintf(stdout, "     -g P, --group=P      Print the specified group and all members\n");
     fprintf(stdout, "     -l P, --soft-link=P  Print the value(s) of the specified soft link\n");
@@ -2756,7 +2756,7 @@ static void
 dump_fcpl(hid_t fid)
 {
     hid_t    fcpl;      /* file creation property list ID */
-    hid_t         fapl;      /* file access property list ID */
+    hid_t    fapl;      /* file access property list ID */
     hsize_t  userblock; /* userblock size retrieved from FCPL */
     size_t   off_size;  /* size of offsets in the file */
     size_t   len_size;  /* size of lengths in the file */
@@ -2764,7 +2764,7 @@ dump_fcpl(hid_t fid)
     unsigned freelist;  /* free list version # */
     unsigned stab;      /* symbol table entry version # */
     unsigned shhdr;     /* shared object header version # */
-    hid_t    fdriver;    /* file driver */
+    hid_t    fdriver;   /* file driver */
     char     dname[32]; /* buffer to store driver name */
     unsigned sym_lk;    /* symbol table B-tree leaf 'K' value */
     unsigned sym_ik;    /* symbol table B-tree internal 'K' value */
@@ -2781,7 +2781,7 @@ dump_fcpl(hid_t fid)
     fdriver=H5Pget_driver(fapl);
     H5Pclose(fapl);
 
-    /*-------------------------------------------------------------------------
+   /*-------------------------------------------------------------------------
     * SUPER_BLOCK
     *-------------------------------------------------------------------------
     */
@@ -3181,6 +3181,8 @@ parse_subset_params(char *dset)
  *              Tuesday, 9. January 2001
  *
  * Modifications:
+ *  Pedro Vicente, Tuesday, January 15, 2008
+ *  check for block overlap
  *
  *-------------------------------------------------------------------------
  */
@@ -3253,6 +3255,38 @@ handle_datasets(hid_t fid, char *dset, void *data)
         }
     }
 
+    
+   /*-------------------------------------------------------------------------
+    * check for block overlap
+    *-------------------------------------------------------------------------
+    */
+
+    if(sset) 
+    {
+        hid_t sid = H5Dget_space(dsetid);
+        unsigned int ndims = H5Sget_simple_extent_ndims(sid);
+        unsigned int i;
+        
+        for ( i = 0; i < ndims; i++)
+        {
+            if ( sset->count[i] > 1 )
+            {
+                
+                if ( sset->stride[i] < sset->block[i] )
+                {
+                    error_msg(progname, "wrong subset selection; blocks overlap\n");
+                    d_status = EXIT_FAILURE;
+                    return;
+                    
+                }                                
+                
+            }
+            
+        } 
+        H5Sclose(sid);
+        
+    }
+
     H5Oget_info(dsetid, &oinfo);
     if(oinfo.rc > 1) {
         obj_t  *found_obj;    /* Found object */
@@ -3952,7 +3986,7 @@ main(int argc, const char *argv[])
     /* allocate and initialize internal data structure */
     init_prefix(&prefix, prefix_len);
 
-    /* find all objects that might be targets of a reference */
+    /* Prepare to find objects that might be targets of a reference */
     fill_ref_path_table(fid);
 
     if(doxml) {
@@ -4094,7 +4128,6 @@ done:
     free_table(type_table);
 
     HDfree(prefix);
-    HDfree(info.prefix);
     HDfree(fname);
 
     /* To Do:  clean up XML table */
@@ -5342,8 +5375,7 @@ xml_dump_group(hid_t gid, const char *name)
 
     if(HDstrcmp(name, "/") == 0) {
         isRoot = 1;
-        tmp = HDmalloc(2);
-        HDstrcpy(tmp, "/");
+        tmp = HDstrdup("/");
     } else {
         tmp = HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2);
         HDstrcpy(tmp, prefix);
@@ -5401,8 +5433,8 @@ xml_dump_group(hid_t gid, const char *name)
                 ptrstr = malloc(100);
                 t_objname = xml_escape_the_name(found_obj->objname);
                 par_name = xml_escape_the_name(par);
-                xml_name_to_XID(par,parentxid,100,1);
-                xml_name_to_XID(found_obj->objname,ptrstr,100,1);
+                xml_name_to_XID(found_obj->objname, ptrstr, 100, 1);
+                xml_name_to_XID(par, parentxid, 100, 1);
                 printf("<%sGroupPtr OBJ-XID=\"%s\" H5Path=\"%s\" "
                             "Parents=\"%s\" H5ParentPaths=\"%s\" />\n",
                             xmlnsprefix,
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 516a740..b21a020 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -1812,7 +1812,7 @@ static void gent_datareg(void)
     coord1[7][0]=9; coord1[7][1]=0;
     coord1[8][0]=7; coord1[8][1]=1;
     coord1[9][0]=3; coord1[9][1]=3;
-    H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1);
+    H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord1);
 
     H5Sget_select_npoints(sid2);
 
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 3fc39f2..b7b8429 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -373,11 +373,18 @@ TOOLTEST tstring2.ddl -r -d str4 tstr3.h5
 TOOLTEST tindicesyes.ddl taindices.h5
 TOOLTEST tindicesno.ddl -y taindices.h5
 
-# array indices with subsetting
-TOOLTEST tindicessub1.ddl -d 1d -s 3 -c 40 taindices.h5
-TOOLTEST tindicessub2.ddl -d 2d -s 1,3 -c 6,4 taindices.h5
-TOOLTEST tindicessub3.ddl -d 3d -s 0,1,3 -c 2,6,4 taindices.h5
-TOOLTEST tindicessub4.ddl -d 4d -s 0,0,1,3 -c 2,2,6,4 taindices.h5
+########## array indices with subsetting
+# 1D case
+TOOLTEST tindicessub1.ddl -d 1d -s 1 -S 10 -c 2  -k 3 taindices.h5
+
+# 2D case
+TOOLTEST tindicessub2.ddl -d 2d -s 1,2  -S 3,3 -c 3,2 -k 2,2 taindices.h5
+
+# 3D case
+TOOLTEST tindicessub3.ddl -d 3d -s 0,1,2 -S 1,3,3 -c 2,2,2  -k 1,2,2  taindices.h5
+
+# 4D case
+TOOLTEST tindicessub4.ddl -d 4d -s 0,0,1,2  -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2  taindices.h5
 
 
 # tests for filters
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index aabc6c4..a88cb36 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/Makefile.am
@@ -35,6 +35,6 @@ SCRIPT_DEPEND=h5import$(EXEEXT)
 bin_PROGRAMS=h5import
 
 # All programs depend on the main hdf5 library and the tools library
-LDADD=$(LIBHDF5) $(LIBH5TOOLS)
+LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 159e151..b67f45f 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -70,11 +70,11 @@ PROGRAMS = $(bin_PROGRAMS)
 h5import_SOURCES = h5import.c
 h5import_OBJECTS = h5import.$(OBJEXT)
 h5import_LDADD = $(LDADD)
-h5import_DEPENDENCIES = $(LIBHDF5) $(LIBH5TOOLS)
+h5import_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 h5importtest_SOURCES = h5importtest.c
 h5importtest_OBJECTS = h5importtest.$(OBJEXT)
 h5importtest_LDADD = $(LDADD)
-h5importtest_DEPENDENCIES = $(LIBHDF5) $(LIBH5TOOLS)
+h5importtest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
@@ -210,6 +210,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
@@ -330,7 +331,7 @@ check_SCRIPT = h5importtestutil.sh
 SCRIPT_DEPEND = h5import$(EXEEXT)
 
 # All programs depend on the main hdf5 library and the tools library
-LDADD = $(LIBHDF5) $(LIBH5TOOLS)
+LDADD = $(LIBH5TOOLS) $(LIBHDF5)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 83555b1..500029b 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -221,6 +221,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 605793a..ff0e8d5 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -204,6 +204,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 2c56cb5..80b45d8 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -27,6 +27,15 @@
 #include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
+#include "h5trav.h"
+
+#define NAME_BUF_SIZE   2048
+
+/* Struct to pass through to visitors */
+typedef struct {
+    hid_t fid;                          /* File ID */
+    const char *fname;                  /* Filename */
+}iter_t;
 
 /* Command-line switches */
 static int      verbose_g = 0;            /* lots of extra output */
@@ -43,21 +52,7 @@ static hbool_t  show_errors_g = FALSE;    /* print HDF5 error messages */
 static hbool_t  simple_output_g = FALSE;  /* make output more machine-readable */
 static hbool_t  show_file_name_g = FALSE; /* show file name for full names */
 static hbool_t  no_line_wrap_g = FALSE;   /* show data content without line wrap */
-
-/* Info to pass to the iteration functions */
-typedef struct iter_t {
-    const char *container;  /* full name of the container object */
-} iter_t;
-
-/* Table containing object id and object name */
-static struct {
-    int  nalloc;                /* number of slots allocated */
-    int  nobjs;                 /* number of objects */
-    struct {
-        haddr_t id;             /* object number */
-        char *name;             /* full object name */
-    } *obj;
-} idtab_g;
+static hbool_t  display_root_g = FALSE;   /* show root group in output? */
 
 /* Information about how to display each type of object */
 static struct dispatch_t {
@@ -68,17 +63,13 @@ static struct dispatch_t {
     herr_t (*list2)(hid_t obj, const char *name);
 } dispatch_g[H5O_TYPE_NTYPES];
 
-#define DISPATCH(TYPE, NAME, OPEN, CLOSE, LIST1, LIST2) {         \
+#define DISPATCH(TYPE, NAME, LIST1, LIST2) {         \
     dispatch_g[TYPE].name = (NAME);             \
-    dispatch_g[TYPE].open = (OPEN);             \
-    dispatch_g[TYPE].close = (CLOSE);           \
     dispatch_g[TYPE].list1 = (LIST1);           \
     dispatch_g[TYPE].list2 = (LIST2);           \
 }
 
-static herr_t list(hid_t group, const char *name, const H5L_info_t *linfo, void *cd);
 static void display_type(hid_t type, int ind);
-static char *fix_name(const char *path, const char *base);
 
 const char *progname="h5ls";
 int   d_status;
@@ -131,76 +122,6 @@ usage: %s [OPTIONS] [OBJECTS...]\n\
 
 
 /*-------------------------------------------------------------------------
- * Function: sym_insert
- *
- * Purpose: Add a symbol to the table.
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static void
-sym_insert(const H5O_info_t *oi, const char *name)
-{
-    int  n;
-
-    /* Don't add it if the link count is 1 because such an object can only
-     * have one name. */
-    if(oi->rc < 2)
-        return;
-
-    /* Extend the table */
-    if(idtab_g.nobjs >= idtab_g.nalloc) {
-        idtab_g.nalloc = MAX(256, 2*idtab_g.nalloc);
-        idtab_g.obj = realloc(idtab_g.obj, idtab_g.nalloc*sizeof(idtab_g.obj[0]));
-    } /* end if */
-
-    /* Insert the entry */
-    n = idtab_g.nobjs++;
-    idtab_g.obj[n].id = oi->addr;
-    idtab_g.obj[n].name = HDstrdup(name);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: sym_lookup
- *
- * Purpose: Find another name for the specified object.
- *
- * Return: Success: Ptr to another name.
- *
- *  Failure: NULL
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static char *
-sym_lookup(const H5O_info_t *oi)
-{
-    int  n;
-
-    /*only one name possible*/
-    if(oi->rc < 2)
-        return NULL;
-
-    for(n = 0; n < idtab_g.nobjs; n++)
-        if(idtab_g.obj[n].id == oi->addr)
-            return idtab_g.obj[n].name;
-
-    return NULL;
-}
-
-
-/*-------------------------------------------------------------------------
  * Function: display_string
  *
  * Purpose: Print a string value by escaping unusual characters. If
@@ -278,6 +199,55 @@ display_string(FILE *stream, const char *s, hbool_t escape_spaces)
 
 
 /*-------------------------------------------------------------------------
+ * Function: display_obj_name
+ *
+ * Purpose: Print an object name and another string.
+ *
+ * Return: Success: TRUE
+ *
+ *  Failure: FALSE, nothing printed
+ *
+ * Programmer: Quincey Koziol
+ *              Tuesday, November  6, 2007
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+display_obj_name(FILE *stream, const iter_t *iter, const char *oname,
+    const char *s)
+{
+    static char fullname[NAME_BUF_SIZE];     /* Buffer for file and/or object name */
+    const char *name = fullname;                /* Pointer to buffer for printing */
+    int  n;
+
+    if(show_file_name_g)
+        sprintf(fullname, "%s/%s", iter->fname, oname);
+    else
+        name = oname;
+
+    /* Print the object name, either full name or base name */
+    if(fullname_g)
+        n = display_string(stream, name, TRUE);
+    else {
+        const char *last_sep;   /* The location of the last group separator */
+
+        /* Find the last component of the path name */
+        if(NULL == (last_sep = HDstrrchr(name, '/')))
+            last_sep = name;
+        else {
+            last_sep++;
+        } /* end else */
+        n = display_string(stream, last_sep, TRUE);
+    } /* end else */
+    printf("%*s ", MAX(0, (24 - n)), s);
+
+    return TRUE;
+}
+
+
+/*-------------------------------------------------------------------------
  * Function: display_native_type
  *
  * Purpose: Prints the name of a native C data type.
@@ -1326,7 +1296,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
     void UNUSED *op_data)
 {
     hid_t attr, space, type, p_type;
-    hsize_t size[64], nelmts = 1;
+    hsize_t size[H5S_MAX_RANK], nelmts = 1;
     int  ndims, i, n;
     size_t need;
     hsize_t     temp_need;
@@ -1460,8 +1430,8 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
 static herr_t
 dataset_list1(hid_t dset)
 {
-    hsize_t     cur_size[64];   /* current dataset dimensions */
-    hsize_t     max_size[64];   /* maximum dataset dimensions */
+    hsize_t     cur_size[H5S_MAX_RANK];   /* current dataset dimensions */
+    hsize_t     max_size[H5S_MAX_RANK];   /* maximum dataset dimensions */
     hid_t       space;          /* data space                 */
     int         ndims;          /* dimensionality             */
     H5S_class_t space_type;     /* type of dataspace          */
@@ -1524,7 +1494,6 @@ dataset_list2(hid_t dset, const char UNUSED *name)
     off_t       f_offset;       /* offset in external file */
     hsize_t     f_size;         /* bytes used in external file */
     hsize_t     total, used;    /* total size or offset */
-    hsize_t     chsize[64];     /* chunk size in elements */
     int         ndims;          /* dimensionality */
     int         n, max_len;     /* max extern file name length */
     double      utilization;    /* percent utilization of storage */
@@ -1537,6 +1506,8 @@ dataset_list2(hid_t dset, const char UNUSED *name)
 
         /* Print information about chunked storage */
         if (H5D_CHUNKED==H5Pget_layout(dcpl)) {
+            hsize_t     chsize[64];     /* chunk size in elements */
+
             ndims = H5Pget_chunk(dcpl, NELMTS(chsize), chsize/*out*/);
             printf("    %-10s {", "Chunks:");
             total = H5Tget_size(type);
@@ -1645,39 +1616,9 @@ dataset_list2(hid_t dset, const char UNUSED *name)
 
 
 /*-------------------------------------------------------------------------
- * Function: group_list2
- *
- * Purpose: List information about a group which should appear after
- *  information which is general to all objects.
- *
- * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-group_list2(hid_t grp, const char *name)
-{
-    iter_t iter;
-
-    if (recursive_g) {
-        iter.container = name;
-        H5Literate(grp, H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter);
-    }
-    return 0;
-}
-
-
-/*-------------------------------------------------------------------------
  * Function: datatype_list2
  *
- * Purpose: List information about a data type which should appear after
+ * Purpose: List information about a datatype which should appear after
  *  information which is general to all objects.
  *
  * Return: Success: 0
@@ -1704,80 +1645,56 @@ datatype_list2(hid_t type, const char UNUSED *name)
 
 
 /*-------------------------------------------------------------------------
- * Function: list
+ * Function: list_obj
  *
- * Purpose: Prints the group member name.
+ * Purpose: Prints information about an object
  *
  * Return: Success: 0
  *
  *  Failure: -1
  *
- * Programmer: Robb Matzke
- *              Monday, March 23, 1998
+ * Programmer: Quincey Koziol
+ *              Tuesday, November 6, 2007
  *
- * Modifications:
- *              Robb Matzke, LLNL, 2003-06-06
- *              If simple_output_g (set by `--simple') is turned on then
- *              the modification time is printed as UTC instead of the
- *              local timezone.
  *-------------------------------------------------------------------------
  */
 static herr_t
-list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter)
+list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void *_iter)
 {
+    H5O_type_t obj_type = oinfo->type;          /* Type of the object */
     iter_t *iter = (iter_t*)_iter;
-    char *fullname = NULL;
-    int  n;
 
-    /* Print the object name, either full name or base name */
-    fullname = fix_name(iter->container, name);
-    if(fullname_g)
-        n = display_string(stdout, fullname, TRUE);
-    else
-        n = display_string(stdout, name, TRUE);
-    printf("%*s ", MAX(0, (24 - n)), "");
-
-    /* Actions on objects */
-    if(linfo->type == H5L_TYPE_HARD) {
-        H5O_info_t oi;
-        char *s;
-        hid_t obj;
-
-        /* Get object information */
-        if(H5Oget_info_by_name(group, name, &oi, H5P_DEFAULT) < 0) {
-            puts("**NOT FOUND**");
-            return 0;
-        } else if(oi.type < 0 || oi.type >= H5O_TYPE_NTYPES) {
-            printf("Unknown type(%d)", (int)oi.type);
-            oi.type = H5O_TYPE_UNKNOWN;
-        }
-        if(oi.type >= 0 && dispatch_g[oi.type].name)
-            fputs(dispatch_g[oi.type].name, stdout);
-
-        /* If the object has already been printed then just show the object ID
-         * and return. */
-        if((s = sym_lookup(&oi))) {
-            printf(", same as ");
-            display_string(stdout, s, TRUE);
-            printf("\n");
-            goto done;
-        } /* end if */
-        else
-            sym_insert(&oi, fullname);
+    /* Print the link's name, either full name or base name */
+    display_obj_name(stdout, iter, name, "");
+
+    /* Check object information */
+    if(oinfo->type < 0 || oinfo->type >= H5O_TYPE_NTYPES) {
+        printf("Unknown type(%d)", (int)oinfo->type);
+        obj_type = H5O_TYPE_UNKNOWN;
+    }
+    if(obj_type >= 0 && dispatch_g[obj_type].name)
+        fputs(dispatch_g[obj_type].name, stdout);
+
+    /* Check if we've seen this object before */
+    if(first_seen) {
+        printf(", same as ");
+        display_string(stdout, first_seen, TRUE);
+        printf("\n");
+    } /* end if */
+    else {
+        hid_t obj = (-1);               /* ID of object opened */
 
         /* Open the object.  Not all objects can be opened.  If this is the case
          * then return right away.
          */
-        if(oi.type >= 0 &&
-                (NULL == dispatch_g[oi.type].open ||
-                (obj = (dispatch_g[oi.type].open)(group, name, H5P_DEFAULT)) < 0)) {
+        if(obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
             printf(" *ERROR*\n");
             goto done;
         } /* end if */
 
         /* List the first line of information for the object. */
-        if(oi.type >= 0 && dispatch_g[oi.type].list1)
-            (dispatch_g[oi.type].list1)(obj);
+        if(obj_type >= 0 && dispatch_g[obj_type].list1)
+            (dispatch_g[obj_type].list1)(obj);
         putchar('\n');
 
         /* Show detailed information about the object, beginning with information
@@ -1786,22 +1703,22 @@ list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter)
             char comment[50];
 
             /* Display attributes */
-            if(oi.type >= 0)
+            if(obj_type >= 0)
                 H5Aiterate2(obj, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
 
             /* Object location & reference count */
-            printf("    %-10s %lu:"H5_PRINTF_HADDR_FMT"\n", "Location:", oi.fileno, oi.addr);
-            printf("    %-10s %u\n", "Links:", (unsigned)oi.rc);
+            printf("    %-10s %lu:"H5_PRINTF_HADDR_FMT"\n", "Location:", oinfo->fileno, oinfo->addr);
+            printf("    %-10s %u\n", "Links:", (unsigned)oinfo->rc);
 
             /* Modification time */
-            if(oi.mtime > 0) {
+            if(oinfo->mtime > 0) {
                 char buf[256];
                 struct tm *tm;
 
                 if(simple_output_g)
-                    tm = HDgmtime(&(oi.mtime));
+                    tm = HDgmtime(&(oinfo->mtime));
                 else
-                    tm = HDlocaltime(&(oi.mtime));
+                    tm = HDlocaltime(&(oinfo->mtime));
                 if(tm) {
                     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
                     printf("    %-10s %s\n", "Modified:", buf);
@@ -1810,7 +1727,7 @@ list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter)
 
             /* Object comment */
             comment[0] = '\0';
-            H5Oget_comment_by_name(group, name, comment, sizeof(comment), H5P_DEFAULT);
+            H5Oget_comment(obj, comment, sizeof(comment));
             HDstrcpy(comment + sizeof(comment) - 4, "...");
             if(comment[0]) {
                 printf("    %-10s \"", "Comment:");
@@ -1820,118 +1737,91 @@ list(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter)
         } /* end if */
 
         /* Detailed list for object */
-        if(oi.type >= 0 && dispatch_g[oi.type].list2)
-            (dispatch_g[oi.type].list2)(obj, fullname);
+        if(obj_type >= 0 && dispatch_g[obj_type].list2)
+            (dispatch_g[obj_type].list2)(obj, name);
 
         /* Close the object. */
-        if(oi.type >= 0 && dispatch_g[oi.type].close)
-            (dispatch_g[oi.type].close)(obj);
-    } /* end if */
-    /* Actions on links */
-    else {
-        char *buf;
-
-        HDfputs("-> ", stdout);
-        switch(linfo->type) {
-            case H5L_TYPE_SOFT:
-                if((buf = HDmalloc(linfo->u.val_size)) == NULL)
-                    goto done;
-
-                if(H5Lget_val(group, name, buf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                    HDfree(buf);
-                    goto done;
-                } /* end if */
-
-                HDfputs(buf, stdout);
-                HDfree(buf);
-                break;
-
-            case H5L_TYPE_EXTERNAL:
-                {
-                const char *filename;
-                const char *path;
-
-                if((buf = HDmalloc(linfo->u.val_size)) == NULL)
-                    goto done;
-
-                if(H5Lget_val(group, name, buf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                    HDfree(buf);
-                    goto done;
-                } /* end if */
-                if(H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0) {
-                    HDfree(buf);
-                    goto done;
-                } /* end if */
-
-                HDfputs("file: ", stdout);
-                HDfputs(filename, stdout);
-                HDfputs("    path: ", stdout);
-                HDfputs(path, stdout);
-                }
-                break;
-
-            default:
-                HDfputs("cannot follow UD links", stdout);
-                break;
-        } /* end switch */
-        HDfputc('\n', stdout);
+        if(obj_type >= 0)
+            H5Oclose(obj);
     } /* end else */
 
 done:
-    if(fullname)
-        free(fullname);
     return 0;
-} /* end list() */
+} /* end list_obj() */
 
 
 /*-------------------------------------------------------------------------
- * Function: fix_name
+ * Function: list_lnk
  *
- * Purpose: Returns a malloc'd buffer that contains the PATH and BASE
- *  names separated by a single slash. It also removes duplicate
- *  and trailing slashes.
+ * Purpose: Prints information about a link
  *
- * Return: Success: Ptr to fixed name from malloc()
- *
- *  Failure: NULL
+ * Return: Success: 0
  *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
+ *  Failure: -1
  *
- * Modifications:
+ * Programmer: Quincey Koziol
+ *              Thursday, November 8, 2007
  *
  *-------------------------------------------------------------------------
  */
-static char *
-fix_name(const char *path, const char *base)
+static herr_t
+list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 {
-    size_t n = (path ? HDstrlen(path) : 0) + (base ? HDstrlen(base) : 0) + 3;
-    char *s = HDmalloc(n), prev='\0';
-    size_t len = 0;
-
-    if (path) {
-        /* Path, followed by slash */
-        for (/*void*/; *path; path++)
-            if ('/'!=*path || '/'!=prev)
-                prev = s[len++] = *path;
-        if ('/' != prev)
-            prev = s[len++] = '/';
-    }
+    char *buf;
+    iter_t *iter = (iter_t*)_iter;
 
-    if (base) {
-        /* Base name w/o trailing slashes */
-        const char *end = base + HDstrlen(base);
-        while (end > base && '/' == end[-1])
-            --end;
+    /* Print the link's name, either full name or base name */
+    display_obj_name(stdout, iter, name, "");
 
-        for (/*void*/; base < end; base++)
-            if ('/' != *base || '/' != prev)
-                prev = s[len++] = *base;
-    }
+    HDfputs("-> ", stdout);
+    switch(linfo->type) {
+        case H5L_TYPE_SOFT:
+            if((buf = HDmalloc(linfo->u.val_size)) == NULL)
+                goto done;
 
-    s[len] = '\0';
-    return s;
-}
+            if(H5Lget_val(iter->fid, name, buf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                HDfree(buf);
+                goto done;
+            } /* end if */
+
+            HDfputs(buf, stdout);
+            HDfree(buf);
+            break;
+
+        case H5L_TYPE_EXTERNAL:
+            {
+            const char *filename;
+            const char *path;
+
+            if((buf = HDmalloc(linfo->u.val_size)) == NULL)
+                goto done;
+
+            if(H5Lget_val(iter->fid, name, buf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                HDfree(buf);
+                goto done;
+            } /* end if */
+            if(H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0) {
+                HDfree(buf);
+                goto done;
+            } /* end if */
+
+            HDfputs("file: ", stdout);
+            HDfputs(filename, stdout);
+            HDfputs("    path: ", stdout);
+            HDfputs(path, stdout);
+            HDfree(buf);
+            }
+            break;
+
+        default:
+            HDfputs("cannot follow UD links", stdout);
+            break;
+    } /* end switch */
+    HDfputc('\n', stdout);
+
+done:
+    return 0;
+} /* end list_lnk() */
 
 
 /*-------------------------------------------------------------------------
@@ -2059,10 +1949,10 @@ leave(int ret)
 int
 main(int argc, const char *argv[])
 {
-    hid_t file = -1, root = -1;
+    hid_t file = -1;
     char *fname = NULL, *oname = NULL, *x;
     const char *s = NULL;
-    char *rest, *container = NULL;
+    char *rest;
     int  argno;
     static char root_name[] = "/";
     char        drivername[50];
@@ -2072,9 +1962,9 @@ main(int argc, const char *argv[])
     h5tools_init();
 
     /* Build object display table */
-    DISPATCH(H5O_TYPE_GROUP, "Group", H5Gopen2, H5Gclose, NULL, group_list2);
-    DISPATCH(H5O_TYPE_DATASET, "Dataset", H5Dopen2, H5Dclose, dataset_list1, dataset_list2);
-    DISPATCH(H5O_TYPE_NAMED_DATATYPE, "Type", H5Topen2, H5Tclose, NULL, datatype_list2);
+    DISPATCH(H5O_TYPE_GROUP, "Group", NULL, NULL);
+    DISPATCH(H5O_TYPE_DATASET, "Dataset", dataset_list1, dataset_list2);
+    DISPATCH(H5O_TYPE_NAMED_DATATYPE, "Type", NULL, datatype_list2);
 
     /* Default output width */
     width_g = get_width();
@@ -2230,6 +2120,13 @@ main(int argc, const char *argv[])
         leave(1);
     } /* end if */
 
+    /* Check for conflicting arguments */
+    if(recursive_g && grp_literal_g) {
+        fprintf(stderr, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
+        usage();
+        leave(1);
+    } /* end if */
+
     /* Turn off HDF5's automatic error printing unless you're debugging h5ls */
     if(!show_errors_g)
         H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
@@ -2249,7 +2146,6 @@ main(int argc, const char *argv[])
      * doesn't exist). */
     show_file_name_g = (argc-argno > 1); /*show file names if more than one*/
     while(argno < argc) {
-        H5O_info_t oi;
         H5L_info_t li;
         iter_t iter;
 
@@ -2281,24 +2177,21 @@ main(int argc, const char *argv[])
         } /* end if */
         if(oname)
             oname++;
-        if(!oname || !*oname)
+        if(!oname || !*oname) {
             oname = root_name;
+            if(recursive_g)
+                display_root_g = TRUE;
+        } /* end if */
+
+        /* Remember the file information for later */
+        iter.fname = fname;
+        iter.fid = file;
 
         /* Check for root group as object name */
         if(HDstrcmp(oname, root_name)) {
             /* Check the type of link given */
             if(H5Lget_info(file, oname, &li, H5P_DEFAULT) < 0) {
-                char *fullname = NULL;
-                int n;
-
-                fullname = fix_name(oname, "/");
-                if(fullname_g)
-                    n = display_string(stdout, fullname, TRUE);
-                else
-                    n = display_string(stdout, oname, TRUE);
-                printf("%*s \n", MAX(0, (24 - n)), "**NOT FOUND**");
-
-                HDfree(fullname);
+                display_obj_name(stdout, &iter, oname, "**NOT FOUND**");
                 leave(1);
             } /* end if */
         } /* end if */
@@ -2306,34 +2199,25 @@ main(int argc, const char *argv[])
             li.type = H5L_TYPE_HARD;
 
         /* Open the object and display it's information */
-        if(li.type == H5L_TYPE_HARD && H5Oget_info_by_name(file, oname, &oi, H5P_DEFAULT) >= 0 && H5O_TYPE_GROUP == oi.type && !grp_literal_g) {
-            /* Specified name is a group. List the complete contents of the group. */
-            sym_insert(&oi, oname);
-            iter.container = container = fix_name((show_file_name_g ? fname : ""), oname);
-
-            /* list root attributes */
-            if(verbose_g > 0) {
-                if((root = H5Gopen2(file, "/", H5P_DEFAULT)) < 0)
-                    leave(1);
-                H5Aiterate2(root, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
-                if(H5Gclose(root) < 0)
-                    leave(1);
-            } /* end if */
+        if(li.type == H5L_TYPE_HARD) {
+            H5O_info_t oi;              /* Information for object */
 
-            /* list */
-            H5Literate_by_name(file, oname, H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter, H5P_DEFAULT);
-            free(container);
-        } else if((root = H5Gopen2(file, "/", H5P_DEFAULT)) < 0) {
-            leave(1); /*major problem!*/
-        } else {
-            /* Specified name is a non-group object -- list that object.  The
-             * container for the object is everything up to the base name.
-             */
-            iter.container = show_file_name_g ? fname : "/";
-            list(root, oname, &li, &iter);
-            if(H5Gclose(root) < 0)
+            /* Retrieve info for object to list */
+            if(H5Oget_info_by_name(file, oname, &oi, H5P_DEFAULT) < 0) {
+                display_obj_name(stdout, &iter, oname, "**NOT FOUND**");
                 leave(1);
-        }
+            } /* end if */
+
+            /* Check for group iteration */
+            if(H5O_TYPE_GROUP == oi.type && !grp_literal_g)
+                /* Specified name is a group. List the complete contents of the group. */
+                h5trav_visit(file, oname, display_root_g, recursive_g, list_obj, list_lnk, &iter);
+            else
+                /* Specified name is a non-group object -- list that object */
+                list_obj(oname, &oi, NULL, &iter);
+        } else
+            /* Specified name is not for object -- list that link */
+            list_lnk(oname, &li, &iter);
         H5Fclose(file);
         free(fname);
     } /* end while */
diff --git a/tools/h5ls/testh5ls.sh b/tools/h5ls/testh5ls.sh
index ab36eb4..cef5730 100755
--- a/tools/h5ls/testh5ls.sh
+++ b/tools/h5ls/testh5ls.sh
@@ -49,6 +49,9 @@ TESTING() {
 TOOLTEST() {
     expect="$srcdir/../testfiles/$1"
     actual="../testfiles/`basename $1 .ls`.out"
+    actual_err="../testfiles/`basename $1 .ls`.err"
+    shift
+    retvalexpect=$1
     shift
 
     # Run test.
@@ -61,10 +64,11 @@ TOOLTEST() {
 	echo "#############################"
 	cd $srcdir/../testfiles
         $RUNSERIAL $H5LS_BIN "$@"
-    ) 2>&1 |sed 's/Modified:.*/Modified:  XXXX-XX-XX XX:XX:XX XXX/' >$actual
+    ) >$actual 2>$actual_err 
     
     exitcode=$?
-    if [ $exitcode -ne 0 ]; then
+    cat $actual_err >> $actual
+    if [ $exitcode -ne $retvalexpect ]; then
 	echo "*FAILED*"
 	nerrors="`expr $nerrors + 1`"
 	if [ yes = "$verbose" ]; then
@@ -89,7 +93,7 @@ TOOLTEST() {
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual
+	rm -f $actual $actual_err
     fi
 }
 
@@ -101,62 +105,65 @@ TOOLTEST() {
 
 # Toss in a bunch of tests.  Not sure if they are the right kinds.
 # test the help syntax
-TOOLTEST help-1.ls -w80 -h
-TOOLTEST help-2.ls -w80 -help
-TOOLTEST help-3.ls -w80 -?
+TOOLTEST help-1.ls 0 -w80 -h
+TOOLTEST help-2.ls 0 -w80 -help
+TOOLTEST help-3.ls 0 -w80 -?
 
 # test simple command
-TOOLTEST tall-1.ls -w80 tall.h5
-TOOLTEST tall-2.ls -w80 -r -d tall.h5
-TOOLTEST tgroup.ls -w80 tgroup.h5
+TOOLTEST tall-1.ls 0 -w80 tall.h5
+TOOLTEST tall-2.ls 0 -w80 -r -d tall.h5
+TOOLTEST tgroup.ls 0 -w80 tgroup.h5
 
 # test for displaying groups
-TOOLTEST tgroup-1.ls -w80 -r -g tgroup.h5
+# The following combination of arguments is expected to return an error message
+# and return value 1
+TOOLTEST tgroup-1.ls 1 -w80 -r -g tgroup.h5
+TOOLTEST tgroup-2.ls 0 -w80 -g tgroup.h5/g1
 
 # test for displaying simple space datasets
-TOOLTEST tdset-1.ls -w80 -r -d tdset.h5
+TOOLTEST tdset-1.ls 0 -w80 -r -d tdset.h5
 
 # test for displaying soft links
-TOOLTEST tslink-1.ls -w80 -r tslink.h5
+TOOLTEST tslink-1.ls 0 -w80 -r tslink.h5
 
 # test for displaying external and user-defined links
-TOOLTEST textlink-1.ls -w80 -r textlink.h5
-TOOLTEST tudlink-1.ls -w80 -r tudlink.h5
+TOOLTEST textlink-1.ls 0 -w80 -r textlink.h5
+TOOLTEST tudlink-1.ls 0 -w80 -r tudlink.h5
 
 # tests for hard links
-TOOLTEST thlink-1.ls -w80 thlink.h5
+TOOLTEST thlink-1.ls 0 -w80 thlink.h5
 
 # tests for compound data types
-TOOLTEST tcomp-1.ls -w80 -r -d tcompound.h5
+TOOLTEST tcomp-1.ls 0 -w80 -r -d tcompound.h5
 
 #test for the nested compound type
-TOOLTEST tnestcomp-1.ls -w80 -r -d tnestedcomp.h5
+TOOLTEST tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
 
 # test for loop detection
-TOOLTEST tloop-1.ls -w80 -r -d tloop.h5
+TOOLTEST tloop-1.ls 0 -w80 -r -d tloop.h5
 
 # test for string 
-TOOLTEST tstr-1.ls -w80 -r -d tstr.h5
+TOOLTEST tstr-1.ls 0 -w80 -r -d tstr.h5
 
 # test test file created from lib SAF team
-TOOLTEST tsaf.ls -w80 -r -d tsaf.h5
+TOOLTEST tsaf.ls 0 -w80 -r -d tsaf.h5
 
 # test for variable length data types
-TOOLTEST tvldtypes1.ls -w80 -r -d tvldtypes1.h5
+TOOLTEST tvldtypes1.ls 0 -w80 -r -d tvldtypes1.h5
 
 # test for array data types
-TOOLTEST tarray1.ls -w80 -r -d tarray1.h5
+TOOLTEST tarray1.ls 0 -w80 -r -d tarray1.h5
 
 # test for empty data
-TOOLTEST tempty.ls -w80 -d tempty.h5
+TOOLTEST tempty.ls 0 -w80 -d tempty.h5
 
 # test for all dataset types written to attributes
 # enable -S for avoiding printing NATIVE types
-TOOLTEST tattr2.ls -w80 -v -S tattr2.h5
+TOOLTEST tattr2.ls 0 -w80 -v -S tattr2.h5
 
 # tests for error handling.
 # test for non-existing file
-TOOLTEST nosuchfile.ls nosuchfile.h5
+TOOLTEST nosuchfile.ls 0 nosuchfile.h5
 
 if test $nerrors -eq 0 ; then
 	echo "All h5ls tests passed."
diff --git a/tools/h5recover/Makefile.in b/tools/h5recover/Makefile.in
index 201ef85..74ce765 100644
--- a/tools/h5recover/Makefile.in
+++ b/tools/h5recover/Makefile.in
@@ -216,6 +216,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5recover/enable_journaling.c b/tools/h5recover/enable_journaling.c
index 84df3af..e4cd442 100755
--- a/tools/h5recover/enable_journaling.c
+++ b/tools/h5recover/enable_journaling.c
@@ -159,11 +159,11 @@ main (int ac, char **av)
 	    H5Pclose(faccpl);
 	}
 
-	dataset=H5Dopen(file, DATASETNAME, H5P_DEFAULT);
+	dataset=H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 	/* extend the dataset to 2NX rows. */
 	dimsf[0] = 2*NX;
 	dimsf[1] = NY;
-	H5Dextend(dataset, dimsf);
+	H5Dset_extent(dataset, dimsf);
 
 	if (!pmode){
 	    /* write data to new rows and crash */
diff --git a/tools/h5recover/h5recover.c b/tools/h5recover/h5recover.c
index 2b037be..0dfb421 100644
--- a/tools/h5recover/h5recover.c
+++ b/tools/h5recover/h5recover.c
@@ -621,7 +621,7 @@ main (int argc, const char *argv[])
                 pread(hdf5_fd, compare_buf, size, address);
 
                 /* do a quick string compare on two items */
-                if (HDstrcmp(body, compare_buf) != 0) {
+                if (HDstrcmp((const char *)body, (const char *)compare_buf) != 0) {
                     error_msg(progname, "Entry incorrectly written into HDF5 file. Exiting.\n");
                     printf("Address %llx:\n", address);
                     printf(" -- from journal:   %llx\n", body);
@@ -706,7 +706,7 @@ main (int argc, const char *argv[])
     } /* end if */
 
     /* obtain H5F_t pointer */
-    if ((f = H5I_object(fid)) == -1) {
+    if (NULL == (f = H5I_object(fid))) {
 
         error_msg(progname, "Could not obtain H5F_t pointer from file id");
         leave( EXIT_FAILURE );
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index e053e83..f677de0 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -41,8 +41,8 @@ LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 
 # Source files
 COMMON_SOURCES=h5repack.c h5repack_copy.c h5repack_filters.c \
-        h5repack_list.c h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
-        h5repack_verify.c
+               h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
+               h5repack_verify.c
 
 h5repack_SOURCES=$(COMMON_SOURCES) h5repack_main.c
 
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 1823f8b..97d3620 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -69,9 +69,9 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 am__EXEEXT_1 = h5repacktst$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am__objects_1 = h5repack.$(OBJEXT) h5repack_copy.$(OBJEXT) \
-	h5repack_filters.$(OBJEXT) h5repack_list.$(OBJEXT) \
-	h5repack_opttable.$(OBJEXT) h5repack_parse.$(OBJEXT) \
-	h5repack_refs.$(OBJEXT) h5repack_verify.$(OBJEXT)
+	h5repack_filters.$(OBJEXT) h5repack_opttable.$(OBJEXT) \
+	h5repack_parse.$(OBJEXT) h5repack_refs.$(OBJEXT) \
+	h5repack_verify.$(OBJEXT)
 am_h5repack_OBJECTS = $(am__objects_1) h5repack_main.$(OBJEXT)
 h5repack_OBJECTS = $(am_h5repack_OBJECTS)
 h5repack_LDADD = $(LDADD)
@@ -224,6 +224,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
@@ -351,8 +352,8 @@ LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 
 # Source files
 COMMON_SOURCES = h5repack.c h5repack_copy.c h5repack_filters.c \
-        h5repack_list.c h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
-        h5repack_verify.c
+               h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
+               h5repack_verify.c
 
 h5repack_SOURCES = $(COMMON_SOURCES) h5repack_main.c
 h5repacktst_SOURCES = $(COMMON_SOURCES) h5repacktst.c 
@@ -470,7 +471,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_copy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_filters.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_opttable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_parse.Po@am__quote@
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index 45409c4..954f3e7 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -15,9 +15,14 @@
 
 #include 
 #include 
+#include 
+
+#include "H5private.h"
 #include "h5repack.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
+
 extern char  *progname;
 
 
@@ -28,25 +33,11 @@ extern char  *progname;
  */
 
 static int check_options(pack_opt_t *options);
+static int check_objects(const char* fname, pack_opt_t *options);
+static const char* get_sfilter (H5Z_filter_t filtn);
+static int have_request(pack_opt_t *options);
 
 
-/*-------------------------------------------------------------------------
- * Function: aux_initglb_filter
- *
- * Purpose: auxiliary function, initialize the options global filter
- *
- * Return: void
- *
- *-------------------------------------------------------------------------
- */
-static void aux_initglb_filter(pack_opt_t *options)
-{
- int k;
- options->filter_g.filtn  = -1;
- for ( k=0; kfilter_g.cd_values[k] = -1;
-}
-
 
 /*-------------------------------------------------------------------------
  * Function: h5repack
@@ -71,20 +62,20 @@ int h5repack(const char* infile,
              const char* outfile,
              pack_opt_t *options)
 {
- /* check input */
- if (check_options(options)<0)
-  return -1;
-
- /* check for objects in input that are in the file */
- if (check_objects(infile,options) < 0)
-  return -1;
-
- /* copy the objects  */
- if (copy_objects(infile,outfile,options) < 0)
-  return -1;
-
-
- return 0;
+    /* check input */
+    if (check_options(options)<0)
+        return -1;
+    
+    /* check for objects in input that are in the file */
+    if (check_objects(infile,options) < 0)
+        return -1;
+    
+    /* copy the objects  */
+    if (copy_objects(infile,outfile,options) < 0)
+        return -1;
+    
+    
+    return 0;
 }
 
 
@@ -102,10 +93,20 @@ int h5repack(const char* infile,
 int h5repack_init (pack_opt_t *options,
                    int verbose)
 {
- memset(options,0,sizeof(pack_opt_t));
- options->threshold = 1024;
- options->verbose   = verbose;
- return (options_table_init(&(options->op_tbl)));
+    int k, n;
+    memset(options,0,sizeof(pack_opt_t));
+    options->threshold = 1024;
+    options->verbose   = verbose;
+        
+    for ( n = 0; n < H5_REPACK_MAX_NFILTERS; n++)
+    {
+        options->filter_g[n].filtn  = -1;
+        options->filter_g[n].cd_nelmts  = -1;
+        for ( k = 0; k < CD_VALUES; k++)
+            options->filter_g[n].cd_values[k] = -1;
+    }
+     
+    return (options_table_init(&(options->op_tbl)));
 }
 
 /*-------------------------------------------------------------------------
@@ -118,7 +119,7 @@ int h5repack_init (pack_opt_t *options,
 
 int h5repack_end  (pack_opt_t *options)
 {
- return options_table_free(options->op_tbl);
+    return options_table_free(options->op_tbl);
 }
 
 /*-------------------------------------------------------------------------
@@ -135,35 +136,43 @@ int h5repack_end  (pack_opt_t *options)
 int h5repack_addfilter(const char* str,
                        pack_opt_t *options)
 {
- obj_list_t      *obj_list=NULL; /*one object list for the -f and -c option entry */
- filter_info_t   filt;           /*filter info for the current -f option entry */
- int             n_objs;         /*number of objects in the current -f or -c option entry */
-
- if (options->all_filter==1){
-  error_msg(progname, "invalid compression input: 'all' option is present \
-   with other objects <%s>\n",str);
-  return -1;
- }
-
- /* parse the -f option */
- obj_list=parse_filter(str,&n_objs,&filt,options);
- if (obj_list==NULL)
- {
-  return -1;
- }
-
- if (options->all_filter==1)
- {
-  /* if we are compressing all set the global filter type */
-  aux_initglb_filter(options);
-  options->filter_g=filt;
- }
-
- if (options->all_filter==0)
-  options_add_filter(obj_list,n_objs,filt,options->op_tbl);
-
- free(obj_list);
- return 0;
+    obj_list_t      *obj_list=NULL; /* one object list for the -f and -l option entry */
+    filter_info_t   filter;         /* filter info for the current -f option entry */
+    int             n_objs;         /* number of objects in the current -f or -l option entry */
+    int             is_glb;         /* is the filter global */
+
+    
+     
+    /* parse the -f option */
+    obj_list=parse_filter(str,&n_objs,&filter,options,&is_glb);
+    if (obj_list==NULL)
+    {
+        return -1;
+    }
+    
+    /* if it applies to all objects */
+    if (is_glb)
+    {
+        
+        int n;
+        
+        n = options->n_filter_g++; /* increase # of global filters */
+
+        if (options->n_filter_g > H5_REPACK_MAX_NFILTERS)
+        {
+            error_msg(progname, "maximum number of filters exceeded for <%s>\n",str);
+            return -1;
+            
+        }
+                
+        options->filter_g[n] = filter;
+    }
+    
+    else
+        options_add_filter(obj_list,n_objs,filter,options->op_tbl);
+    
+    free(obj_list);
+    return 0;
 }
 
 
@@ -181,55 +190,55 @@ int h5repack_addfilter(const char* str,
 int h5repack_addlayout(const char* str,
                        pack_opt_t *options)
 {
-
- obj_list_t  *obj_list=NULL;     /*one object list for the -t and -c option entry */
- int         n_objs;             /*number of objects in the current -t or -c option entry */
- pack_info_t pack;               /*info about layout to extract from parse */
- int         j;
-
- init_packobject(&pack);
-
- if (options->all_layout==1){
-  error_msg(progname, "invalid layout input: 'all' option \
-   is present with other objects <%s>\n",str);
-  return -1;
- }
-
- /* parse the layout option */
- obj_list=parse_layout(str,&n_objs,&pack,options);
- if (obj_list==NULL)
-  return -1;
-
- /* set global layout option */
- if (options->all_layout==1 )
- {
-  options->layout_g=pack.layout;
-  if (pack.layout==H5D_CHUNKED)
-  {
-   /* -2 means the NONE option, remove chunking
-      and set the global layout to contiguous */
-   if (pack.chunk.rank==-2)
-   {
-    options->layout_g = H5D_CONTIGUOUS;
-   }
-   /* otherwise set the global chunking type */
-   else
-   {
-    options->chunk_g.rank=pack.chunk.rank;
-    for (j = 0; j < pack.chunk.rank; j++)
-     options->chunk_g.chunk_lengths[j] = pack.chunk.chunk_lengths[j];
-   }
-  }
- }
-
- if (options->all_layout==0)
-  options_add_layout(obj_list,
-   n_objs,
-   &pack,
-   options->op_tbl);
-
- free(obj_list);
- return 0;
+    
+    obj_list_t  *obj_list=NULL;     /*one object list for the -t and -c option entry */
+    int         n_objs;             /*number of objects in the current -t or -c option entry */
+    pack_info_t pack;               /*info about layout to extract from parse */
+    int         j;
+    
+    init_packobject(&pack);
+    
+    if (options->all_layout==1){
+    error_msg(progname, "invalid layout input: 'all' option \
+        is present with other objects <%s>\n",str);
+    return -1;
+    }
+    
+    /* parse the layout option */
+    obj_list=parse_layout(str,&n_objs,&pack,options);
+    if (obj_list==NULL)
+        return -1;
+    
+    /* set global layout option */
+    if (options->all_layout==1 )
+    {
+        options->layout_g=pack.layout;
+        if (pack.layout==H5D_CHUNKED)
+        {
+        /* -2 means the NONE option, remove chunking
+            and set the global layout to contiguous */
+            if (pack.chunk.rank==-2)
+            {
+                options->layout_g = H5D_CONTIGUOUS;
+            }
+            /* otherwise set the global chunking type */
+            else
+            {
+                options->chunk_g.rank=pack.chunk.rank;
+                for (j = 0; j < pack.chunk.rank; j++)
+                    options->chunk_g.chunk_lengths[j] = pack.chunk.chunk_lengths[j];
+            }
+        }
+    }
+    
+    if (options->all_layout==0)
+        options_add_layout(obj_list,
+        n_objs,
+        &pack,
+        options->op_tbl);
+    
+    free(obj_list);
+    return 0;
 }
 
 
@@ -252,270 +261,285 @@ int h5repack_addlayout(const char* str,
  */
 static int check_options(pack_opt_t *options)
 {
- unsigned int   i;
- int            k, j, has_cp=0, has_ck=0;
- char           slayout[30];
-
-/*-------------------------------------------------------------------------
- * objects to layout
- *-------------------------------------------------------------------------
- */
- if (options->verbose && have_request(options) /* only print if requested */)
- {
-  printf("Objects to modify layout are...\n");
-  if (options->all_layout==1)  {
-   switch (options->layout_g)
-   {
-   case H5D_COMPACT:
-    strcpy(slayout,"compact");
-    break;
-   case H5D_CONTIGUOUS:
-    strcpy(slayout,"contiguous");
-    break;
-   case H5D_CHUNKED:
-    strcpy(slayout,"chunked");
-    break;
-   default:
-    strcpy(slayout,"unknown");
-    break;
-   }
-   printf(" Apply %s layout to all\n", slayout);
-   if (H5D_CHUNKED==options->layout_g) {
-    printf("with dimension [");
-    for ( j = 0; j < options->chunk_g.rank; j++)
-     printf("%d ",(int)options->chunk_g.chunk_lengths[j]);
-    printf("]\n");
-   }
-  }
- }/* verbose */
-
- for ( i = 0; i < options->op_tbl->nelems; i++)
- {
-  char* name=options->op_tbl->objs[i].path;
-
-  if (options->op_tbl->objs[i].chunk.rank>0)
-  {
-   if (options->verbose){
-    printf(" <%s> with chunk size ",name);
-    for ( k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
-     printf("%d ",(int)options->op_tbl->objs[i].chunk.chunk_lengths[k]);
-    printf("\n");
-   }
-   has_ck=1;
-  }
-  else if (options->op_tbl->objs[i].chunk.rank==-2)
-  {
-   if (options->verbose)
-    printf(" <%s> %s\n",name,"NONE (contigous)");
-   has_ck=1;
-  }
- }
-
- if (options->all_layout==1 && has_ck){
-  error_msg(progname, "invalid chunking input: 'all' option\
-   is present with other objects\n");
-  return -1;
- }
-
-/*-------------------------------------------------------------------------
- * objects to filter
- *-------------------------------------------------------------------------
- */
-
- if (options->verbose && have_request(options) /* only print if requested */)
- {
-  printf("Objects to apply filter are...\n");
-  if (options->all_filter==1)
-  {
-   H5Z_filter_t filtn=options->filter_g.filtn;
-   switch (filtn)
-   {
-   case H5Z_FILTER_NONE:
-     printf(" Uncompress all\n");
-    break;
-   case H5Z_FILTER_SHUFFLE:
-   case H5Z_FILTER_FLETCHER32:
-     printf(" All with %s\n",get_sfilter(filtn));
-    break;
-   case H5Z_FILTER_SZIP:
-   case H5Z_FILTER_DEFLATE:
-     printf(" All with %s, parameter %d\n",
-      get_sfilter(filtn),
-      options->filter_g.cd_values[0]);
-    break;
-   };
-  }
- } /* verbose */
-
- for ( i = 0; i < options->op_tbl->nelems; i++)
- {
-  pack_info_t pack  = options->op_tbl->objs[i];
-  char*       name  = pack.path;
-
-  for ( j=0; jverbose)
-   {
-    printf(" <%s> with %s filter\n",
-     name,
-     get_sfilter(pack.filter[j].filtn));
-   }
-
-   has_cp=1;
-
-  } /* j */
- } /* i */
-
- if (options->all_filter==1 && has_cp){
-  error_msg(progname, "invalid compression input: 'all' option\
-   is present with other objects\n");
-  return -1;
- }
-
- /* check options for the latest format */
- if (options->grp_compact < 0) {
-  error_msg(progname, "invalid maximum number of links to store as header messages\n");
-  return -1;
- }
- if (options->grp_indexed < 0) {
-  error_msg(progname, "invalid minimum number of links to store in the indexed format\n");
-  return -1;
- }
- if (options->grp_indexed > options->grp_compact) {
-  error_msg(progname, "minimum indexed size is greater than the maximum compact size\n");
-  return -1;
- }
- for (i=0; i<8; i++) {
-  if (options->msg_size[i]<0) {
-   error_msg(progname, "invalid shared message size\n");
-   return -1;
-  }
- }
-
- return 0;
+    unsigned int   i;
+    int            k, j, has_cp=0, has_ck=0;
+    char           slayout[30];
+    
+    /*-------------------------------------------------------------------------
+    * objects to layout
+    *-------------------------------------------------------------------------
+    */
+    if (options->verbose && have_request(options) /* only print if requested */)
+    {
+        printf("Objects to modify layout are...\n");
+        if (options->all_layout==1)  {
+            switch (options->layout_g)
+            {
+            case H5D_COMPACT:
+                strcpy(slayout,"compact");
+                break;
+            case H5D_CONTIGUOUS:
+                strcpy(slayout,"contiguous");
+                break;
+            case H5D_CHUNKED:
+                strcpy(slayout,"chunked");
+                break;
+            default:
+                strcpy(slayout,"unknown");
+                break;
+            }
+            printf(" Apply %s layout to all\n", slayout);
+            if (H5D_CHUNKED==options->layout_g) {
+                printf("with dimension [");
+                for ( j = 0; j < options->chunk_g.rank; j++)
+                    printf("%d ",(int)options->chunk_g.chunk_lengths[j]);
+                printf("]\n");
+            }
+        }
+    }/* verbose */
+    
+    for ( i = 0; i < options->op_tbl->nelems; i++)
+    {
+        char* name=options->op_tbl->objs[i].path;
+        
+        if (options->op_tbl->objs[i].chunk.rank>0)
+        {
+            if (options->verbose){
+                printf(" <%s> with chunk size ",name);
+                for ( k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
+                    printf("%d ",(int)options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                printf("\n");
+            }
+            has_ck=1;
+        }
+        else if (options->op_tbl->objs[i].chunk.rank==-2)
+        {
+            if (options->verbose)
+                printf(" <%s> %s\n",name,"NONE (contigous)");
+            has_ck=1;
+        }
+    }
+    
+    if (options->all_layout==1 && has_ck){
+    error_msg(progname, "invalid chunking input: 'all' option\
+        is present with other objects\n");
+    return -1;
+    }
+    
+    /*-------------------------------------------------------------------------
+    * objects to filter
+    *-------------------------------------------------------------------------
+    */
+    
+    if (options->verbose && have_request(options) /* only print if requested */)
+    {
+        printf("Objects to apply filter are...\n");
+        if (options->all_filter==1)
+        {
+            
+            for (k = 0; k < options->n_filter_g; k++ )
+            {
+                H5Z_filter_t filtn=options->filter_g[k].filtn;
+                switch (filtn)
+                {
+                case H5Z_FILTER_NONE:
+                    printf(" Uncompress all\n");
+                    break;
+                case H5Z_FILTER_SHUFFLE:
+                case H5Z_FILTER_FLETCHER32:
+                    printf(" All with %s\n",get_sfilter(filtn));
+                    break;
+                case H5Z_FILTER_SZIP:
+                case H5Z_FILTER_DEFLATE:
+                    printf(" All with %s, parameter %d\n",
+                        get_sfilter(filtn),
+                        options->filter_g[k].cd_values[0]);
+                    break;
+                } /* k */
+            };
+        }
+    } /* verbose */
+    
+    for ( i = 0; i < options->op_tbl->nelems; i++)
+    {
+        pack_info_t pack  = options->op_tbl->objs[i];
+        char*       name  = pack.path;
+        
+        for ( j=0; jverbose)
+            {
+                printf(" <%s> with %s filter\n",
+                    name,
+                    get_sfilter(pack.filter[j].filtn));
+            }
+            
+            has_cp=1;
+            
+        } /* j */
+    } /* i */
+    
+    if (options->all_filter==1 && has_cp){
+    error_msg(progname, "invalid compression input: 'all' option\
+        is present with other objects\n");
+    return -1;
+    }
+    
+    /* check options for the latest format */
+    if (options->grp_compact < 0) {
+        error_msg(progname, "invalid maximum number of links to store as header messages\n");
+        return -1;
+    }
+    if (options->grp_indexed < 0) {
+        error_msg(progname, "invalid minimum number of links to store in the indexed format\n");
+        return -1;
+    }
+    if (options->grp_indexed > options->grp_compact) {
+        error_msg(progname, "minimum indexed size is greater than the maximum compact size\n");
+        return -1;
+    }
+    for (i=0; i<8; i++) {
+        if (options->msg_size[i]<0) {
+            error_msg(progname, "invalid shared message size\n");
+            return -1;
+        }
+    }
+    
+    return 0;
 }
 
+
 /*-------------------------------------------------------------------------
- * Function: read_info
+ * Function: check_objects
  *
- * Purpose: read comp and chunk options from file
+ * Purpose: locate all HDF5 objects in the file and compare with user
+ *  supplied list
  *
- * Return: void, exit on error
+ * Return: 0, ok, -1 no
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
- * Date: September, 22, 2003
+ * Date: September, 23, 2003
  *
  *-------------------------------------------------------------------------
  */
-
-void read_info(const char *filename,
-               pack_opt_t *options)
+static int check_objects(const char* fname,
+                         pack_opt_t *options)
 {
-
- char stype[10];
- char comp_info[1024];
- FILE *fp;
- char c;
- int  i, rc=1;
- char  *srcdir = getenv("srcdir"); /* the source directory */
- char  data_file[512]="";          /* buffer to hold name of existing file */
-
- /* compose the name of the file to open, using the srcdir, if appropriate */
- if (srcdir){
-  strcpy(data_file,srcdir);
-  strcat(data_file,"/");
- }
- strcat(data_file,filename);
-
-
- if ((fp = fopen(data_file, "r")) == (FILE *)NULL) {
-  error_msg(progname, "cannot open options file %s\n", filename);
-  exit(1);
- }
-
- /* cycle until end of file reached */
- while( 1 )
- {
-  rc=fscanf(fp, "%s", stype);
-  if (rc==-1)
-   break;
-
- /*-------------------------------------------------------------------------
-  * filter
-  *-------------------------------------------------------------------------
-  */
-  if (strcmp(stype,"-f") == 0) {
-
-   /* find begining of info */
-   i=0; c='0';
-   while( c!=' ' )
-   {
-    fscanf(fp, "%c", &c);
-    if (feof(fp)) break;
-   }
-   c='0';
-   /* go until end */
-   while( c!=' ' )
-   {
-    fscanf(fp, "%c", &c);
-    comp_info[i]=c;
-    i++;
-    if (feof(fp)) break;
-    if (c==10 /*eol*/) break;
-   }
-   comp_info[i-1]='\0'; /*cut the last " */
-
-   if (h5repack_addfilter(comp_info,options)==-1){
-    error_msg(progname, "could not add compression option\n");
-    exit(1);
-   }
-  }
- /*-------------------------------------------------------------------------
-  * layout
-  *-------------------------------------------------------------------------
-  */
-  else if (strcmp(stype,"-l") == 0) {
-
-   /* find begining of info */
-   i=0; c='0';
-   while( c!=' ' )
-   {
-    fscanf(fp, "%c", &c);
-    if (feof(fp)) break;
-   }
-   c='0';
-   /* go until end */
-   while( c!=' ' )
-   {
-    fscanf(fp, "%c", &c);
-    comp_info[i]=c;
-    i++;
-    if (feof(fp)) break;
-    if (c==10 /*eol*/) break;
-   }
-   comp_info[i-1]='\0'; /*cut the last " */
-
-   if (h5repack_addlayout(comp_info,options)==-1){
-    error_msg(progname, "could not add chunck option\n");
-    exit(1);
-   }
-  }
- /*-------------------------------------------------------------------------
-  * not valid
-  *-------------------------------------------------------------------------
-  */
-  else {
-   error_msg(progname, "bad file format for %s", filename);
-   exit(1);
-  }
- }
-
- fclose(fp);
- return;
+    hid_t         fid;
+    unsigned int  i;
+    trav_table_t  *travt = NULL;
+    
+    /* nothing to do */
+    if(options->op_tbl->nelems == 0)
+        return 0;
+    
+    /*-------------------------------------------------------------------------
+     * open the file
+     *-------------------------------------------------------------------------
+     */
+    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0)) < 0){
+        printf("<%s>: %s\n", fname, H5FOPENERROR );
+        return -1;
+    }
+    
+    /*-------------------------------------------------------------------------
+     * get the list of objects in the file
+     *-------------------------------------------------------------------------
+     */
+    
+    /* init table */
+    trav_table_init(&travt);
+    
+    /* get the list of objects in the file */
+    if(h5trav_gettable(fid, travt) < 0)
+        goto out;
+    
+    /*-------------------------------------------------------------------------
+     * compare with user supplied list
+     *-------------------------------------------------------------------------
+     */
+    
+    if(options->verbose)
+        printf("Opening file <%s>. Searching for objects to modify...\n", fname);
+    
+    for(i = 0; i < options->op_tbl->nelems; i++) {
+        char* name=options->op_tbl->objs[i].path;
+        if(options->verbose)
+            printf(" <%s>",name);
+        
+        /* the input object names are present in the file and are valid */
+        if(h5trav_getindext(name, travt) < 0) {
+            error_msg(progname, "%s Could not find <%s> in file <%s>. Exiting...\n",
+                (options->verbose?"\n":""),name,fname);
+            goto out;
+        }
+        if(options->verbose)
+            printf("...Found\n");
+
+        /* check for extra filter conditions */
+        switch(options->op_tbl->objs[i].filter->filtn) {
+            /* chunk size must be smaller than pixels per block */
+            case H5Z_FILTER_SZIP:
+            {
+                int     j;
+                int     csize = 1;
+                int     ppb = options->op_tbl->objs[i].filter->cd_values[0];
+                hsize_t dims[H5S_MAX_RANK];
+                int     rank;
+                hid_t   did;
+                hid_t   sid;
+                
+                if(options->op_tbl->objs[i].chunk.rank > 0) {
+                    rank = options->op_tbl->objs[i].chunk.rank;
+                    for(j = 0; j < rank; j++)
+                        csize *= (int)options->op_tbl->objs[i].chunk.chunk_lengths[j];
+                }
+                else {
+                    if((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
+                        goto out;
+                    if((sid = H5Dget_space(did)) < 0)
+                        goto out;
+                    if((rank = H5Sget_simple_extent_ndims(sid)) < 0)
+                        goto out;
+                    HDmemset(dims, 0, sizeof dims);
+                    if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+                        goto out;
+                    for(j = 0; j < rank; j++)
+                        csize *= (int)dims[j];
+                    if(H5Sclose(sid) < 0)
+                        goto out;
+                    if(H5Dclose(did) < 0)
+                        goto out;
+                }
+                
+                if (csize < ppb ) {
+                    printf(" \n");
+                    goto out;
+                }
+            }
+            break;
+        }
+    } /* i */
+      
+   /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    H5Fclose(fid);
+    trav_table_free(travt);
+    return 0;
+    
+out:
+    H5Fclose(fid);
+    trav_table_free(travt);
+    return -1;
 }
 
 
+
+
+
 /*-------------------------------------------------------------------------
  * Function: have_request
  *
@@ -527,7 +551,7 @@ void read_info(const char *filename,
  *
  *-------------------------------------------------------------------------
  */
-int have_request(pack_opt_t *options)
+static int have_request(pack_opt_t *options)
 {
 
     if (options->all_filter || options->all_layout || options->op_tbl->nelems)
@@ -536,3 +560,38 @@ int have_request(pack_opt_t *options)
     return 0;
 
 }
+
+
+/*-------------------------------------------------------------------------
+ * Function: get_sfilter
+ *
+ * Purpose: return the filter as a string name
+ *
+ * Return: name of filter, exit on error
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static const char* get_sfilter(H5Z_filter_t filtn)
+{
+    if (filtn==H5Z_FILTER_NONE)
+        return "NONE";
+    else if (filtn==H5Z_FILTER_DEFLATE)
+        return "GZIP";
+    else if (filtn==H5Z_FILTER_SZIP)
+        return "SZIP";
+    else if (filtn==H5Z_FILTER_SHUFFLE)
+        return "SHUFFLE";
+    else if (filtn==H5Z_FILTER_FLETCHER32)
+        return "FLETCHER32";
+    else if (filtn==H5Z_FILTER_NBIT)
+        return "NBIT";
+    else if (filtn==H5Z_FILTER_SCALEOFFSET)
+        return "SOFF";
+    else {
+        error_msg(progname, "input error in filter type\n");
+        exit(1);
+    }
+    return NULL;
+}
+
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index d986cc0..baa888e 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -19,6 +19,8 @@
 
 #include "hdf5.h"
 #include "h5trav.h"
+#include "H5Zprivate.h"	/* H5Z_COMMON_CD_VALUES */	
+
 
 
 #define H5FOPENERROR "unable to open file"
@@ -51,11 +53,13 @@ typedef struct {
  H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
 */
 
-#define CDVALUES 2
+/* #define CD_VALUES H5Z_COMMON_CD_VALUES */
+#define CD_VALUES 20
 
 typedef struct {
- H5Z_filter_t filtn;               /* filter identification number */
- int          cd_values[CDVALUES]; /* filter client data values */
+ H5Z_filter_t filtn;                           /* filter identification number */
+ unsigned     cd_values[CD_VALUES];            /* filter client data values */
+ size_t       cd_nelmts;                       /* filter client number of values */
 } filter_info_t;
 
 /* chunk lengths along each dimension and rank */
@@ -96,7 +100,8 @@ typedef struct {
  pack_opttbl_t   *op_tbl;     /*table with all -c and -f options */
  int             all_layout;  /*apply the layout to all objects */
  int             all_filter;  /*apply the filter to all objects */
- filter_info_t   filter_g;    /*global filter INFO for the ALL case */
+ filter_info_t   filter_g[H5_REPACK_MAX_NFILTERS];    /*global filter array for the ALL case */
+ int             n_filter_g;  /*number of global filters */
  chunk_info_t    chunk_g;     /*global chunk INFO for the ALL case */
  H5D_layout_t    layout_g;    /*global layout information for the ALL case */
  int             verbose;     /*verbose mode */
@@ -142,58 +147,38 @@ int h5repack_cmpdcpl   (const char *fname1,
  */
 
 
-int check_objects(const char* fname,
-                  pack_opt_t *options);
+/*-------------------------------------------------------------------------
+ * copy module
+ *-------------------------------------------------------------------------
+ */
 
-int copy_objects(const char* fnamein,
-                 const char* fnameout,
-                 pack_opt_t *options);
+int copy_objects   (const char* fnamein,
+                    const char* fnameout,
+                    pack_opt_t *options);
 
 int do_copy_refobjs(hid_t fidin,
                     hid_t fidout,
                     trav_table_t *travt,
-                    pack_opt_t *options); /* repack options */
-
+                    pack_opt_t *options); 
 
-void read_info(const char *filename,pack_opt_t *options);
+/*-------------------------------------------------------------------------
+ * filters and verify module
+ *-------------------------------------------------------------------------
+ */
 void init_packobject(pack_info_t *obj);
-int print_filters(hid_t dcpl_id);
-int have_request(pack_opt_t *options);
-
 
 
 /*-------------------------------------------------------------------------
- * filters
+ * filters and copy module
  *-------------------------------------------------------------------------
  */
 
 int apply_filters(const char* name,    /* object name from traverse list */
                   int rank,            /* rank of dataset */
                   hsize_t *dims,       /* dimensions of dataset */
-                  hid_t dcpl_id,       /* (IN,OUT) dataset creation property list */
+                  hid_t dcpl_id,       /* dataset creation property list */
                   pack_opt_t *options, /* repack options */
-                  int *has_filter);     /* (OUT) object NAME has a filter */
-
-int can_read(const char* name,    /* object name from traverse list */
-             hid_t dcpl_id,       /* dataset creation property list */
-             pack_opt_t *options); /* repack options */
-
-
-/*-------------------------------------------------------------------------
- * layout functions
- *-------------------------------------------------------------------------
- */
-
-int has_layout(hid_t dcpl_id,
-               pack_info_t *obj);
-
-int layout_this(hid_t dcpl_id,             /* DCPL from input object */
-                const char* name,          /* object name from traverse list */
-                pack_opt_t *options,       /* repack options */
-                pack_info_t *pack /*OUT*/) /* object to apply layout */;
-
-int apply_layout(hid_t dcpl_id,
-                 pack_info_t *pack);  /* info about object  */
+                  int *has_filter);    /* (OUT) object NAME has a filter */
 
 
 /*-------------------------------------------------------------------------
@@ -221,15 +206,14 @@ pack_info_t* options_get_object( const char *path,
 obj_list_t* parse_filter(const char *str,
                          int *n_objs,
                          filter_info_t *filt,
-                         pack_opt_t *options);
+                         pack_opt_t *options,
+                         int *is_glb);
 
 obj_list_t* parse_layout(const char *str,
                          int *n_objs,
                          pack_info_t *pack,    /* info about object */
                          pack_opt_t *options);
 
-const char* get_sfilter (H5Z_filter_t filtn);
-int         parse_number(char *str);
 
 
 
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 9fce08a..2e411b0 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -36,7 +36,6 @@ H5DIFF_BIN=`pwd`/$H5DIFF        # The path of the h5diff  tool binary
 H5DETECTSZIP=testh5repack_detect_szip               # The tool name
 H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP    # The path of the tool binary
 
-
 INFO_FILE=../testfiles/info.h5repack
 
 FILE0=h5repack_fill.h5
@@ -428,6 +427,26 @@ TOOLTEST $FILE4 -l dset_chunk:CHUNK=18x13
 # Native option
 TOOLTEST $FILE1 -n
 
+
+# long swtiches. use FILE4=h5repack_layout.h5 (no filters)
+
+arg="$FILE4 --layout CHUNK=20x10 --filter GZIP=1 --threshold=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST $arg
+fi
+
+# several global filters
+
+arg="$FILE4 --filter GZIP=1 --filter SHUF"
+if test $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SHUFFLE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST $arg
+fi
+
+
 if test $nerrors -eq 0 ; then
    echo "All $H5REPACK tests passed."
 fi
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 6ad97d7..01ccc21 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -29,10 +29,6 @@ extern char  *progname;
  */
 #define FORMAT_OBJ      " %-27s %s\n"   /* obj type, name */
 #define FORMAT_OBJ_ATTR "  %-27s %s\n"  /* obj type, name */
-#define PER(A,B) { per = 0;                                            \
-                   if (A!=0)                                           \
-                    per = (double) fabs( (double)(B-A) / (double)A  ); \
-                 }
 #define USERBLOCK_XFER_SIZE     512             /* Size of buffer/# of bytes to xfer at a time when copying userblock */
 
 /*-------------------------------------------------------------------------
@@ -134,23 +130,23 @@ int copy_objects(const char* fnamein,
                 if(options->msg_size[i] > 0) {
                     switch(i) {
                         case 0:
-                            mesg_type_flags[nindex] = H5O_MESG_SDSPACE_FLAG;
+                            mesg_type_flags[nindex] = H5O_SHMESG_SDSPACE_FLAG;
                             break;
 
                         case 1:
-                            mesg_type_flags[nindex] = H5O_MESG_DTYPE_FLAG;
+                            mesg_type_flags[nindex] = H5O_SHMESG_DTYPE_FLAG;
                             break;
 
                         case 2:
-                            mesg_type_flags[nindex] = H5O_MESG_FILL_FLAG;
+                            mesg_type_flags[nindex] = H5O_SHMESG_FILL_FLAG;
                             break;
 
                         case 3:
-                            mesg_type_flags[nindex] = H5O_MESG_PLINE_FLAG;
+                            mesg_type_flags[nindex] = H5O_SHMESG_PLINE_FLAG;
                             break;
 
                         case 4:
-                            mesg_type_flags[nindex] = H5O_MESG_ATTR_FLAG;
+                            mesg_type_flags[nindex] = H5O_SHMESG_ATTR_FLAG;
                             break;
                     } /* end switch */
                     min_mesg_sizes[nindex] = (unsigned)options->msg_size[i];
@@ -180,7 +176,7 @@ int copy_objects(const char* fnamein,
                 goto out;
             } /* end if */
 
-            if(H5Pset_latest_format(fapl, TRUE) < 0) {
+            if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
                 error_msg(progname, "Could not set property for using latest version of the format\n");
                 goto out;
             } /* end if */
@@ -355,7 +351,6 @@ int do_copy_objects(hid_t fidin,
     hsize_t  dsize_out;         /* output dataset size after filter */
     int      apply_s;           /* flag for apply filter to small dataset sizes */
     int      apply_f;           /* flag for apply filter to return error on H5Dcreate */
-    double   per;               /* percent utilization of storage */
     void     *buf=NULL;         /* buffer for raw data */
     void     *sm_buf=NULL;      /* buffer for raw data */
     int      has_filter;        /* current object has a filter */
@@ -369,7 +364,7 @@ int do_copy_objects(hid_t fidin,
 
     if (options->verbose) {
         printf("-----------------------------------------\n");
-        printf(" Type     Filter (Ratio)     Name\n");
+        printf(" Type     Filter (%%Savings)     Name\n");
         printf("-----------------------------------------\n");
     }
 
@@ -437,9 +432,6 @@ int do_copy_objects(hid_t fidin,
              */
             case H5TRAV_TYPE_DATASET:
 
-                if (options->verbose)
-                    printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-
                 has_filter = 0;
 
                 /* early detection of references */
@@ -534,7 +526,13 @@ int do_copy_objects(hid_t fidin,
                             H5E_BEGIN_TRY {
                                 dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, H5P_DEFAULT, dcpl_out, H5P_DEFAULT);
                             } H5E_END_TRY;
-                            if(dset_out == FAIL) {
+
+                            if(dset_out == FAIL) 
+                            {
+                                if(options->verbose)
+                                     printf(" warning: could not create dataset <%s>. Applying original settings\n",
+                                            travt->objs[i].name);
+
                                 if((dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
                                     goto error;
                                 apply_f = 0;
@@ -665,10 +663,20 @@ int do_copy_objects(hid_t fidin,
                             {
                                 if (apply_s && apply_f)
                                 {
+                                    double per=0;
+                                    hssize_t a, b;
+
                                     /* get the storage size of the input dataset */
                                     dsize_out=H5Dget_storage_size(dset_out);
-                                    PER((hssize_t)dsize_in,(hssize_t)dsize_out);
-                                    print_dataset_info(dcpl_out,travt->objs[i].name,per*100.0);
+
+                                    a = dsize_in; b = dsize_out;
+                                    if (a!=0)
+                                        per = (double) (b-a)/a;
+                                   
+                                    per = -per;
+                                    per *=100;
+
+                                    print_dataset_info(dcpl_out,travt->objs[i].name,per);
                                 }
                                 else
                                     print_dataset_info(dcpl_id,travt->objs[i].name,0.0);
@@ -769,6 +777,11 @@ int do_copy_objects(hid_t fidin,
                     if(H5Dclose(dset_out) < 0)
                         goto error;
 
+
+                    if (options->verbose)
+                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                    
+
                 } /* end do we have request for filter/chunking */
 
 
@@ -894,143 +907,143 @@ int copy_attr(hid_t loc_in,
               pack_opt_t *options
               )
 {
- hid_t      attr_id=-1;      /* attr ID */
- hid_t      attr_out=-1;     /* attr ID */
- hid_t      space_id=-1;     /* space ID */
- hid_t      ftype_id=-1;     /* file type ID */
- hid_t      wtype_id=-1;     /* read/write type ID */
- size_t     msize;        /* size of type */
- void       *buf=NULL;    /* data buffer */
- hsize_t    nelmts;       /* number of elements in dataset */
- int        rank;         /* rank of dataset */
- hsize_t    dims[H5S_MAX_RANK];/* dimensions of dataset */
- char       name[255];
- H5O_info_t oinfo;              /* Object info */
- int        j;
- unsigned   u;
-
- if(H5Oget_info(loc_in, &oinfo) < 0)
-  goto error;
-
-/*-------------------------------------------------------------------------
- * copy all attributes
- *-------------------------------------------------------------------------
- */
-
- for ( u = 0; u < (unsigned)oinfo.num_attrs; u++)
- {
-
-   buf=NULL;
-
-  /* open attribute */
-  if((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto error;
-
-  /* get name */
-  if (H5Aget_name( attr_id, (size_t)255, name ) < 0)
-   goto error;
-
-  /* get the file datatype  */
-  if ((ftype_id = H5Aget_type( attr_id )) < 0 )
-   goto error;
-
-  /* get the dataspace handle  */
-  if ((space_id = H5Aget_space( attr_id )) < 0 )
-   goto error;
-
-  /* get dimensions  */
-  if ( (rank = H5Sget_simple_extent_dims(space_id, dims, NULL)) < 0 )
-   goto error;
-
-  nelmts=1;
-  for (j=0; juse_native==1)
-   wtype_id = h5tools_get_native_type(ftype_id);
-  else
-   wtype_id = H5Tcopy(ftype_id); 
-
-  if ((msize=H5Tget_size(wtype_id))==0)
-   goto error;
-
-/*-------------------------------------------------------------------------
- * object references are a special case
- * we cannot just copy the buffers, but instead we recreate the reference
- * this is done on a second sweep of the file that just copies
- * the referenced objects
- *-------------------------------------------------------------------------
- */
-
-  if (H5T_REFERENCE==H5Tget_class(wtype_id))
-  {
-      ;
-  }
-  else 
-  {
- /*-------------------------------------------------------------------------
-  * read to memory
-  *-------------------------------------------------------------------------
-  */
-
-   buf = (void *)HDmalloc((size_t)(nelmts * msize));
-   if(buf == NULL) {
-    error_msg(progname, "cannot read into memory\n" );
-    goto error;
-   }
-   if(H5Aread(attr_id, wtype_id, buf) < 0)
-    goto error;
-
+    hid_t      attr_id=-1;        /* attr ID */
+    hid_t      attr_out=-1;       /* attr ID */
+    hid_t      space_id=-1;       /* space ID */
+    hid_t      ftype_id=-1;       /* file type ID */
+    hid_t      wtype_id=-1;       /* read/write type ID */
+    size_t     msize;             /* size of type */
+    void       *buf=NULL;         /* data buffer */
+    hsize_t    nelmts;            /* number of elements in dataset */
+    int        rank;              /* rank of dataset */
+    hsize_t    dims[H5S_MAX_RANK];/* dimensions of dataset */
+    char       name[255];
+    H5O_info_t oinfo;             /* object info */
+    int        j;
+    unsigned   u;
+    
+    if(H5Oget_info(loc_in, &oinfo) < 0)
+        goto error;
+    
    /*-------------------------------------------------------------------------
-    * copy
+    * copy all attributes
     *-------------------------------------------------------------------------
     */
-
-   if((attr_out = H5Acreate2(loc_out, name, ftype_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    goto error;
-   if(H5Awrite(attr_out, wtype_id, buf) < 0)
-    goto error;
-
-   /*close*/
-   if(H5Aclose(attr_out) < 0)
-    goto error;
-
-
-   if(buf)
-    free(buf);
-
-  } /*H5T_REFERENCE*/
-
-
-  if(options->verbose)
-   printf(FORMAT_OBJ_ATTR, "attr", name);
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-
-  if (H5Tclose(ftype_id) < 0) goto error;
-  if (H5Tclose(wtype_id) < 0) goto error;
-  if (H5Sclose(space_id) < 0) goto error;
-  if (H5Aclose(attr_id) < 0) goto error;
-
- } /* u */
-
-
-  return 0;
-
+    
+    for ( u = 0; u < (unsigned)oinfo.num_attrs; u++)
+    {
+        
+        buf=NULL;
+        
+        /* open attribute */
+        if((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto error;
+        
+        /* get name */
+        if (H5Aget_name( attr_id, (size_t)255, name ) < 0)
+            goto error;
+        
+        /* get the file datatype  */
+        if ((ftype_id = H5Aget_type( attr_id )) < 0 )
+            goto error;
+        
+        /* get the dataspace handle  */
+        if ((space_id = H5Aget_space( attr_id )) < 0 )
+            goto error;
+        
+        /* get dimensions  */
+        if ( (rank = H5Sget_simple_extent_dims(space_id, dims, NULL)) < 0 )
+            goto error;
+        
+        nelmts=1;
+        for (j=0; juse_native==1)
+            wtype_id = h5tools_get_native_type(ftype_id);
+        else
+            wtype_id = H5Tcopy(ftype_id); 
+        
+        if ((msize=H5Tget_size(wtype_id))==0)
+            goto error;
+        
+       /*-------------------------------------------------------------------------
+        * object references are a special case
+        * we cannot just copy the buffers, but instead we recreate the reference
+        * this is done on a second sweep of the file that just copies
+        * the referenced objects
+        *-------------------------------------------------------------------------
+        */
+        
+        if (H5T_REFERENCE==H5Tget_class(wtype_id))
+        {
+            ;
+        }
+        else 
+        {
+          /*-------------------------------------------------------------------------
+           * read to memory
+           *-------------------------------------------------------------------------
+           */
+            
+            buf = (void *)HDmalloc((size_t)(nelmts * msize));
+            if(buf == NULL) {
+                error_msg(progname, "cannot read into memory\n" );
+                goto error;
+            }
+            if(H5Aread(attr_id, wtype_id, buf) < 0)
+                goto error;
+            
+           /*-------------------------------------------------------------------------
+            * copy
+            *-------------------------------------------------------------------------
+            */
+            
+            if((attr_out = H5Acreate2(loc_out, name, ftype_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                goto error;
+            if(H5Awrite(attr_out, wtype_id, buf) < 0)
+                goto error;
+            
+            /*close*/
+            if(H5Aclose(attr_out) < 0)
+                goto error;
+            
+            
+            if(buf)
+                free(buf);
+            
+        } /*H5T_REFERENCE*/
+        
+        
+        if(options->verbose)
+            printf(FORMAT_OBJ_ATTR, "attr", name);
+        
+        /*-------------------------------------------------------------------------
+         * close
+         *-------------------------------------------------------------------------
+         */
+        
+        if (H5Tclose(ftype_id) < 0) goto error;
+        if (H5Tclose(wtype_id) < 0) goto error;
+        if (H5Sclose(space_id) < 0) goto error;
+        if (H5Aclose(attr_id) < 0) goto error;
+        
+    } /* u */
+    
+    
+    return 0;
+    
 error:
- H5E_BEGIN_TRY {
-  H5Tclose(ftype_id);
-  H5Tclose(wtype_id);
-  H5Sclose(space_id);
-  H5Aclose(attr_id);
-  H5Aclose(attr_out);
-  if (buf)
-    free(buf);
- } H5E_END_TRY;
- return -1;
+    H5E_BEGIN_TRY {
+        H5Tclose(ftype_id);
+        H5Tclose(wtype_id);
+        H5Sclose(space_id);
+        H5Aclose(attr_id);
+        H5Aclose(attr_out);
+        if (buf)
+            free(buf);
+    } H5E_END_TRY;
+    return -1;
 }
 
 
@@ -1047,95 +1060,96 @@ static void print_dataset_info(hid_t dcpl_id,
                                char *objname,
                                double per)
 {
- char         strfilter[255];
+    char         strfilter[255];
 #if defined (PRINT_DEBUG )
- char         temp[255];
+    char         temp[255];
 #endif
- int          nfilters;       /* number of filters */
- unsigned     filt_flags;     /* filter flags */
- H5Z_filter_t filtn;          /* filter identification number */
- unsigned     cd_values[20];  /* filter client data values */
- size_t       cd_nelmts;      /* filter client number of values */
- char         f_objname[256];    /* filter objname */
- int          i;
-
- strcpy(strfilter,"\0");
-
- /* get information about input filters */
- if((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
-  return;
-
- for(i = 0; i < nfilters; i++) {
-  cd_nelmts = NELMTS(cd_values);
-
-  filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
-   cd_values, sizeof(f_objname), f_objname, NULL);
-
-  switch(filtn) {
-  default:
-   break;
-
-  case H5Z_FILTER_DEFLATE:
-   strcat(strfilter,"GZIP ");
-
+    int          nfilters;       /* number of filters */
+    unsigned     filt_flags;     /* filter flags */
+    H5Z_filter_t filtn;          /* filter identification number */
+    unsigned     cd_values[20];  /* filter client data values */
+    size_t       cd_nelmts;      /* filter client number of values */
+    char         f_objname[256];    /* filter objname */
+    int          i;
+    
+    
+    strcpy(strfilter,"\0");
+    
+    /* get information about input filters */
+    if((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+        return;
+    
+    for(i = 0; i < nfilters; i++) {
+        cd_nelmts = NELMTS(cd_values);
+        
+        filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
+            cd_values, sizeof(f_objname), f_objname, NULL);
+        
+        switch(filtn) {
+        default:
+            break;
+            
+        case H5Z_FILTER_DEFLATE:
+            strcat(strfilter,"GZIP ");
+            
 #if defined (PRINT_DEBUG)
-   {
-    unsigned level=cd_values[0];
-    sprintf(temp,"(%d)",level);
-    strcat(strfilter,temp);
-   }
+            {
+                unsigned level=cd_values[0];
+                sprintf(temp,"(%d)",level);
+                strcat(strfilter,temp);
+            }
 #endif
-   break;
-
-  case H5Z_FILTER_SZIP:
-   strcat(strfilter,"SZIP ");
-
+            break;
+            
+        case H5Z_FILTER_SZIP:
+            strcat(strfilter,"SZIP ");
+            
 #if defined (PRINT_DEBUG)
-   {
-    unsigned options_mask=cd_values[0]; /* from dcpl, not filt*/
-    unsigned ppb=cd_values[1];
-    sprintf(temp,"(%d,",ppb);
-    strcat(strfilter,temp);
-    if (options_mask & H5_SZIP_EC_OPTION_MASK)
-     strcpy(temp,"EC) ");
-    else if (options_mask & H5_SZIP_NN_OPTION_MASK)
-     strcpy(temp,"NN) ");
-   }
-   strcat(strfilter,temp);
-
+            {
+                unsigned options_mask=cd_values[0]; /* from dcpl, not filt*/
+                unsigned ppb=cd_values[1];
+                sprintf(temp,"(%d,",ppb);
+                strcat(strfilter,temp);
+                if (options_mask & H5_SZIP_EC_OPTION_MASK)
+                    strcpy(temp,"EC) ");
+                else if (options_mask & H5_SZIP_NN_OPTION_MASK)
+                    strcpy(temp,"NN) ");
+            }
+            strcat(strfilter,temp);
+            
 #endif
-
-   break;
-
-  case H5Z_FILTER_SHUFFLE:
-   strcat(strfilter,"SHUF ");
-   break;
-
-  case H5Z_FILTER_FLETCHER32:
-   strcat(strfilter,"FLET ");
-   break;
-
-  case H5Z_FILTER_NBIT:
-   strcat(strfilter,"NBIT ");
-   break;
-
-  case H5Z_FILTER_SCALEOFFSET:
-   strcat(strfilter,"SCALEOFFSET ");
-   break;
-  } /* switch */
- }/*i*/
-
- if(*strfilter == '\0')
-  printf(FORMAT_OBJ,"dset",objname );
- else
- {
-  char str[255], temp[20];
-  strcpy(str,"dset     ");
-  strcat(str,strfilter);
-  sprintf(temp,"  (%.1f%%)",per);
-  strcat(str,temp);
-  printf(FORMAT_OBJ,str,objname);
- }
+            
+            break;
+            
+        case H5Z_FILTER_SHUFFLE:
+            strcat(strfilter,"SHUF ");
+            break;
+            
+        case H5Z_FILTER_FLETCHER32:
+            strcat(strfilter,"FLET ");
+            break;
+            
+        case H5Z_FILTER_NBIT:
+            strcat(strfilter,"NBIT ");
+            break;
+            
+        case H5Z_FILTER_SCALEOFFSET:
+            strcat(strfilter,"SCALEOFFSET ");
+            break;
+        } /* switch */
+    }/*i*/
+    
+    if(*strfilter == '\0')
+        printf(FORMAT_OBJ,"dset",objname );
+    else
+    {
+        char str[255], temp[20];
+        strcpy(str,"dset     ");
+        strcat(str,strfilter);
+        sprintf(temp,"  (%.1f%%)",per);
+        strcat(str,temp);
+        printf(FORMAT_OBJ,str,objname);
+    }
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 0e7a557..98ef07e 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -122,7 +122,7 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
         {
             /* assign the global filter */
             tmp.nfilters=1;
-            tmp.filter[0]=options->filter_g;
+            tmp.filter[0]=options->filter_g[0];
         } /* if all */
         else
         {
@@ -144,9 +144,12 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
         
         if (options->all_filter)
         {
-            /* assign the global filter */
-            tmp.nfilters=1;
-            tmp.filter[0]=options->filter_g;
+            int k;
+
+            /* assign the global filters */
+            tmp.nfilters=options->n_filter_g;
+            for ( k = 0; k < options->n_filter_g; k++)
+                tmp.filter[k]=options->filter_g[k];
         }
         if (options->all_layout)
         {
@@ -168,8 +171,7 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
     *obj = tmp;
     return 1;
     
-}
-                   
+}       
 
 
 /*-------------------------------------------------------------------------
@@ -191,7 +193,7 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
 int apply_filters(const char* name,    /* object name from traverse list */
                   int rank,            /* rank of dataset */
                   hsize_t *dims,       /* dimensions of dataset */
-                  hid_t dcpl_id,       /* (IN,OUT) dataset creation property list */
+                  hid_t dcpl_id,       /* dataset creation property list */
                   pack_opt_t *options, /* repack options */
                   int *has_filter)     /* (OUT) object NAME has a filter */
 
@@ -262,12 +264,12 @@ int apply_filters(const char* name,    /* object name from traverse list */
     /*-------------------------------------------------------------------------
     * the type of filter and additional parameter
     * type can be one of the filters
-    * H5Z_FILTER_NONE       0,  uncompress if compressed
-    * H5Z_FILTER_DEFLATE      1 , deflation like gzip
-    * H5Z_FILTER_SHUFFLE    2 , shuffle the data
-    * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
-    * H5Z_FILTER_SZIP       4 , szip compression
-    * H5Z_FILTER_NBIT       5 , nbit compression
+    * H5Z_FILTER_NONE        0 , uncompress if compressed
+    * H5Z_FILTER_DEFLATE     1 , deflation like gzip
+    * H5Z_FILTER_SHUFFLE     2 , shuffle the data
+    * H5Z_FILTER_FLETCHER32  3 , fletcher32 checksum of EDC
+    * H5Z_FILTER_SZIP        4 , szip compression
+    * H5Z_FILTER_NBIT        5 , nbit compression
     * H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
     *-------------------------------------------------------------------------
     */
@@ -275,10 +277,10 @@ int apply_filters(const char* name,    /* object name from traverse list */
     if (obj.nfilters)
     {
         
-    /*-------------------------------------------------------------------------
+   /*-------------------------------------------------------------------------
     * filters require CHUNK layout; if we do not have one define a default
     *-------------------------------------------------------------------------
-        */
+    */
         if (obj.layout==-1)
         {
             obj.chunk.rank=rank;
@@ -412,48 +414,3 @@ int apply_filters(const char* name,    /* object name from traverse list */
  return 0;
 }
 
-/*-------------------------------------------------------------------------
- * Function: print_filters
- *
- * Purpose: print the filters in DCPL
- *
- * Return: 0, ok, -1 no
- *
- *-------------------------------------------------------------------------
- */
-
-int print_filters(hid_t dcpl_id)
-{
- int          nfilters;       /* number of filters */
- unsigned     filt_flags;     /* filter flags */
- H5Z_filter_t filtn;          /* filter identification number */
- unsigned     cd_values[20];  /* filter client data values */
- size_t       cd_nelmts;      /* filter client number of values */
- size_t       cd_num;         /* filter client data counter */
- char         f_name[256];    /* filter name */
- char         s[64];          /* temporary string buffer */
- int          i;
-
- /* get information about filters */
- if((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
-  return -1;
-
- for(i = 0; i < nfilters; i++) {
-  cd_nelmts = NELMTS(cd_values);
-  filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
-   cd_values, sizeof(f_name), f_name, NULL);
-
-  f_name[sizeof(f_name)-1] = '\0';
-  sprintf(s, "Filter-%d:", i);
-  printf("    %-10s %s-%u %s {", s,
-   f_name[0] ? f_name : "method",
-   (unsigned)filtn,
-   filt_flags & H5Z_FLAG_OPTIONAL?"OPT":"");
-  for(cd_num = 0; cd_num < cd_nelmts; cd_num++)
-   printf("%s%u", cd_num?", ":"", cd_values[cd_num]);
-  printf("}\n");
- }
-
- return 0;
-}
-
diff --git a/tools/h5repack/h5repack_list.c b/tools/h5repack/h5repack_list.c
deleted file mode 100644
index 4e1e072..0000000
--- a/tools/h5repack/h5repack_list.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include 
-#include 
-#include 
-#include "h5repack.h"
-#include "H5private.h"
-#include "h5tools_utils.h"
-#include "h5diff.h"
-#include "h5tools.h"
-
-extern char  *progname;
-
-/*-------------------------------------------------------------------------
- * Function: check_objects
- *
- * Purpose: locate all HDF5 objects in the file and compare with user
- *  supplied list
- *
- * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: September, 23, 2003
- *
- *-------------------------------------------------------------------------
- */
-int check_objects(const char* fname,
-                  pack_opt_t *options)
-{
-    hid_t         fid;
-    unsigned int  i;
-    trav_table_t  *travt = NULL;
-    
-    /* nothing to do */
-    if(options->op_tbl->nelems == 0)
-        return 0;
-    
-    /*-------------------------------------------------------------------------
-     * open the file
-     *-------------------------------------------------------------------------
-     */
-    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0)) < 0){
-        printf("<%s>: %s\n", fname, H5FOPENERROR );
-        return -1;
-    }
-    
-    /*-------------------------------------------------------------------------
-     * get the list of objects in the file
-     *-------------------------------------------------------------------------
-     */
-    
-    /* init table */
-    trav_table_init(&travt);
-    
-    /* get the list of objects in the file */
-    if(h5trav_gettable(fid, travt) < 0)
-        goto out;
-    
-    /*-------------------------------------------------------------------------
-     * compare with user supplied list
-     *-------------------------------------------------------------------------
-     */
-    
-    if(options->verbose)
-        printf("Opening file <%s>. Searching for objects to modify...\n", fname);
-    
-    for(i = 0; i < options->op_tbl->nelems; i++) {
-        char* name=options->op_tbl->objs[i].path;
-        if(options->verbose)
-            printf(" <%s>",name);
-        
-        /* the input object names are present in the file and are valid */
-        if(h5trav_getindext(name, travt) < 0) {
-            error_msg(progname, "%s Could not find <%s> in file <%s>. Exiting...\n",
-                (options->verbose?"\n":""),name,fname);
-            goto out;
-        }
-        if(options->verbose)
-            printf("...Found\n");
-
-        /* check for extra filter conditions */
-        switch(options->op_tbl->objs[i].filter->filtn) {
-            /* chunk size must be smaller than pixels per block */
-            case H5Z_FILTER_SZIP:
-            {
-                int     j;
-                int     csize = 1;
-                int     ppb = options->op_tbl->objs[i].filter->cd_values[0];
-                hsize_t dims[H5S_MAX_RANK];
-                int     rank;
-                hid_t   did;
-                hid_t   sid;
-                
-                if(options->op_tbl->objs[i].chunk.rank > 0) {
-                    rank = options->op_tbl->objs[i].chunk.rank;
-                    for(j = 0; j < rank; j++)
-                        csize *= (int)options->op_tbl->objs[i].chunk.chunk_lengths[j];
-                }
-                else {
-                    if((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
-                        goto out;
-                    if((sid = H5Dget_space(did)) < 0)
-                        goto out;
-                    if((rank = H5Sget_simple_extent_ndims(sid)) < 0)
-                        goto out;
-                    HDmemset(dims, 0, sizeof dims);
-                    if(H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
-                        goto out;
-                    for(j = 0; j < rank; j++)
-                        csize *= (int)dims[j];
-                    if(H5Sclose(sid) < 0)
-                        goto out;
-                    if(H5Dclose(did) < 0)
-                        goto out;
-                }
-                
-                if (csize < ppb ) {
-                    printf(" \n");
-                    goto out;
-                }
-            }
-            break;
-        }
-    } /* i */
-      
-   /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    H5Fclose(fid);
-    trav_table_free(travt);
-    return 0;
-    
-out:
-    H5Fclose(fid);
-    trav_table_free(travt);
-    return -1;
-}
-
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 6f65bc9..17056c4 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -15,18 +15,16 @@
 
 #include 
 #include 
+#include 
+
 #include "h5tools_utils.h"
 #include "h5repack.h"
 
-#if 0
-#define OLD
-#endif
 
-#if defined (OLD)
-static void usage(void);
-#else
 static void usage(const char *prog);
-#endif
+static int  parse_number(char *str);
+static void parse_command_line(int argc, const char* argv[], pack_opt_t* options);
+static void read_info(const char *filename,pack_opt_t *options);
 
 
 /* module-scoped variables */
@@ -54,161 +52,199 @@ static struct long_options l_opts[] = {
     { NULL, 0, '\0' }
 };
 
+
+
+
 /*-------------------------------------------------------------------------
- * Function: parse_command_line
+ * Function: main
  *
- * Purpose: parse command line input
+ * Purpose: h5repack main program
+ *
+ * Return: 1, error, 0, no error
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications: 
+ *  July 2004: Introduced the extra EC or NN option for SZIP
+ *  October 2006: Added a new switch -n, that allows to write the dataset 
+ *                using a native type. The default to write is the file type.
  *
+ * Modification:
+ *   Peter Cao, June 13, 2007
+ *    Add "-L, --latest" option to pack a file with the latest file format
+ *   PVN, November 19, 2007
+ *    adopted the syntax h5repack [OPTIONS]  file1 file2
+ *   PVN, November 28, 2007
+ *    added support for multiple global filters
  *-------------------------------------------------------------------------
  */
-
-#if 0
-#define OLD
-#endif
-
-#if defined (OLD)
-
-
-void parse_command_line(int argc, 
-                        const char* argv[], 
-                        char** fname1, 
-                        char** fname2,
-                        pack_opt_t* options)
+int main(int argc, char **argv)
 {
+    char          *infile  = NULL;
+    char          *outfile = NULL;
+    pack_opt_t    options;            /*the global options */
+    int           ret;
     
-    int i;
+    /* initialize options  */
+    h5repack_init (&options,0);
+
+    parse_command_line(argc, argv, &options);
     
-    if (argc<2)
+    if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) 
     {
-        usage();
-        exit(1);
+        infile = argv[ opt_ind ];
+        outfile = argv[ opt_ind + 1 ];
+
+        if ( strcmp( infile, outfile ) == 0 )
+        {
+            error_msg(progname, "file names cannot be the same\n");
+            usage(progname);
+            exit(EXIT_FAILURE);
+            
+        }
     }
     
-    for ( i = 1; i < argc; i++)
+    else
     {
-        if (strcmp(argv[i], "-h") == 0) {
-            usage();
-            exit(0);
-        }
-        else if (strcmp(argv[i], "-V") == 0) {
-            print_version(progname);
-            exit(0);
-        }
-        else if (strcmp(argv[i], "-i") == 0) {
-            *fname1 = argv[++i];
-        }
-        else if (strcmp(argv[i], "-o") == 0) {
-            *fname2 = argv[++i];
-        }
-        else if (strcmp(argv[i], "-v") == 0) {
-            options->verbose = 1;
-        }
-        else if (strcmp(argv[i], "-f") == 0) {
-            
-            /* add the -f filter option */
-            if (h5repack_addfilter(argv[i+1], options)<0)
-            {
-                error_msg(progname, "in parsing filter\n");
-                exit(1);
-            }
-            
-            /* jump to next */
-            ++i;
-        }
-        else if (strcmp(argv[i], "-l") == 0) {
-            
-            /* parse the -l layout option */
-            if (h5repack_addlayout(argv[i+1], options)<0)
-            {
-                error_msg(progname, "in parsing layout\n");
-                exit(1);
-            }
-            
-            /* jump to next */
-            ++i;
-        }
-        
-        else if (strcmp(argv[i], "-m") == 0) {
-            options->threshold = parse_number(argv[i+1]);
-            if ((int)options->threshold==-1) {
-                error_msg(progname, "invalid treshold size <%s>\n",argv[i+1]);
-                exit(1);
-            }
-            ++i;
-        }
-        
-        else if (strcmp(argv[i], "-e") == 0) {
-            read_info(argv[++i], options);
-        }
-        else if (strcmp(argv[i], "-n") == 0) {
-            options->use_native = 1;
-        }
-        
-        else if ( (strcmp(argv[i], "-L") == 0) || (strcmp(argv[i], "--latest") == 0)) {
-            options->latest = 1; 
-        }
-        
-        else if ( strncmp(argv[i], "-compact=", 9) == 0 ) {
-            options->grp_compact = atoi(argv[i]+9);
-            if (options->grp_compact>0)
-                options->latest = 1; /* must use latest format */
-        }
-        
-        else if ( strncmp(argv[i], "-indexed=", 9) == 0 ) {
-            options->grp_indexed = atoi(argv[i]+9);
-            if (options->grp_indexed>0)
-                options->latest = 1; /* must use latest format */
-        }
-        
-        else if ( strncmp(argv[i], "-ssize=", 7) == 0 ) {
-            int idx = 0;
-            int ssize = 0;
-            char *msgPtr = strchr(argv[i]+7, ':');
-            options->latest = 1; /* must use latest format */
-            if (msgPtr == NULL) {
-                ssize = atoi(argv[i]+7);
-                for (idx=0; idx<5; idx++)
-                    options->msg_size[idx] = ssize; 
-            }
-            else {
-                char msgType[10];
-                strcpy(msgType, msgPtr+1);
-                msgPtr[0] = '\0';
-                ssize = atoi(argv[i]+7);
-                if (strcmp(msgType, "dspace") == 0) {
-                    options->msg_size[0] = ssize;
-                }
-                else if (strcmp(msgType, "dtype") == 0) {
-                    options->msg_size[1] = ssize;
-                }
-                else if (strcmp(msgType, "fill") == 0) {
-                    options->msg_size[2] = ssize;
-                }
-                else if (strcmp(msgType, "pline") == 0) {
-                    options->msg_size[3] = ssize;
-                }
-                else if (strcmp(msgType, "attr") == 0) {
-                    options->msg_size[4] = ssize;
-                }
-            }
-        } /*  else if ( strncmp(argv[i], "-ssize=", 7) == 0 ) */
-        
-        else if (argv[i][0] == '-') {
-            error_msg(progname, " - is not a valid argument\n");
-            usage();
-            exit(1);
-        }
-        
- }
- 
+        error_msg(progname, "file names missing\n");
+        usage(progname);
+        exit(EXIT_FAILURE);
+    }
+
+  
+    /* pack it */
+    ret=h5repack(infile,outfile,&options);
+    
+    /* free tables */
+    h5repack_end(&options);
+    
+    if (ret==-1)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: usage
+ *
+ * Purpose: print usage
+ *
+ * Return: void
+ *
+ *-------------------------------------------------------------------------
+ */
+static void usage(const char *prog)
+{
+ printf("usage: %s [OPTIONS] file1 file2\n", prog);
+ printf("  file1                    Input HDF5 File\n");
+ printf("  file2                    Output HDF5 File\n");
+ printf("  OPTIONS\n");
+ printf("   -h, --help              Print a usage message and exit\n");
+ printf("   -v, --verbose           Verbose mode, print object information\n");
+ printf("   -V, --version           Print version number and exit\n");
+ printf("   -n, --native            Use a native HDF5 type when repacking\n");
+ printf("   -L, --latest            Use latest version of file format\n");
+ printf("   -c L1, --compact=L1     Maximum number of links in header messages\n");
+ printf("   -i L2, --indexed=L2     Minimum number of links in the indexed format\n");
+ printf("   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
+ printf("   -m T, --threshold=T     Do not apply the filter to datasets smaller than T\n");
+ printf("   -e M, --file=M          Name of file M with the -f and -l options\n");
+ printf("   -f FILT, --filter=FILT  Filter type\n");
+ printf("   -l LAYT, --layout=LAYT  Layout type\n");
  
+ printf("\n");
+
+ printf("  T - is an integer greater than 1, size of dataset in bytes \n");
+ printf("  M - is a filename.\n");
+ printf("  F - is the shared object header message type, any of . If F is not specified, S applies to all messages\n");
+
+ printf("\n");
+
+ printf("  FILT - is a string with the format:\n");
+ printf("\n");
+ printf("    :=\n");
+ printf("\n");
+ printf("     is a comma separated list of object names, meaning apply\n");
+ printf("      compression only to those objects. If no names are specified, the filter\n");
+ printf("      is applied to all objects\n");
+ printf("     can be:\n");
+ printf("      GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
+ printf("      SZIP, to apply the HDF5 SZIP filter (SZIP compression)\n");
+ printf("      SHUF, to apply the HDF5 shuffle filter\n");
+ printf("      FLET, to apply the HDF5 checksum filter\n");
+ printf("      NBIT, to apply the HDF5 NBIT filter (NBIT compression)\n");
+ printf("      SOFF, to apply the HDF5 Scale/Offset filter\n");
+ printf("      NONE, to remove all filters\n");
+ printf("     is optional filter parameter information\n");
+ printf("      GZIP= from 1-9\n");
+ printf("      SZIP= pixels per block is a even number in\n");
+ printf("            2-32 and coding method is either EC or NN\n");
+ printf("      SHUF (no parameter)\n");
+ printf("      FLET (no parameter)\n");
+ printf("      NBIT (no parameter)\n");
+ printf("      SOFF= scale_factor is an integer and scale_type\n");
+ printf("            is either IN or DS\n");
+ printf("      NONE (no parameter)\n");
+ printf("\n");
+ printf("  LAYT - is a string with the format:\n");
+ printf("\n");
+ printf("    :=\n");
+ printf("\n");
+ printf("     is a comma separated list of object names, meaning that\n");
+ printf("      layout information is supplied for those objects. If no names are\n");
+ printf("      specified, the layout type is applied to all objects\n");
+ printf("     can be:\n");
+ printf("      CHUNK, to apply chunking layout\n");
+ printf("      COMPA, to apply compact layout\n");
+ printf("      CONTI, to apply continuous layout\n");
+ printf("     is optional layout information\n");
+ printf("      CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
+ printf("      COMPA (no parameter)\n");
+ printf("      CONTI (no parameter)\n");
+ printf("\n");
+ printf("Examples of use:\n");
+ printf("\n");
+ printf("1) h5repack -v -f GZIP=1 file1 file2\n");
+ printf("\n");
+ printf("   GZIP compression with level 1 to all objects\n");
+ printf("\n");
+ printf("2) h5repack -v -f A:SZIP=8,NN file1 file2\n");
+ printf("\n");
+ printf("   SZIP compression with 8 pixels per block and NN coding method to object A\n");
+ printf("\n");
+ printf("3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2\n");
+ printf("\n");
+ printf("   Chunked layout, with a layout size of 20x10, to objects A and B\n");
+ printf("   and remove filters to objects C, D, F\n");
+ printf("\n");
+ printf("4) h5repack -L -c 10 -s 20:dtype file1 file2 \n");
+ printf("\n");
+ printf("   Using latest file format with maximum compact group size of 10 and\n");
+ printf("   and minimum shared datatype size of 20\n");
+ printf("\n");
+ printf("5) h5repack -f SHUF -f GZIP=1 file1 file2 \n");
+ printf("\n");
+ printf("   Add both filters SHUF and GZIP in this order to all datasets\n");
+ printf("\n");
 }
 
-#else
 
-void parse_command_line(int argc, 
-                        const char* argv[], 
-                        pack_opt_t* options)
+/*-------------------------------------------------------------------------
+ * Function: parse_command_line
+ *
+ * Purpose: parse command line input
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static void parse_command_line(int argc, const char* argv[], pack_opt_t* options)
 {
     
     int opt;
@@ -336,275 +372,164 @@ void parse_command_line(int argc,
         usage(progname);
         exit(EXIT_FAILURE);
     }
-    
-    
+      
 
  
  
 }
 
-
-#endif
-
 /*-------------------------------------------------------------------------
- * Function: main
+ * Function: parse_number
  *
- * Purpose: h5repack main program
+ * Purpose: read a number from command line argument
  *
- * Return: 1, error, 0, no error
+ * Return: number, -1 for FAIL
  *
  * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
- * Date: May 9, 2003
+ * Date: September, 23, 2003
  *
- * Comments:
- *
- * Modifications: 
- *  July 2004: Introduced the extra EC or NN option for SZIP
- *  October 2006: Added a new switch -n, that allows to write the dataset 
- *                using a native type. The default to write is the file type.
- *
- * Modification:
- *   Peter Cao, June 13, 2007
- *    Add "-L, --latest" option to pack a file with the latest file format
- *   PVN, November 19, 2007
- *    adopted the syntax h5repack [OPTIONS]  file1 file2
  *-------------------------------------------------------------------------
  */
-int main(int argc, char **argv)
-{
-    char          *infile  = NULL;
-    char          *outfile = NULL;
-    pack_opt_t    options;            /*the global options */
-    int           ret;
-    
-    /* initialize options  */
-    h5repack_init (&options,0);
 
-#if defined (OLD)
-    
-    parse_command_line(argc, argv, &infile, &outfile, &options);
-    
-   
-#else
 
-    parse_command_line(argc, argv, &options);
-    
-    if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) 
-    {
-        infile = argv[ opt_ind ];
-        outfile = argv[ opt_ind + 1 ];
-    }
+int parse_number(char *str)
+{
+    unsigned    i;
+    int         n;
+    char        c;
+    size_t      len=strlen(str);
     
-    else
+    for ( i=0; i, --compact=]      Set the maximum number of links to store as header messages in a group\n");
- printf("[-i , --indexed=]      Set the minimum number of links to store in the indexed format\n");
- printf("[-s, --ssize=[:]]      Set the shared object header message minimum size\n");
- printf("[-m size]      Do not apply the filter to objects smaller than size\n");
- printf("[-e file]      Name of file with the -f and -l options\n");
- printf("[-f FILTER]    Filter type\n");
- printf("[-l LAYOUT]    Layout type\n");
- printf("\n");
- printf("FILTER is a string with the format:\n");
- printf("\n");
- printf("    :=\n");
- printf("\n");
- printf("     is a comma separated list of object names, meaning apply\n");
- printf("      compression only to those objects. If no names are specified, the filter\n");
- printf("      is applied to all objects\n");
- printf("     can be:\n");
- printf("      GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
- printf("      SZIP, to apply the HDF5 SZIP filter (SZIP compression)\n");
- printf("      SHUF, to apply the HDF5 shuffle filter\n");
- printf("      FLET, to apply the HDF5 checksum filter\n");
- printf("      NBIT, to apply the HDF5 NBIT filter (NBIT compression)\n");
- printf("      SOFF, to apply the HDF5 Scale/Offset filter\n");
- printf("      NONE, to remove all filters\n");
- printf("     is optional filter parameter information\n");
- printf("      GZIP= from 1-9\n");
- printf("      SZIP= pixels per block is a even number in\n");
- printf("            2-32 and coding method is either EC or NN\n");
- printf("      SHUF (no parameter)\n");
- printf("      FLET (no parameter)\n");
- printf("      NBIT (no parameter)\n");
- printf("      SOFF= scale_factor is an integer and scale_type\n");
- printf("            is either IN or DS\n");
- printf("      NONE (no parameter)\n");
- printf("\n");
- printf("LAYOUT is a string with the format:\n");
- printf("\n");
- printf("    :=\n");
- printf("\n");
- printf("     is a comma separated list of object names, meaning that\n");
- printf("      layout information is supplied for those objects. If no names are\n");
- printf("      specified, the layout type is applied to all objects\n");
- printf("     can be:\n");
- printf("      CHUNK, to apply chunking layout\n");
- printf("      COMPA, to apply compact layout\n");
- printf("      CONTI, to apply continuous layout\n");
- printf("     is optional layout information\n");
- printf("      CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
- printf("      COMPA (no parameter)\n");
- printf("      CONTI (no parameter)\n");
- printf("\n");
- printf("Examples of use:\n");
- printf("\n");
- printf("1) h5repack -v -i file1 -o file2 -f GZIP=1\n");
- printf("\n");
- printf("   GZIP compression with level 1 to all objects\n");
- printf("\n");
- printf("2) h5repack -v -i file1 -o file2 -f A:SZIP=8,NN\n");
- printf("\n");
- printf("   SZIP compression with 8 pixels per block and NN coding method to object A\n");
- printf("\n");
- printf("3) h5repack -v -i file1 -o file2 -l A,B:CHUNK=20x10 -f C,D,F:NONE\n");
- printf("\n");
- printf("   Chunked layout, with a layout size of 20x10, to objects A and B\n");
- printf("   and remove filters to objects C, D, F\n");
- printf("\n");
- printf("4) h5repack -L -compact=10 -ssize=20:dtype -i file1 -o file2 \n");
- printf("\n");
- printf("   Using latest file format with maximum compact group size fo 10 and minimum shared datatype size of 20\n");
- printf("\n");
-}
-
-#else
-
-static void usage(const char *prog)
-{
- printf("usage: %s [OPTIONS] file1 file2\n", prog);
- printf("  file1                    Input HDF5 File\n");
- printf("  file2                    Output HDF5 File\n");
- printf("  OPTIONS\n");
- printf("   -h, --help              Print a usage message and exit\n");
- printf("   -v, --verbose           Verbose mode, print object information\n");
- printf("   -V, --version           Print version number and exit\n");
- printf("   -n, --native            Use a native HDF5 type when repacking\n");
- printf("   -L, --latest            Use latest version of file format\n");
- printf("   -c L1, --compact=L1     Maximum number of links in header messages\n");
- printf("   -i L2, --indexed=L2     Minimum number of links in the indexed format\n");
- printf("   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
- printf("   -m T, --threshold=T     Do not apply the filter to objects smaller than T\n");
- printf("   -e M, --file=M          Name of file M with the -f and -l options\n");
- printf("   -f FILT, --filter=FILT  Filter type\n");
- printf("   -l LAYT, --layout=LAYT  Layout type\n");
- 
- printf("\n");
-
- printf("  T - is an integer greater than 1\n");
- printf("  M - is a filename.\n");
- printf("  F - is the shared object header message type, any of\n");
- printf("        \n");
-
- printf("\n");
-
- printf("  FILT - is a string with the format:\n");
- printf("\n");
- printf("    :=\n");
- printf("\n");
- printf("     is a comma separated list of object names, meaning apply\n");
- printf("      compression only to those objects. If no names are specified, the filter\n");
- printf("      is applied to all objects\n");
- printf("     can be:\n");
- printf("      GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
- printf("      SZIP, to apply the HDF5 SZIP filter (SZIP compression)\n");
- printf("      SHUF, to apply the HDF5 shuffle filter\n");
- printf("      FLET, to apply the HDF5 checksum filter\n");
- printf("      NBIT, to apply the HDF5 NBIT filter (NBIT compression)\n");
- printf("      SOFF, to apply the HDF5 Scale/Offset filter\n");
- printf("      NONE, to remove all filters\n");
- printf("     is optional filter parameter information\n");
- printf("      GZIP= from 1-9\n");
- printf("      SZIP= pixels per block is a even number in\n");
- printf("            2-32 and coding method is either EC or NN\n");
- printf("      SHUF (no parameter)\n");
- printf("      FLET (no parameter)\n");
- printf("      NBIT (no parameter)\n");
- printf("      SOFF= scale_factor is an integer and scale_type\n");
- printf("            is either IN or DS\n");
- printf("      NONE (no parameter)\n");
- printf("\n");
- printf("  LAYT - is a string with the format:\n");
- printf("\n");
- printf("    :=\n");
- printf("\n");
- printf("     is a comma separated list of object names, meaning that\n");
- printf("      layout information is supplied for those objects. If no names are\n");
- printf("      specified, the layout type is applied to all objects\n");
- printf("     can be:\n");
- printf("      CHUNK, to apply chunking layout\n");
- printf("      COMPA, to apply compact layout\n");
- printf("      CONTI, to apply continuous layout\n");
- printf("     is optional layout information\n");
- printf("      CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
- printf("      COMPA (no parameter)\n");
- printf("      CONTI (no parameter)\n");
- printf("\n");
- printf("Examples of use:\n");
- printf("\n");
- printf("1) h5repack -v -f GZIP=1 file1 file2\n");
- printf("\n");
- printf("   GZIP compression with level 1 to all objects\n");
- printf("\n");
- printf("2) h5repack -v -f A:SZIP=8,NN file1 file2\n");
- printf("\n");
- printf("   SZIP compression with 8 pixels per block and NN coding method to object A\n");
- printf("\n");
- printf("3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2\n");
- printf("\n");
- printf("   Chunked layout, with a layout size of 20x10, to objects A and B\n");
- printf("   and remove filters to objects C, D, F\n");
- printf("\n");
- printf("4) h5repack -L -c 10 -s 20:dtype file1 file2 \n");
- printf("\n");
- printf("   Using latest file format with maximum compact group size of 10 and\n");
- printf("   and minimum shared datatype size of 20\n");
- printf("\n");
+    
+    char stype[10];
+    char comp_info[1024];
+    FILE *fp;
+    char c;
+    int  i, rc=1;
+    char  *srcdir = getenv("srcdir"); /* the source directory */
+    char  data_file[512]="";          /* buffer to hold name of existing file */
+    
+    /* compose the name of the file to open, using the srcdir, if appropriate */
+    if (srcdir){
+        strcpy(data_file,srcdir);
+        strcat(data_file,"/");
+    }
+    strcat(data_file,filename);
+    
+    
+    if ((fp = fopen(data_file, "r")) == (FILE *)NULL) {
+        error_msg(progname, "cannot open options file %s\n", filename);
+        exit(1);
+    }
+    
+    /* cycle until end of file reached */
+    while( 1 )
+    {
+        rc=fscanf(fp, "%s", stype);
+        if (rc==-1)
+            break;
+        
+       /*-------------------------------------------------------------------------
+        * filter
+        *-------------------------------------------------------------------------
+        */
+        if (strcmp(stype,"-f") == 0) {
+            
+            /* find begining of info */
+            i=0; c='0';
+            while( c!=' ' )
+            {
+                fscanf(fp, "%c", &c);
+                if (feof(fp)) break;
+            }
+            c='0';
+            /* go until end */
+            while( c!=' ' )
+            {
+                fscanf(fp, "%c", &c);
+                comp_info[i]=c;
+                i++;
+                if (feof(fp)) break;
+                if (c==10 /*eol*/) break;
+            }
+            comp_info[i-1]='\0'; /*cut the last " */
+            
+            if (h5repack_addfilter(comp_info,options)==-1){
+                error_msg(progname, "could not add compression option\n");
+                exit(1);
+            }
+        }
+        /*-------------------------------------------------------------------------
+        * layout
+        *-------------------------------------------------------------------------
+        */
+        else if (strcmp(stype,"-l") == 0) {
+            
+            /* find begining of info */
+            i=0; c='0';
+            while( c!=' ' )
+            {
+                fscanf(fp, "%c", &c);
+                if (feof(fp)) break;
+            }
+            c='0';
+            /* go until end */
+            while( c!=' ' )
+            {
+                fscanf(fp, "%c", &c);
+                comp_info[i]=c;
+                i++;
+                if (feof(fp)) break;
+                if (c==10 /*eol*/) break;
+            }
+            comp_info[i-1]='\0'; /*cut the last " */
+            
+            if (h5repack_addlayout(comp_info,options)==-1){
+                error_msg(progname, "could not add chunck option\n");
+                exit(1);
+            }
+        }
+        /*-------------------------------------------------------------------------
+        * not valid
+        *-------------------------------------------------------------------------
+        */
+        else {
+            error_msg(progname, "bad file format for %s", filename);
+            exit(1);
+        }
+    }
+    
+    fclose(fp);
+    return;
 }
-
-#endif
-
diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c
index 8492885..4fd450d 100644
--- a/tools/h5repack/h5repack_opttable.c
+++ b/tools/h5repack/h5repack_opttable.c
@@ -32,19 +32,19 @@ extern char  *progname;
 
 void init_packobject(pack_info_t *obj)
 {
- int j, k;
-
- strcpy(obj->path,"\0");
- for ( j=0; jfilter[j].filtn        = -1;
-  for ( k=0; kfilter[j].cd_values[k] = -1;
- }
- obj->chunk.rank = -1;
- obj->refobj_id = -1;
- obj->layout = H5D_LAYOUT_ERROR;
- obj->nfilters = 0;
+    int j, k;
+    
+    strcpy(obj->path,"\0");
+    for ( j=0; jfilter[j].filtn        = -1;
+        for ( k=0; kfilter[j].cd_values[k] = -1;
+    }
+    obj->chunk.rank = -1;
+    obj->refobj_id = -1;
+    obj->layout = H5D_LAYOUT_ERROR;
+    obj->nfilters = 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -61,15 +61,15 @@ static void aux_tblinsert_filter(pack_opttbl_t *table,
                                  unsigned int I,
                                  filter_info_t filt)
 {
- if (table->objs[ I ].nfiltersobjs[ I ].filter[ table->objs[ I ].nfilters++ ] = filt;
- }
- else
- {
-  error_msg(progname, "cannot insert the filter in this object.\
-   Maximum capacity exceeded\n");
- }
+    if (table->objs[ I ].nfiltersobjs[ I ].filter[ table->objs[ I ].nfilters++ ] = filt;
+    }
+    else
+    {
+    error_msg(progname, "cannot insert the filter in this object.\
+        Maximum capacity exceeded\n");
+    }
 }
 
 /*-------------------------------------------------------------------------
@@ -86,26 +86,26 @@ static void aux_tblinsert_layout(pack_opttbl_t *table,
                                  unsigned int I,
                                  pack_info_t *pack)
 {
- int k;
-
- table->objs[I].layout = pack->layout;
- if (H5D_CHUNKED==pack->layout)
- {
- /* -2 means the NONE option, remove chunking
-  and set the layout to contiguous */
-  if (pack->chunk.rank==-2)
-  {
-   table->objs[I].layout = H5D_CONTIGUOUS;
-   table->objs[I].chunk.rank = -2;
-  }
-  /* otherwise set the chunking type */
-  else
-  {
-   table->objs[I].chunk.rank = pack->chunk.rank;
-   for (k = 0; k < pack->chunk.rank; k++)
-    table->objs[I].chunk.chunk_lengths[k] = pack->chunk.chunk_lengths[k];
-  }
- }
+    int k;
+    
+    table->objs[I].layout = pack->layout;
+    if (H5D_CHUNKED==pack->layout)
+    {
+    /* -2 means the NONE option, remove chunking
+        and set the layout to contiguous */
+        if (pack->chunk.rank==-2)
+        {
+            table->objs[I].layout = H5D_CONTIGUOUS;
+            table->objs[I].chunk.rank = -2;
+        }
+        /* otherwise set the chunking type */
+        else
+        {
+            table->objs[I].chunk.rank = pack->chunk.rank;
+            for (k = 0; k < pack->chunk.rank; k++)
+                table->objs[I].chunk.chunk_lengths[k] = pack->chunk.chunk_lengths[k];
+        }
+    }
 }
 
 
@@ -121,19 +121,19 @@ static void aux_tblinsert_layout(pack_opttbl_t *table,
 
 static int aux_inctable(pack_opttbl_t *table, int n_objs )
 {
- unsigned int i;
-
- table->size += n_objs;
- table->objs = (pack_info_t*)realloc(table->objs, table->size * sizeof(pack_info_t));
- if (table->objs==NULL) {
-  error_msg(progname, "not enough memory for options table\n");
-  return -1;
- }
- for (i = table->nelems; i < table->size; i++)
- {
-  init_packobject(&table->objs[i]);
- }
- return 0;
+    unsigned int i;
+    
+    table->size += n_objs;
+    table->objs = (pack_info_t*)realloc(table->objs, table->size * sizeof(pack_info_t));
+    if (table->objs==NULL) {
+        error_msg(progname, "not enough memory for options table\n");
+        return -1;
+    }
+    for (i = table->nelems; i < table->size; i++)
+    {
+        init_packobject(&table->objs[i]);
+    }
+    return 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -148,28 +148,28 @@ static int aux_inctable(pack_opttbl_t *table, int n_objs )
 
 int options_table_init( pack_opttbl_t **tbl )
 {
- unsigned int i;
- pack_opttbl_t* table = (pack_opttbl_t*) malloc(sizeof(pack_opttbl_t));
- if (table==NULL) {
-  error_msg(progname, "not enough memory for options table\n");
-  return -1;
- }
-
- table->size   = 30;
- table->nelems = 0;
- table->objs   = (pack_info_t*) malloc(table->size * sizeof(pack_info_t));
- if (table->objs==NULL) {
-  error_msg(progname, "not enough memory for options table\n");
-  return -1;
- }
-
- for ( i=0; isize; i++)
- {
-  init_packobject(&table->objs[i]);
- }
-
- *tbl = table;
- return 0;
+    unsigned int i;
+    pack_opttbl_t* table = (pack_opttbl_t*) malloc(sizeof(pack_opttbl_t));
+    if (table==NULL) {
+        error_msg(progname, "not enough memory for options table\n");
+        return -1;
+    }
+    
+    table->size   = 30;
+    table->nelems = 0;
+    table->objs   = (pack_info_t*) malloc(table->size * sizeof(pack_info_t));
+    if (table->objs==NULL) {
+        error_msg(progname, "not enough memory for options table\n");
+        return -1;
+    }
+    
+    for ( i=0; isize; i++)
+    {
+        init_packobject(&table->objs[i]);
+    }
+    
+    *tbl = table;
+    return 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -184,9 +184,9 @@ int options_table_init( pack_opttbl_t **tbl )
 
 int options_table_free( pack_opttbl_t *table )
 {
- free(table->objs);
- free(table);
- return 0;
+    free(table->objs);
+    free(table);
+    return 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -205,85 +205,85 @@ int options_add_layout( obj_list_t *obj_list,
                         pack_info_t *pack,
                         pack_opttbl_t *table )
 {
- unsigned int i, I;
- int          j, added=0, found=0;
-
- /* increase the size of the collection by N_OBJS if necessary */
- if (table->nelems+n_objs >= table->size)
- {
-  if (aux_inctable(table,n_objs)<0)
-   return -1;
- }
-
- /* search if this object is already in the table; "path" is the key */
- if (table->nelems>0)
- {
-  /* go tru the supplied list of names */
-  for (j = 0; j < n_objs; j++)
-  {
-   /* linear table search */
-   for (i = 0; i < table->nelems; i++)
-   {
-    /*already on the table */
-    if (strcmp(obj_list[j].obj,table->objs[i].path)==0)
+    unsigned int i, I;
+    int          j, added=0, found=0;
+    
+    /* increase the size of the collection by N_OBJS if necessary */
+    if (table->nelems+n_objs >= table->size)
     {
-     /* already chunk info inserted for this one; exit */
-     if (table->objs[i].chunk.rank>0)
-     {
-      error_msg(progname, "chunk information already inserted for <%s>\n",obj_list[j].obj);
-      exit(1);
-     }
-     /* insert the layout info */
-     else
-     {
-      aux_tblinsert_layout(table,i,pack);
-      found=1;
-      break;
-     }
-    } /* if */
-   } /* i */
-
-   if (found==0)
-   {
-    /* keep the grow in a temp var */
-    I = table->nelems + added;
-    added++;
-    strcpy(table->objs[I].path,obj_list[j].obj);
-    aux_tblinsert_layout(table,I,pack);
+        if (aux_inctable(table,n_objs)<0)
+            return -1;
     }
-   /* cases where we have an already inserted name but there is a new name also
-      example:
-      -f dset1:GZIP=1 -l dset1,dset2:CHUNK=20x20
-      dset1 is already inserted, but dset2 must also be
-      */
-   else if (found==1 && strcmp(obj_list[j].obj,table->objs[i].path)!=0)
-   {
-    /* keep the grow in a temp var */
-    I = table->nelems + added;
-    added++;
-    strcpy(table->objs[I].path,obj_list[j].obj);
-    aux_tblinsert_layout(table,I,pack);
-   }
-  } /* j */
- }
-
- /* first time insertion */
- else
- {
-  /* go tru the supplied list of names */
-  for (j = 0; j < n_objs; j++)
-  {
-   I = table->nelems + added;
-   added++;
-   strcpy(table->objs[I].path,obj_list[j].obj);
-   aux_tblinsert_layout(table,I,pack);
-
-  }
- }
-
- table->nelems+= added;
-
- return 0;
+    
+    /* search if this object is already in the table; "path" is the key */
+    if (table->nelems>0)
+    {
+        /* go tru the supplied list of names */
+        for (j = 0; j < n_objs; j++)
+        {
+            /* linear table search */
+            for (i = 0; i < table->nelems; i++)
+            {
+                /*already on the table */
+                if (strcmp(obj_list[j].obj,table->objs[i].path)==0)
+                {
+                    /* already chunk info inserted for this one; exit */
+                    if (table->objs[i].chunk.rank>0)
+                    {
+                        error_msg(progname, "chunk information already inserted for <%s>\n",obj_list[j].obj);
+                        exit(1);
+                    }
+                    /* insert the layout info */
+                    else
+                    {
+                        aux_tblinsert_layout(table,i,pack);
+                        found=1;
+                        break;
+                    }
+                } /* if */
+            } /* i */
+            
+            if (found==0)
+            {
+                /* keep the grow in a temp var */
+                I = table->nelems + added;
+                added++;
+                strcpy(table->objs[I].path,obj_list[j].obj);
+                aux_tblinsert_layout(table,I,pack);
+            }
+            /* cases where we have an already inserted name but there is a new name also
+            example:
+            -f dset1:GZIP=1 -l dset1,dset2:CHUNK=20x20
+            dset1 is already inserted, but dset2 must also be
+            */
+            else if (found==1 && strcmp(obj_list[j].obj,table->objs[i].path)!=0)
+            {
+                /* keep the grow in a temp var */
+                I = table->nelems + added;
+                added++;
+                strcpy(table->objs[I].path,obj_list[j].obj);
+                aux_tblinsert_layout(table,I,pack);
+            }
+        } /* j */
+    }
+    
+    /* first time insertion */
+    else
+    {
+        /* go tru the supplied list of names */
+        for (j = 0; j < n_objs; j++)
+        {
+            I = table->nelems + added;
+            added++;
+            strcpy(table->objs[I].path,obj_list[j].obj);
+            aux_tblinsert_layout(table,I,pack);
+            
+        }
+    }
+    
+    table->nelems+= added;
+    
+    return 0;
 }
 
 
@@ -303,76 +303,76 @@ int options_add_filter(obj_list_t *obj_list,
                        filter_info_t filt,
                        pack_opttbl_t *table )
 {
-
- unsigned int i, I;
- int          j, added=0, found=0;
-
- /* increase the size of the collection by N_OBJS if necessary */
- if (table->nelems+n_objs >= table->size)
- {
-  if (aux_inctable(table,n_objs)<0)
-   return -1;
- }
-
- /* search if this object is already in the table; "path" is the key */
- if (table->nelems>0)
- {
-  /* go tru the supplied list of names */
-  for (j = 0; j < n_objs; j++)
-  {
-   /* linear table search */
-   for (i = 0; i < table->nelems; i++)
-   {
-    /*already on the table */
-    if (strcmp(obj_list[j].obj,table->objs[i].path)==0)
+    
+    unsigned int i, I;
+    int          j, added=0, found=0;
+    
+    /* increase the size of the collection by N_OBJS if necessary */
+    if (table->nelems+n_objs >= table->size)
     {
-     /* insert */
-     aux_tblinsert_filter(table,i,filt);
-     found=1;
-     break;
-    } /* if */
-   } /* i */
-
-   if (found==0)
-   {
-    /* keep the grow in a temp var */
-    I = table->nelems + added;
-    added++;
-    strcpy(table->objs[I].path,obj_list[j].obj);
-    aux_tblinsert_filter(table,I,filt);
-   }
-   /* cases where we have an already inserted name but there is a new name also
-      example:
-      -l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1
-      dset1 is already inserted, but dset2 must also be
-      */
-   else if (found==1 && strcmp(obj_list[j].obj,table->objs[i].path)!=0)
-   {
-    /* keep the grow in a temp var */
-    I = table->nelems + added;
-    added++;
-    strcpy(table->objs[I].path,obj_list[j].obj);
-    aux_tblinsert_filter(table,I,filt);
-   }
-  } /* j */
- }
-
- /* first time insertion */
- else
- {
-  /* go tru the supplied list of names */
-  for (j = 0; j < n_objs; j++)
-  {
-   I = table->nelems + added;
-   added++;
-   strcpy(table->objs[I].path,obj_list[j].obj);
-   aux_tblinsert_filter(table,I,filt);
-  }
- }
-
- table->nelems+= added;
-
- return 0;
+        if (aux_inctable(table,n_objs)<0)
+            return -1;
+    }
+    
+    /* search if this object is already in the table; "path" is the key */
+    if (table->nelems>0)
+    {
+        /* go tru the supplied list of names */
+        for (j = 0; j < n_objs; j++)
+        {
+            /* linear table search */
+            for (i = 0; i < table->nelems; i++)
+            {
+                /*already on the table */
+                if (strcmp(obj_list[j].obj,table->objs[i].path)==0)
+                {
+                    /* insert */
+                    aux_tblinsert_filter(table,i,filt);
+                    found=1;
+                    break;
+                } /* if */
+            } /* i */
+            
+            if (found==0)
+            {
+                /* keep the grow in a temp var */
+                I = table->nelems + added;
+                added++;
+                strcpy(table->objs[I].path,obj_list[j].obj);
+                aux_tblinsert_filter(table,I,filt);
+            }
+            /* cases where we have an already inserted name but there is a new name also
+            example:
+            -l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1
+            dset1 is already inserted, but dset2 must also be
+            */
+            else if (found==1 && strcmp(obj_list[j].obj,table->objs[i].path)!=0)
+            {
+                /* keep the grow in a temp var */
+                I = table->nelems + added;
+                added++;
+                strcpy(table->objs[I].path,obj_list[j].obj);
+                aux_tblinsert_filter(table,I,filt);
+            }
+        } /* j */
+    }
+    
+    /* first time insertion */
+    else
+    {
+        /* go tru the supplied list of names */
+        for (j = 0; j < n_objs; j++)
+        {
+            I = table->nelems + added;
+            added++;
+            strcpy(table->objs[I].path,obj_list[j].obj);
+            aux_tblinsert_filter(table,I,filt);
+        }
+    }
+    
+    table->nelems+= added;
+    
+    return 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -388,18 +388,18 @@ int options_add_filter(obj_list_t *obj_list,
 pack_info_t* options_get_object( const char *path,
                                  pack_opttbl_t *table )
 {
- unsigned int i;
-
- for ( i = 0; i < table->nelems; i++)
- {
-  /* found it */
-  if (strcmp(table->objs[i].path,path)==0)
-  {
-   return (&table->objs[i]);
-  }
- }
-
- return NULL;
+    unsigned int i;
+    
+    for ( i = 0; i < table->nelems; i++)
+    {
+        /* found it */
+        if (strcmp(table->objs[i].path,path)==0)
+        {
+            return (&table->objs[i]);
+        }
+    }
+    
+    return NULL;
 }
 
 
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index cf78cac..2475068 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+
 #include "h5repack.h"
 #include "h5tools_utils.h"
 
@@ -53,407 +54,418 @@ extern char  *progname;
 obj_list_t* parse_filter(const char *str,
                          int *n_objs,
                          filter_info_t *filt,
-                         pack_opt_t *options)
+                         pack_opt_t *options,
+                         int *is_glb)
 {
- unsigned    i, u;
- char        c;
- size_t      len=strlen(str);
- int         j, m, n, k, l, end_obj=-1, no_param=0;
- char        sobj[MAX_NC_NAME];
- char        scomp[10];
- char        stype[5];
- char        smask[3];
- obj_list_t* obj_list=NULL;
- unsigned    pixels_per_block;
-
-#if defined(PARSE_DEBUG)
- fprintf(stderr,"%s\n",str);
-#endif
-
- /* initialize compression  info */
- memset(filt,0,sizeof(filter_info_t));
-
- /* check for the end of object list and number of objects */
- for ( i=0, n=0; iall_filter=1;
- }
-
- n++;
- obj_list=malloc(n*sizeof(obj_list_t));
- if (obj_list==NULL)
- {
-  error_msg(progname, "could not allocate object list\n");
-  return NULL;
- }
- *n_objs=n;
-
- /* get object list */
- for ( j=0, k=0, n=0; j\n",str);
-  exit(1);
- }
-
-
- /* get filter additional parameters */
- m=0;
- for ( i=end_obj+1, k=0, j=0; i
- * pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN'
- * example SZIP=8,NN
- *-------------------------------------------------------------------------
- */
-    if (strcmp(scomp,"SZIP")==0)
+    unsigned    i, u;
+    char        c;
+    size_t      len=strlen(str);
+    int         j, m, n, k, l, end_obj=-1, no_param=0;
+    char        sobj[MAX_NC_NAME];
+    char        scomp[10];
+    char        stype[5];
+    char        smask[3];
+    obj_list_t* obj_list=NULL;
+    unsigned    pixels_per_block;
+    
+    
+    /* initialize compression  info */
+    memset(filt,0,sizeof(filter_info_t));
+    *is_glb = 0;
+    
+    /* check for the end of object list and number of objects */
+    for ( i = 0, n = 0; i < len; i++)
     {
-     l=-1; /* mask index check */
-     for ( m=0,u=i+1; u\n",str);
-       exit(1);
-      }
-      if (l==-1)
-       stype[m]=c;
-      else
-      {
-       smask[l]=c;
-       l++;
-       if (l==2)
-       {
-        smask[l]='\0';
-        i=len-1; /* end */
-        (*n_objs)--; /* we counted an extra ',' */
-        if (strcmp(smask,"NN")==0)
-         filt->cd_values[j++]=H5_SZIP_NN_OPTION_MASK;
-        else if (strcmp(smask,"EC")==0)
-         filt->cd_values[j++]=H5_SZIP_EC_OPTION_MASK;
-        else
+        c = str[i];
+        if ( c==':' )
         {
-         error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
-         exit(1);
+            end_obj=i;
         }
-
-       }
-      }
-
-     }  /* u */
-    } /*if */
-
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SCALEOFFSET
-    * scaleoffset has the format SOFF=
-    * scale_type can be
-    *   integer datatype, H5Z_SO_INT (IN)
-    *   float datatype using D-scaling method, H5Z_SO_FLOAT_DSCALE  (DS)
-    *   float datatype using E-scaling method, H5Z_SO_FLOAT_ESCALE  (ES) , not yet implemented
-    * for integer datatypes, scale_factor denotes Minimum Bits
-    * for float datatypes, scale_factor denotes decimal scale factor
- *  examples
-    *  SOFF=31,IN
-    *  SOFF=3,DF
- *-------------------------------------------------------------------------
- */
-
-    else if (strcmp(scomp,"SOFF")==0)
+        if ( c==',' )
+        {
+            n++;
+        }
+    }
+    
+    if (end_obj==-1) /* missing : */
+    { 
+        /* apply to all objects */
+        options->all_filter=1;
+        *is_glb = 1;
+    }
+    
+    n++;
+    obj_list = malloc(n*sizeof(obj_list_t));
+    if (obj_list==NULL)
     {
-     l=-1; /* mask index check */
-     for ( m=0,u=i+1; u\n",str);
-       exit(1);
-      }
-      if (l==-1)
-       stype[m]=c;
-      else
-      {
-       smask[l]=c;
-       l++;
-       if (l==2)
-       {
-        smask[l]='\0';
-        i=len-1; /* end */
-        (*n_objs)--; /* we counted an extra ',' */
-        if (strcmp(smask,"IN")==0)
-                                    filt->cd_values[j++]=H5Z_SO_INT;
-        else if (strcmp(smask,"DS")==H5Z_SO_FLOAT_DSCALE)
-                                    filt->cd_values[j++]=H5Z_SO_FLOAT_DSCALE;
-        else
+        error_msg(progname, "could not allocate object list\n");
+        return NULL;
+    }
+    *n_objs=n;
+    
+    /* get object list */
+    for ( j = 0, k = 0, n = 0; j < end_obj; j++, k++)
+    {
+        c = str[j];
+        sobj[k] = c;
+        if ( c==',' || j==end_obj-1)
         {
-         error_msg(progname, "scale type must be 'IN' or 'DS' \n");
-         exit(1);
+            if ( c==',') sobj[k]='\0'; else sobj[k+1]='\0';
+            strcpy(obj_list[n].obj,sobj);
+            memset(sobj,0,sizeof(sobj));
+            n++;
+            k=-1;
         }
-
-       }
-      }
-
-     }  /* u */
-    } /*if */
-
-
-/*-------------------------------------------------------------------------
- * all other filters
- *-------------------------------------------------------------------------
- */
-
-    else
+    }
+    /* nothing after : */
+    if (end_obj+1==(int)len)
     {
-     /* here we could have 1 or 2 digits  */
-     for ( m=0,u=i+1; u\n",str);
-       exit(1);
-      }
-      stype[m]=c;
-     } /* u */
-
-     stype[m]='\0';
-    } /*if */
-
-
-
-    filt->cd_values[j++]=atoi(stype);
-    i+=m; /* jump */
+        if (obj_list) free(obj_list);
+        error_msg(progname, "input Error: Invalid compression type in <%s>\n",str);
+        exit(1);
+    }
+    
+    
+    /* get filter additional parameters */
+    m=0;
+    for ( i=end_obj+1, k=0, j=0; i
+                * pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN'
+                * example SZIP=8,NN
+                *-------------------------------------------------------------------------
+                */
+                if (strcmp(scomp,"SZIP")==0)
+                {
+                    l=-1; /* mask index check */
+                    for ( m=0,u=i+1; u\n",str);
+                            exit(1);
+                        }
+                        if (l==-1)
+                            stype[m]=c;
+                        else
+                        {
+                            smask[l]=c;
+                            l++;
+                            if (l==2)
+                            {
+                                smask[l]='\0';
+                                i=len-1; /* end */
+                                (*n_objs)--; /* we counted an extra ',' */
+                                if (strcmp(smask,"NN")==0)
+                                    filt->cd_values[j++]=H5_SZIP_NN_OPTION_MASK;
+                                else if (strcmp(smask,"EC")==0)
+                                    filt->cd_values[j++]=H5_SZIP_EC_OPTION_MASK;
+                                else
+                                {
+                                    error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
+                                    exit(1);
+                                }
+                                
+                                
+                            }
+                        }
+                        
+                    }  /* u */
+                } /*if */
+                
+                  /*-------------------------------------------------------------------------
+                  * H5Z_FILTER_SCALEOFFSET
+                  * scaleoffset has the format SOFF=
+                  * scale_type can be
+                  *   integer datatype, H5Z_SO_INT (IN)
+                  *   float datatype using D-scaling method, H5Z_SO_FLOAT_DSCALE  (DS)
+                  *   float datatype using E-scaling method, H5Z_SO_FLOAT_ESCALE  (ES) , not yet implemented
+                  * for integer datatypes, scale_factor denotes Minimum Bits
+                  * for float datatypes, scale_factor denotes decimal scale factor
+                  *  examples
+                  *  SOFF=31,IN
+                  *  SOFF=3,DF
+                  *-------------------------------------------------------------------------
+                */
+                
+                else if (strcmp(scomp,"SOFF")==0)
+                {
+                    l=-1; /* mask index check */
+                    for ( m=0,u=i+1; u\n",str);
+                            exit(1);
+                        }
+                        if (l==-1)
+                            stype[m]=c;
+                        else
+                        {
+                            smask[l]=c;
+                            l++;
+                            if (l==2)
+                            {
+                                smask[l]='\0';
+                                i=len-1; /* end */
+                                (*n_objs)--; /* we counted an extra ',' */
+                                if (strcmp(smask,"IN")==0)
+                                    filt->cd_values[j++]=H5Z_SO_INT;
+                                else if (strcmp(smask,"DS")==H5Z_SO_FLOAT_DSCALE)
+                                    filt->cd_values[j++]=H5Z_SO_FLOAT_DSCALE;
+                                else
+                                {
+                                    error_msg(progname, "scale type must be 'IN' or 'DS' \n");
+                                    exit(1);
+                                }
+                                
+                            }
+                        }
+                        
+                    }  /* u */
+                } /*if */
+                
+                
+               /*-------------------------------------------------------------------------
+                * all other filters
+                *-------------------------------------------------------------------------
+                */
+                
+                else
+                {
+                    /* here we could have 1 or 2 digits  */
+                    for ( m=0,u=i+1; u\n",str);
+                            exit(1);
+                        }
+                        stype[m]=c;
+                    } /* u */
+                    
+                    stype[m]='\0';
+                } /*if */
+                
+                
+                
+                filt->cd_values[j++]=atoi(stype);
+                i+=m; /* jump */
    }
-   else if (i==len-1) { /*no more parameters */
-    scomp[k+1]='\0';
-    no_param=1;
+   else if (i==len-1) 
+   { /*no more parameters */
+       scomp[k+1]='\0';
+       no_param=1;
    }
 
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_NONE
- *-------------------------------------------------------------------------
- */
+  /*-------------------------------------------------------------------------
+   * translate from string to filter symbol
+   *-------------------------------------------------------------------------
+   */
+   
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_NONE
+   *-------------------------------------------------------------------------
+   */
    if (strcmp(scomp,"NONE")==0)
-    filt->filtn=H5Z_FILTER_NONE;
-
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_DEFLATE
- *-------------------------------------------------------------------------
- */
+   {
+       filt->filtn=H5Z_FILTER_NONE;
+       filt->cd_nelmts = 0;
+   }
+   
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_DEFLATE
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"GZIP")==0)
    {
-    filt->filtn=H5Z_FILTER_DEFLATE;
-    if (no_param) { /*no more parameters, GZIP must have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "missing compression parameter in <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_DEFLATE;
+       filt->cd_nelmts = 1;
+       if (no_param) 
+       { /*no more parameters, GZIP must have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "missing compression parameter in <%s>\n",str);
+           exit(1);
+       }
    }
-
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SZIP
- *-------------------------------------------------------------------------
- */
+   
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_SZIP
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"SZIP")==0)
    {
-    filt->filtn=H5Z_FILTER_SZIP;
-    if (no_param) { /*no more parameters, SZIP must have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "missing compression parameter in <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_SZIP;
+       filt->cd_nelmts = 2;
+       if (no_param) 
+       { /*no more parameters, SZIP must have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "missing compression parameter in <%s>\n",str);
+           exit(1);
+       }
    }
-
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SHUFFLE
- *-------------------------------------------------------------------------
- */
+   
+   /*-------------------------------------------------------------------------
+   * H5Z_FILTER_SHUFFLE
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"SHUF")==0)
    {
-    filt->filtn=H5Z_FILTER_SHUFFLE;
-    if (m>0){ /*shuffle does not have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "extra parameter in SHUF <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_SHUFFLE;
+       filt->cd_nelmts = 0;
+       if (m>0)
+       { /*shuffle does not have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "extra parameter in SHUF <%s>\n",str);
+           exit(1);
+       }
    }
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_FLETCHER32
- *-------------------------------------------------------------------------
- */
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_FLETCHER32
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"FLET")==0)
    {
-    filt->filtn=H5Z_FILTER_FLETCHER32;
-    if (m>0){ /*shuffle does not have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "extra parameter in FLET <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_FLETCHER32;
+       filt->cd_nelmts = 0;
+       if (m>0)
+       { /*shuffle does not have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "extra parameter in FLET <%s>\n",str);
+           exit(1);
+       }
    }
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_NBIT
- *-------------------------------------------------------------------------
- */
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_NBIT
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"NBIT")==0)
    {
-    filt->filtn=H5Z_FILTER_NBIT;
-    if (m>0){ /*nbit does not have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "extra parameter in NBIT <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_NBIT;
+       filt->cd_nelmts = 0;
+       if (m>0)
+       { /*nbit does not have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "extra parameter in NBIT <%s>\n",str);
+           exit(1);
+       }
    }
-/*-------------------------------------------------------------------------
- * H5Z_FILTER_SCALEOFFSET
- *-------------------------------------------------------------------------
- */
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_SCALEOFFSET
+   *-------------------------------------------------------------------------
+   */
    else if (strcmp(scomp,"SOFF")==0)
    {
-    filt->filtn=H5Z_FILTER_SCALEOFFSET;
-    if (no_param) { /*no more parameters, SOFF must have parameter */
-     if (obj_list) free(obj_list);
-     error_msg(progname, "missing compression parameter in <%s>\n",str);
-     exit(1);
-    }
+       filt->filtn=H5Z_FILTER_SCALEOFFSET;
+       filt->cd_nelmts = 2;
+       if (no_param) 
+       { /*no more parameters, SOFF must have parameter */
+           if (obj_list) free(obj_list);
+           error_msg(progname, "missing compression parameter in <%s>\n",str);
+           exit(1);
+       }
    }
    else {
-    if (obj_list) free(obj_list);
-    error_msg(progname, "invalid filter type in <%s>\n",str);
-    exit(1);
+       if (obj_list) free(obj_list);
+       error_msg(progname, "invalid filter type in <%s>\n",str);
+       exit(1);
    }
   }
  } /*i*/
+ 
+  /*-------------------------------------------------------------------------
+   * check valid parameters
+   *-------------------------------------------------------------------------
+   */
+   
+   switch (filt->filtn)
+   {
 
-/*-------------------------------------------------------------------------
- * check valid parameters
- *-------------------------------------------------------------------------
- */
-
- switch (filt->filtn)
- {
-
- case H5Z_FILTER_DEFLATE:
-  if (filt->cd_values[0]<0 || filt->cd_values[0]>9 ){
-   if (obj_list) free(obj_list);
-   error_msg(progname, "invalid compression parameter in <%s>\n",str);
-   exit(1);
-  }
-  break;
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_DEFLATE
+   *-------------------------------------------------------------------------
+   */
+       
+   case H5Z_FILTER_DEFLATE:
+       if (filt->cd_values[0]<0 || filt->cd_values[0]>9 )
+       {
+           if (obj_list) free(obj_list);
+           error_msg(progname, "invalid compression parameter in <%s>\n",str);
+           exit(1);
+       }
+       break;
+       
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_SZIP
+   *-------------------------------------------------------------------------
+   */
+       
+   case H5Z_FILTER_SZIP:
+       pixels_per_block=filt->cd_values[0];
+       if ((pixels_per_block%2)==1) 
+       {
+           if (obj_list) free(obj_list);
+           error_msg(progname, "pixels_per_block is not even in <%s>\n",str);
+           exit(1);
+       }
+       if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK) 
+       {
+           if (obj_list) free(obj_list);
+           error_msg(progname, "pixels_per_block is too large in <%s>\n",str);
+           exit(1);
+       }
+       if ( (strcmp(smask,"NN")!=0) && (strcmp(smask,"EC")!=0) ) 
+       {
+           if (obj_list) free(obj_list);
+           error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
+           exit(1);
+       }
+       break;
 
+  /*-------------------------------------------------------------------------
+   * H5Z_FILTER_SCALEOFFSET
+   *-------------------------------------------------------------------------
+   */
 
- case H5Z_FILTER_SZIP:
-  pixels_per_block=filt->cd_values[0];
-  if ((pixels_per_block%2)==1) {
-   if (obj_list) free(obj_list);
-   error_msg(progname, "pixels_per_block is not even in <%s>\n",str);
-   exit(1);
-  }
-  if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK) {
-   if (obj_list) free(obj_list);
-   error_msg(progname, "pixels_per_block is too large in <%s>\n",str);
-   exit(1);
-  }
-  if ( (strcmp(smask,"NN")!=0) && (strcmp(smask,"EC")!=0) ) {
-   if (obj_list) free(obj_list);
-   error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
-   exit(1);
-  }
-  break;
- case H5Z_FILTER_SCALEOFFSET:
-  if (filt->cd_values[0]<0 ){
-   if (obj_list) free(obj_list);
-   error_msg(progname, "invalid compression parameter in <%s>\n",str);
-   exit(1);
-  }
-  break;
- };
-
- return obj_list;
+   case H5Z_FILTER_SCALEOFFSET:
+       if (filt->cd_values[0]<0 )
+       {
+           if (obj_list) free(obj_list);
+           error_msg(progname, "invalid compression parameter in <%s>\n",str);
+           exit(1);
+       }
+       break;
+   };
+   
+   return obj_list;
 }
 
 
-/*-------------------------------------------------------------------------
- * Function: get_sfilter
- *
- * Purpose: return the filter as a string name
- *
- * Return: name of filter, exit on error
- *
- *-------------------------------------------------------------------------
- */
-
-const char* get_sfilter(H5Z_filter_t filtn)
-{
- if (filtn==H5Z_FILTER_NONE)
-  return "NONE";
- else if (filtn==H5Z_FILTER_DEFLATE)
-  return "GZIP";
- else if (filtn==H5Z_FILTER_SZIP)
-  return "SZIP";
- else if (filtn==H5Z_FILTER_SHUFFLE)
-  return "SHUFFLE";
- else if (filtn==H5Z_FILTER_FLETCHER32)
-  return "FLETCHER32";
- else if (filtn==H5Z_FILTER_NBIT)
-  return "NBIT";
- else if (filtn==H5Z_FILTER_SCALEOFFSET)
-  return "SOFF";
- else {
-  error_msg(progname, "input error in filter type\n");
-  exit(1);
- }
- return NULL;
-}
-
 
 /*-------------------------------------------------------------------------
  * Function: parse_layout
@@ -481,205 +493,171 @@ obj_list_t* parse_layout(const char *str,
                          pack_info_t *pack,    /* info about layout needed */
                          pack_opt_t *options)
 {
- obj_list_t* obj_list=NULL;
- unsigned    i;
- char        c;
- size_t      len=strlen(str);
- int         j, n, k, end_obj=-1, c_index;
- char        sobj[MAX_NC_NAME];
- char        sdim[10];
- char        slayout[10];
-
-
- memset(sdim, '\0', sizeof(sdim));
- memset(sobj, '\0', sizeof(sobj));
- memset(slayout, '\0', sizeof(slayout));
-
- /* check for the end of object list and number of objects */
- for ( i=0, n=0; iall_layout=1;
- }
-
- n++;
- obj_list=malloc(n*sizeof(obj_list_t));
- if (obj_list==NULL)
- {
-  error_msg(progname, "could not allocate object list\n");
-  return NULL;
- }
- *n_objs=n;
-
- /* get object list */
- for ( j=0, k=0, n=0; j\n",str);
-  exit(1);
- }
-
- /* get layout info */
- for ( j=end_obj+1, n=0; n<=5; j++,n++)
- {
-  if (n==5)
-  {
-   slayout[n]='\0';  /*cut string */
-   if (strcmp(slayout,"COMPA")==0)
-    pack->layout=H5D_COMPACT;
-   else if (strcmp(slayout,"CONTI")==0)
-    pack->layout=H5D_CONTIGUOUS;
-   else if (strcmp(slayout,"CHUNK")==0)
-    pack->layout=H5D_CHUNKED;
-   else {
-    error_msg(progname, "in parse layout, not a valid layout in <%s>\n",str);
-    exit(1);
-   }
-  }
-  else
-  {
-   c = str[j];
-   slayout[n]=c;
-  }
- } /* j */
-
-
- if ( pack->layout==H5D_CHUNKED )
- {
-
-/*-------------------------------------------------------------------------
- * get chunk info
- *-------------------------------------------------------------------------
- */
-   k=0;
-
-   if (j>(int)len)
-   {
-    if (obj_list) free(obj_list);
-    error_msg(progname, "in parse layout,  <%s> Chunk dimensions missing\n",str);
-    exit(1);
-   }
-
-   for ( i=j, c_index=0; i Not a valid character in <%s>\n",
-      sdim,str);
-     exit(1);
+    obj_list_t* obj_list=NULL;
+    unsigned    i;
+    char        c;
+    size_t      len=strlen(str);
+    int         j, n, k, end_obj=-1, c_index;
+    char        sobj[MAX_NC_NAME];
+    char        sdim[10];
+    char        slayout[10];
+    
+    
+    memset(sdim, '\0', sizeof(sdim));
+    memset(sobj, '\0', sizeof(sobj));
+    memset(slayout, '\0', sizeof(slayout));
+    
+    /* check for the end of object list and number of objects */
+    for ( i=0, n=0; iall_layout=1;
+    }
+    
+    n++;
+    obj_list=malloc(n*sizeof(obj_list_t));
+    if (obj_list==NULL)
+    {
+        error_msg(progname, "could not allocate object list\n");
+        return NULL;
+    }
+    *n_objs=n;
+    
+    /* get object list */
+    for ( j=0, k=0, n=0; jchunk.chunk_lengths[c_index]=atoi(sdim);
-      if (pack->chunk.chunk_lengths[c_index]==0) {
-       if (obj_list) free(obj_list);
-       error_msg(progname, "in parse layout, <%s> conversion to number in <%s>\n",
-        sdim,str);
-       exit(1);
-      }
-      c_index++;
-     }
-     else if (i==len-1) { /*no more parameters */
-      sdim[k]='\0';
-      k=0;
-      if (strcmp(sdim,"NONE")==0)
-      {
-       pack->chunk.rank=-2;
-      }
-      else
-      {
-       pack->chunk.chunk_lengths[c_index]=atoi(sdim);
-       if (pack->chunk.chunk_lengths[c_index]==0){
         if (obj_list) free(obj_list);
-        error_msg(progname, "in parse layout, <%s> conversion to number in <%s>\n",
-         sdim,str);
+        error_msg(progname, "in parse layout, no characters after : in <%s>\n",str);
         exit(1);
-       }
-       pack->chunk.rank=c_index+1;
-      }
-     } /*if */
-    } /*if c=='x' || i==len-1 */
-   } /*i*/
-
-
- } /*H5D_CHUNKED*/
-
-
- return obj_list;
+    }
+    
+    /* get layout info */
+    for ( j=end_obj+1, n=0; n<=5; j++,n++)
+    {
+        if (n==5)
+        {
+            slayout[n]='\0';  /*cut string */
+            if (strcmp(slayout,"COMPA")==0)
+                pack->layout=H5D_COMPACT;
+            else if (strcmp(slayout,"CONTI")==0)
+                pack->layout=H5D_CONTIGUOUS;
+            else if (strcmp(slayout,"CHUNK")==0)
+                pack->layout=H5D_CHUNKED;
+            else {
+                error_msg(progname, "in parse layout, not a valid layout in <%s>\n",str);
+                exit(1);
+            }
+        }
+        else
+        {
+            c = str[j];
+            slayout[n]=c;
+        }
+    } /* j */
+    
+    
+    if ( pack->layout==H5D_CHUNKED )
+    {
+        
+    /*-------------------------------------------------------------------------
+    * get chunk info
+    *-------------------------------------------------------------------------
+        */
+        k=0;
+        
+        if (j>(int)len)
+        {
+            if (obj_list) free(obj_list);
+            error_msg(progname, "in parse layout,  <%s> Chunk dimensions missing\n",str);
+            exit(1);
+        }
+        
+        for ( i=j, c_index=0; i Not a valid character in <%s>\n",
+                    sdim,str);
+                exit(1);
+            }
+            
+            if ( c=='x' || i==len-1)
+            {
+                if ( c=='x') {
+                    sdim[k-1]='\0';
+                    k=0;
+                    pack->chunk.chunk_lengths[c_index]=atoi(sdim);
+                    if (pack->chunk.chunk_lengths[c_index]==0) {
+                        if (obj_list) free(obj_list);
+                        error_msg(progname, "in parse layout, <%s> conversion to number in <%s>\n",
+                            sdim,str);
+                        exit(1);
+                    }
+                    c_index++;
+                }
+                else if (i==len-1) { /*no more parameters */
+                    sdim[k]='\0';
+                    k=0;
+                    if (strcmp(sdim,"NONE")==0)
+                    {
+                        pack->chunk.rank=-2;
+                    }
+                    else
+                    {
+                        pack->chunk.chunk_lengths[c_index]=atoi(sdim);
+                        if (pack->chunk.chunk_lengths[c_index]==0){
+                            if (obj_list) free(obj_list);
+                            error_msg(progname, "in parse layout, <%s> conversion to number in <%s>\n",
+                                sdim,str);
+                            exit(1);
+                        }
+                        pack->chunk.rank=c_index+1;
+                    }
+                } /*if */
+            } /*if c=='x' || i==len-1 */
+        } /*i*/
+        
+        
+    } /*H5D_CHUNKED*/
+    
+    
+    return obj_list;
 }
 
 
 
-/*-------------------------------------------------------------------------
- * Function: parse_number
- *
- * Purpose: read a number from command line argument
- *
- * Return: number, -1 for FAIL
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: September, 23, 2003
- *
- *-------------------------------------------------------------------------
- */
-
-
-int parse_number(char *str)
-{
- unsigned    i;
- int         n;
- char        c;
- size_t      len=strlen(str);
-
- for ( i=0; iop_tbl->nelems; i++) 
+    {
+        char* name = options->op_tbl->objs[i].path;
+        pack_info_t *obj = &options->op_tbl->objs[i];
+        
+       /*-------------------------------------------------------------------------
+        * open
+        *-------------------------------------------------------------------------
+        */
+        if((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
+            goto error;
+        if((sid = H5Dget_space(did)) < 0)
+            goto error;
+        if((pid = H5Dget_create_plist(did)) < 0)
+            goto error;
+        if((tid = H5Dget_type(did)) < 0)
+            goto error;
+       
+       /*-------------------------------------------------------------------------
+        * filter check
+        *-------------------------------------------------------------------------
+        */
+        if(has_filters(pid, tid, obj->nfilters, obj->filter) <= 0)
+                ok = 0;
+
+       
+       /*-------------------------------------------------------------------------
+        * layout check
+        *-------------------------------------------------------------------------
+        */
+        if((obj->layout != -1) && (has_layout(pid, obj) == 0))
+            ok = 0;
+        
+       /*-------------------------------------------------------------------------
+        * close
+        *-------------------------------------------------------------------------
+        */
+        if(H5Pclose(pid) < 0)
+            goto error;
+        if (H5Sclose(sid) < 0)
+            goto error;
+        if (H5Dclose(did) < 0)
+            goto error;
+        if (H5Tclose(tid) < 0)
+            goto error;
+        
+    }
+    
+    
+   /*-------------------------------------------------------------------------
+    * check for the "all" objects option
+    *-------------------------------------------------------------------------
+    */
+    
+    if(options->all_filter == 1 || options->all_layout == 1) 
+    {
+        
+        /* init table */
+        trav_table_init(&travt);
+        
+        /* get the list of objects in the file */
+        if(h5trav_gettable(fid, travt) < 0)
+            goto error;
+        
+        for(i = 0; i < travt->nobjs; i++) 
+        {
+            char *name = travt->objs[i].name;
+            
+            if(travt->objs[i].type == H5TRAV_TYPE_DATASET) 
+            {
+                
+               /*-------------------------------------------------------------------------
+                * open
+                *-------------------------------------------------------------------------
+                */
+                if((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
+                    goto error;
+                if((sid = H5Dget_space(did)) < 0)
+                    goto error;
+                if((pid = H5Dget_create_plist(did)) < 0)
+                    goto error;
+                if((tid = H5Dget_type(did)) < 0)
+                    goto error;
+                
+               /*-------------------------------------------------------------------------
+                * filter check
+                *-------------------------------------------------------------------------
+                */
+                if(options->all_filter == 1)
+                {
+                    
+                    if(has_filters(pid, tid, options->n_filter_g, options->filter_g) <= 0)
+                        ok = 0;
+                }
+                
+               /*-------------------------------------------------------------------------
+                * layout check
+                *-------------------------------------------------------------------------
+                */
+                if(options->all_layout == 1) 
+                {
+                    pack_info_t pack;
+                    init_packobject(&pack);
+                    pack.layout = options->layout_g;
+                    pack.chunk = options->chunk_g;
+                    if(has_layout(pid, &pack) == 0)
+                        ok = 0;
+                }
+                
+                
+               /*-------------------------------------------------------------------------
+                * close
+                *-------------------------------------------------------------------------
+                */
+                if (H5Pclose(pid) < 0)
+                    goto error;
+                if (H5Sclose(sid) < 0)
+                    goto error;
+                if (H5Dclose(did) < 0)
+                    goto error;
+                if (H5Tclose(tid) < 0)
+                    goto error;
+            } /* if */
+            
+        } /* i */
+        
+        /* free table */
+        trav_table_free(travt);
+    }
+    
+   /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    
+    if (H5Fclose(fid) < 0)
+        return -1;
+    
+    return ok;
+    
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Fclose(fid);
+        if (travt)
+            trav_table_free(travt);
+    } H5E_END_TRY;
+    return -1;
 }
 
 
+
 /*-------------------------------------------------------------------------
  * Function: has_layout
  *
@@ -89,358 +232,341 @@ has_filter(hid_t dcpl_id, H5Z_filter_t filtnin)
  *-------------------------------------------------------------------------
  */
 
-int has_layout(hid_t dcpl_id,
+int has_layout(hid_t pid,
                pack_info_t *obj)
 {
- hsize_t      chsize[64];     /* chunk size in elements */
- H5D_layout_t layout;         /* layout */
- int          nfilters;       /* number of filters */
- int          rank;           /* rank */
- int          i;              /* index */
-
- /* if no information about the input layout is requested return exit */
- if (obj==NULL)
-  return 1;
-
- /* check if we have filters in the input object */
- if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
-  return -1;
-
- /* a non chunked layout was requested on a filtered object; avoid the test */
- if (nfilters && obj->layout!=H5D_CHUNKED)
-  return 1;
-
- /* get layout */
- if ((layout = H5Pget_layout(dcpl_id)) < 0)
-  return -1;
-
- if (obj->layout != layout)
-  return 0;
-
- if (layout==H5D_CHUNKED)
- {
-  if ((rank = H5Pget_chunk(dcpl_id,NELMTS(chsize),chsize/*out*/)) < 0)
-   return -1;
-  if (obj->chunk.rank != rank)
-   return 0;
-  for ( i=0; ichunk.chunk_lengths[i])
-    return 0;
- }
-
- return 1;
+    hsize_t      chsize[64];     /* chunk size in elements */
+    H5D_layout_t layout;         /* layout */
+    int          nfilters;       /* number of filters */
+    int          rank;           /* rank */
+    int          i;              /* index */
+    
+    /* if no information about the input layout is requested return exit */
+    if (obj==NULL)
+        return 1;
+    
+    /* check if we have filters in the input object */
+    if ((nfilters = H5Pget_nfilters(pid)) < 0)
+        return -1;
+    
+    /* a non chunked layout was requested on a filtered object; avoid the test */
+    if (nfilters && obj->layout!=H5D_CHUNKED)
+        return 1;
+    
+    /* get layout */
+    if ((layout = H5Pget_layout(pid)) < 0)
+        return -1;
+    
+    if (obj->layout != layout)
+        return 0;
+    
+    if (layout==H5D_CHUNKED)
+    {
+        if ((rank = H5Pget_chunk(pid,NELMTS(chsize),chsize/*out*/)) < 0)
+            return -1;
+        if (obj->chunk.rank != rank)
+            return 0;
+        for ( i=0; ichunk.chunk_lengths[i])
+                return 0;
+    }
+    
+    return 1;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: h5repack_verify
+ * Function: h5repack_cmpdcpl
  *
- * Purpose: verify if the filters specified in the options list are
- *  present on the OUTPUT file
+ * Purpose: compare 2 files for identical property lists of all objects
  *
- * Return: 1=filter present, 0=filter not present, -1=error
+ * Return: 1=identical, 0=not identical, -1=error
  *
  * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
- * Date: December 19, 2003
+ * Date: December 31, 2003
  *
  *-------------------------------------------------------------------------
  */
 
-int h5repack_verify(const char *fname,
-                    pack_opt_t *options)
+int h5repack_cmpdcpl(const char *fname1,
+                     const char *fname2)
 {
- hid_t  fid;      /* file ID */
- hid_t  dset_id = -1;  /* dataset ID */
- hid_t  dcpl_id = -1;  /* dataset creation property list ID */
- hid_t  space_id = -1; /* space ID */
- int    ret = 1;
- unsigned int i;
- int j;
- trav_table_t  *travt = NULL;
-
- /* open the file */
- if((fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 )
-  return -1;
-
- for(i = 0; i < options->op_tbl->nelems; i++) {
-  char* name = options->op_tbl->objs[i].path;
-  pack_info_t *obj = &options->op_tbl->objs[i];
-
-/*-------------------------------------------------------------------------
- * open
- *-------------------------------------------------------------------------
- */
-  if((dset_id = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
-   goto error;
-  if((space_id = H5Dget_space(dset_id)) < 0)
-   goto error;
-  if((dcpl_id = H5Dget_create_plist(dset_id)) < 0)
-   goto error;
-
-/*-------------------------------------------------------------------------
- * filter check
- *-------------------------------------------------------------------------
- */
-  for(j = 0; j < obj->nfilters; j++) {
-   if(has_filter(dcpl_id, obj->filter[j].filtn) == 0)
-    ret = 0;
-  }
-
-/*-------------------------------------------------------------------------
- * layout check
- *-------------------------------------------------------------------------
- */
-  if((obj->layout != -1) && (has_layout(dcpl_id, obj) == 0))
-   ret = 0;
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-  if(H5Pclose(dcpl_id) < 0)
-   goto error;
-  if (H5Sclose(space_id) < 0)
-   goto error;
-  if (H5Dclose(dset_id) < 0)
-   goto error;
-
- }
-
-
-/*-------------------------------------------------------------------------
- * check for the "all" objects option
- *-------------------------------------------------------------------------
- */
-
- if(options->all_filter == 1 || options->all_layout == 1) {
-
-  /* init table */
-  trav_table_init(&travt);
-
-  /* get the list of objects in the file */
-  if(h5trav_gettable(fid, travt) < 0)
-   goto error;
-
-  for(i = 0; i < travt->nobjs; i++) {
-   char *name = travt->objs[i].name;
-
-   if(travt->objs[i].type == H5TRAV_TYPE_DATASET) {
-
- /*-------------------------------------------------------------------------
-  * open
-  *-------------------------------------------------------------------------
-  */
-    if((dset_id = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
-     goto error;
-    if((space_id = H5Dget_space(dset_id)) < 0)
-     goto error;
-    if((dcpl_id = H5Dget_create_plist(dset_id)) < 0)
-     goto error;
-
- /*-------------------------------------------------------------------------
-  * filter check
-  *-------------------------------------------------------------------------
-  */
-    if(options->all_filter == 1)
-     if(has_filter(dcpl_id, options->filter_g.filtn) == 0)
-      ret = 0;
-
- /*-------------------------------------------------------------------------
-  * layout check
-  *-------------------------------------------------------------------------
-  */
-    if(options->all_layout == 1) {
-     pack_info_t pack;
-     init_packobject(&pack);
-     pack.layout = options->layout_g;
-     pack.chunk = options->chunk_g;
-     if(has_layout(dcpl_id, &pack) == 0)
-      ret = 0;
-    }
-
-
-  /*-------------------------------------------------------------------------
-   * close
-   *-------------------------------------------------------------------------
-   */
-    if (H5Pclose(dcpl_id) < 0)
-     goto error;
-    if (H5Sclose(space_id) < 0)
-     goto error;
-    if (H5Dclose(dset_id) < 0)
-     goto error;
-   } /* if */
-
-  } /* i */
-
-  /* free table */
-  trav_table_free(travt);
- }
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-
- if (H5Fclose(fid) < 0)
-  return -1;
-
- return ret;
-
+    hid_t         fid1=-1;       /* file ID */
+    hid_t         fid2=-1;       /* file ID */
+    hid_t         dset1=-1;      /* dataset ID */
+    hid_t         dset2=-1;      /* dataset ID */
+    hid_t         dcpl1=-1;      /* dataset creation property list ID */
+    hid_t         dcpl2=-1;      /* dataset creation property list ID */
+    trav_table_t  *travt1=NULL;
+    trav_table_t  *travt2=NULL;
+    int           ret=1;
+    unsigned int  i;
+    
+   /*-------------------------------------------------------------------------
+    * open the files 
+    *-------------------------------------------------------------------------
+    */
+    
+    /* disable error reporting */
+    H5E_BEGIN_TRY 
+    {
+        
+        /* Open the files */
+        if ((fid1=H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
+        {
+            error_msg(progname, "<%s>: %s\n", fname1, H5FOPENERROR );
+            return -1;
+        }
+        if ((fid2=H5Fopen(fname2,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
+        {
+            error_msg(progname, "<%s>: %s\n", fname2, H5FOPENERROR );
+            H5Fclose(fid1);
+            return -1;
+        }
+        /* enable error reporting */
+    } H5E_END_TRY;
+    
+   /*-------------------------------------------------------------------------
+    * get file table list of objects
+    *-------------------------------------------------------------------------
+    */
+    trav_table_init(&travt1);
+    trav_table_init(&travt2);
+    if(h5trav_gettable(fid1, travt1) < 0)
+        goto error;
+    if(h5trav_gettable(fid2, travt2) < 0)
+        goto error;
+    
+    
+   /*-------------------------------------------------------------------------
+    * traverse the suppplied object list
+    *-------------------------------------------------------------------------
+    */
+    
+    for(i = 0; i < travt1->nobjs; i++) 
+    {
+        if(travt1->objs[i].type == H5TRAV_TYPE_DATASET) 
+        {
+            if((dset1 = H5Dopen2(fid1, travt1->objs[i].name, H5P_DEFAULT)) < 0)
+                goto error;
+            if((dset2 = H5Dopen2(fid2, travt1->objs[i].name, H5P_DEFAULT)) < 0)
+                goto error;
+            if((dcpl1 = H5Dget_create_plist(dset1)) < 0)
+                goto error;
+            if((dcpl2 = H5Dget_create_plist(dset2)) < 0)
+                goto error;
+            
+           /*-------------------------------------------------------------------------
+            * compare the property lists
+            *-------------------------------------------------------------------------
+            */
+            if((ret = H5Pequal(dcpl1, dcpl2)) < 0)
+                goto error;
+            
+            if(ret == 0) 
+            {
+                error_msg(progname, "property lists for <%s> are different\n",travt1->objs[i].name);
+                goto error;
+            }
+            
+           /*-------------------------------------------------------------------------
+            * close
+            *-------------------------------------------------------------------------
+            */
+            if(H5Pclose(dcpl1) < 0)
+                goto error;
+            if(H5Pclose(dcpl2) < 0)
+                goto error;
+            if(H5Dclose(dset1) < 0)
+                goto error;
+            if(H5Dclose(dset2) < 0)
+                goto error;
+        } /*if*/
+    } /*i*/
+    
+   /*-------------------------------------------------------------------------
+    * free
+    *-------------------------------------------------------------------------
+    */
+    
+    trav_table_free(travt1);
+    trav_table_free(travt2);
+    
+   /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    
+    H5Fclose(fid1);
+    H5Fclose(fid2);
+    return ret;
+    
+   /*-------------------------------------------------------------------------
+    * error
+    *-------------------------------------------------------------------------
+    */
+    
 error:
- H5E_BEGIN_TRY {
-  H5Pclose(dcpl_id);
-  H5Sclose(space_id);
-  H5Dclose(dset_id);
-  H5Fclose(fid);
-  if (travt)
-   trav_table_free(travt);
- } H5E_END_TRY;
- return -1;
+    H5E_BEGIN_TRY 
+    {
+        H5Pclose(dcpl1);
+        H5Pclose(dcpl2);
+        H5Dclose(dset1);
+        H5Dclose(dset2);
+        H5Fclose(fid1);
+        H5Fclose(fid2);
+        trav_table_free(travt1);
+        trav_table_free(travt2);
+    } H5E_END_TRY;
+    return -1;
+    
 }
 
 
-
 /*-------------------------------------------------------------------------
- * Function: h5repack_cmpdcpl
+ * Function: has_filters
  *
- * Purpose: compare 2 files for identical property lists of all objects
+ * Purpose: verify if all requested filters in the array FILTER obtained
+ *  from user input are present in the property list PID obtained from
+ *  the output file
  *
- * Return: 1=identical, 0=not identical, -1=error
+ * Return: 
+ *  1 match
+ *  0 do not match
+ * -1 error
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente, pvn@hdfgroup.org
  *
- * Date: December 31, 2003
+ * Date: December 21, 2007
  *
  *-------------------------------------------------------------------------
  */
 
-int h5repack_cmpdcpl(const char *fname1,
-                     const char *fname2)
+static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *filter)
 {
- hid_t         fid1=-1;       /* file ID */
- hid_t         fid2=-1;       /* file ID */
- hid_t         dset1=-1;      /* dataset ID */
- hid_t         dset2=-1;      /* dataset ID */
- hid_t         dcpl1=-1;      /* dataset creation property list ID */
- hid_t         dcpl2=-1;      /* dataset creation property list ID */
- trav_table_t  *travt1=NULL;
- trav_table_t  *travt2=NULL;
- int           ret=1;
- unsigned int  i;
-
-/*-------------------------------------------------------------------------
- * open the files first; if they are not valid, no point in continuing
- *-------------------------------------------------------------------------
- */
-
- /* disable error reporting */
- H5E_BEGIN_TRY {
-
- /* Open the files */
- if ((fid1=H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
- {
-  error_msg(progname, "<%s>: %s\n", fname1, H5FOPENERROR );
-  return -1;
- }
- if ((fid2=H5Fopen(fname2,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
- {
-  error_msg(progname, "<%s>: %s\n", fname2, H5FOPENERROR );
-  H5Fclose(fid1);
-  return -1;
- }
- /* enable error reporting */
- } H5E_END_TRY;
-
-/*-------------------------------------------------------------------------
- * get file table list of objects
- *-------------------------------------------------------------------------
- */
- trav_table_init(&travt1);
- trav_table_init(&travt2);
- if(h5trav_gettable(fid1, travt1) < 0)
-  goto error;
- if(h5trav_gettable(fid2, travt2) < 0)
-  goto error;
-
-
-/*-------------------------------------------------------------------------
- * traverse the suppplied object list
- *-------------------------------------------------------------------------
- */
-
- for(i = 0; i < travt1->nobjs; i++) {
-  if(travt1->objs[i].type == H5TRAV_TYPE_DATASET) {
-   if((dset1 = H5Dopen2(fid1, travt1->objs[i].name, H5P_DEFAULT)) < 0)
-    goto error;
-   if((dset2 = H5Dopen2(fid2, travt1->objs[i].name, H5P_DEFAULT)) < 0)
-    goto error;
-   if((dcpl1 = H5Dget_create_plist(dset1)) < 0)
-    goto error;
-   if((dcpl2 = H5Dget_create_plist(dset2)) < 0)
-    goto error;
-
-/*-------------------------------------------------------------------------
- * compare the property lists
- *-------------------------------------------------------------------------
- */
-   if((ret = H5Pequal(dcpl1, dcpl2)) < 0)
-    goto error;
-
-   if(ret == 0) {
-    error_msg(progname, "property lists for <%s> are different\n",travt1->objs[i].name);
-    goto error;
-   }
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-   if(H5Pclose(dcpl1) < 0)
-    goto error;
-   if(H5Pclose(dcpl2) < 0)
-    goto error;
-   if(H5Dclose(dset1) < 0)
-    goto error;
-   if(H5Dclose(dset2) < 0)
-    goto error;
-  } /*if*/
- } /*i*/
-
-/*-------------------------------------------------------------------------
- * free
- *-------------------------------------------------------------------------
- */
-
- trav_table_free(travt1);
- trav_table_free(travt2);
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-
- H5Fclose(fid1);
- H5Fclose(fid2);
- return ret;
-
-/*-------------------------------------------------------------------------
- * error
- *-------------------------------------------------------------------------
- */
-
-error:
- H5E_BEGIN_TRY {
- H5Pclose(dcpl1);
- H5Pclose(dcpl2);
- H5Dclose(dset1);
- H5Dclose(dset2);
- H5Fclose(fid1);
- H5Fclose(fid2);
- trav_table_free(travt1);
- trav_table_free(travt2);
- } H5E_END_TRY;
- return -1;
+    unsigned      nfilters_dcpl;  /* number of filters in DCPL*/
+    unsigned      filt_flags;     /* filter flags */
+    H5Z_filter_t  filtn;          /* filter identification number */
+    unsigned      cd_values[20];  /* filter client data values */
+    size_t        cd_nelmts;      /* filter client number of values */
+    char          f_name[256];    /* filter name */
+    size_t        size;           /* type size */
+    unsigned      i, j;           /* index */
+  
+    /* get information about filters */
+    if((nfilters_dcpl = H5Pget_nfilters(pid)) < 0)
+        return -1;
+  
+    /* if we do not have filters and the requested filter is NONE, return 1 */
+    if(!nfilters_dcpl && 
+        nfilters == 1 && 
+        filter[0].filtn == H5Z_FILTER_NONE )
+        return 1;
+
+    /* else the numbers of filters must match */
+    if (nfilters_dcpl != nfilters )
+        return 0;
+
+    /*-------------------------------------------------------------------------
+     * build a list with DCPL filters
+     *-------------------------------------------------------------------------
+     */
+
+    for( i = 0; i < nfilters_dcpl; i++) 
+    {
+        cd_nelmts = NELMTS(cd_values);
+        filtn = H5Pget_filter2(pid, i, &filt_flags, &cd_nelmts,
+            cd_values, sizeof(f_name), f_name, NULL);
+      
+        /* filter ID */
+        if (filtn != filter[i].filtn)
+            return 0;
+
+        /* compare client data values. some filters do return local values */
+        switch (filtn)
+        {
+            
+        case H5Z_FILTER_SHUFFLE:
+            
+            /* 1 private client value is returned by DCPL */
+            if ( cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SHUFFLE_USER_NPARMS )
+                return 0;
+            
+            /* get dataset's type size */
+            if((size = H5Tget_size(tid)) <= 0)
+                return -1;
+            
+            /* the private client value holds the dataset's type size */
+            if ( size != cd_values[0] )
+                return 0;
+                        
+            
+            break;
+            
+        case H5Z_FILTER_SZIP:
+
+            /* 4 private client values are returned by DCPL */
+            if ( cd_nelmts != H5Z_SZIP_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SZIP_USER_NPARMS )
+                return 0;
+
+            /* "User" parameter for pixels-per-block (index 1) */
+            if ( cd_values[H5Z_SZIP_PARM_PPB] != filter[i].cd_values[H5Z_SZIP_PARM_PPB] )
+                return 0;
+           
+            
+            break;
+            
+        case H5Z_FILTER_NBIT:
+           
+            /* only client data values number of values checked */
+            if ( H5Z_NBIT_USER_NPARMS != filter[i].cd_nelmts)
+                return 0;
+           
+            
+            
+            break;
+            
+        case H5Z_FILTER_SCALEOFFSET:
+
+            /* only client data values checked */
+            for( j = 0; j < H5Z_SCALEOFFSET_USER_NPARMS; j++) 
+            {
+                if (cd_values[j] != filter[i].cd_values[j])
+                {
+                    return 0; 
+                }
+                
+            }
+                
+            
+            break;
+            
+        /* for these filters values must match, no local values set in DCPL */
+        case H5Z_FILTER_FLETCHER32:
+        case H5Z_FILTER_DEFLATE:
+            
+            if ( cd_nelmts != filter[i].cd_nelmts)
+                return 0;
+            
+            for( j = 0; j < cd_nelmts; j++) 
+            {
+                if (cd_values[j] != filter[i].cd_values[j])
+                {
+                    return 0; 
+                }
+                
+            }
+            
+            
+            
+            break;
+            
+            
+            
+        } /* switch */
 
+    }
+ 
+    return 1;
 }
+
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 0e99d4f..99448c4 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -896,6 +896,8 @@ if (szip_can_encode) {
   GOERROR;
  if (h5repack_verify(FNAME7OUT,&pack_options)<=0)
   GOERROR;
+ if (h5repack_cmpdcpl(FNAME7,FNAME7OUT)<=0)
+  GOERROR;
  if (h5repack_end (&pack_options) < 0)
   GOERROR;
 
@@ -1097,6 +1099,7 @@ if (szip_can_encode) {
  SKIPPED();
 #endif
 
+
   TESTING("    adding nbit filter");
 
 #ifdef H5_HAVE_FILTER_NBIT
@@ -1117,6 +1120,8 @@ if (szip_can_encode) {
 #else
  SKIPPED();
 #endif
+
+
  TESTING("    copy of scaleoffset filter");
 
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
@@ -1179,6 +1184,8 @@ if (szip_can_encode) {
  SKIPPED();
 #endif
 
+
+
 /*-------------------------------------------------------------------------
  * file with all filters
  *  dset_all
@@ -1355,6 +1362,36 @@ if (szip_can_encode) {
 
 
 /*-------------------------------------------------------------------------
+ * test several global filters
+ *-------------------------------------------------------------------------
+ */
+
+  TESTING("    several global filters");
+
+#if defined (H5_HAVE_FILTER_DEFLATE) && defined (H5_HAVE_FILTER_SHUFFLE) 
+
+ if (h5repack_init (&pack_options, 0) < 0)
+  GOERROR;
+ if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
+  GOERROR;
+ if (h5repack_addfilter("SHUF",&pack_options) < 0)
+  GOERROR;
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+  GOERROR;
+ if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+  GOERROR;
+ if (h5repack_verify(FNAME11OUT,&pack_options)<=0)
+  GOERROR;
+ if (h5repack_end (&pack_options) < 0)
+  GOERROR;
+
+ PASSED();
+#else
+ SKIPPED();
+#endif
+
+
+/*-------------------------------------------------------------------------
  * clean temporary test files
  *-------------------------------------------------------------------------
  */
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index 33a3060..28106c4 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -213,6 +213,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index c69d801..f03efd7 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -47,8 +47,7 @@ typedef struct ohdr_info_t {
 
 /* Info to pass to the iteration functions */
 typedef struct iter_t {
-    const char *container;              /* Full name of the container object */
-    unsigned long curr_depth;           /* Current depth of hierarchy */
+    hid_t fid;                          /* File ID */
 
     unsigned long uniq_groups;          /* Number of unique groups */
     unsigned long uniq_dsets;           /* Number of unique datasets */
@@ -56,7 +55,6 @@ typedef struct iter_t {
     unsigned long uniq_links;           /* Number of unique links */
     unsigned long uniq_others;          /* Number of other unique objects */
 
-    unsigned long max_depth;            /* Maximum depth of hierarchy */
     unsigned long max_links;            /* Maximum # of links to an object */
     hsize_t max_fanout;                 /* Maximum fanout from a group */
     unsigned long num_small_groups[SIZE_SMALL_GROUPS];     /* Size of small groups tracked */
@@ -95,16 +93,6 @@ typedef struct iter_t {
 } iter_t;
 
 
-/* Table containing object id and object name */
-static struct {
-    int  nalloc;                /* number of slots allocated */
-    int  nobjs;                 /* number of objects */
-    struct {
-        haddr_t id;             /* object number */
-        char *name;             /* full object name */
-    } *obj;
-} idtab_g;
-
 const char *progname = "h5stat";
 int               d_status = EXIT_SUCCESS;
 static int        display_all = TRUE;
@@ -260,123 +248,6 @@ ceil_log10(unsigned long x)
 
 
 /*-------------------------------------------------------------------------
- * Function: sym_insert
- *
- * Purpose: Add a symbol to the table.
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- *-------------------------------------------------------------------------
- */
-static void
-sym_insert(H5O_info_t *oi, const char *name)
-{
-    /* Don't add it if the link count is 1 because such an object can only
-     * have one name. */
-    if(oi->rc > 1) {
-        int  n;
-
-        /* Extend the table */
-        if(idtab_g.nobjs >= idtab_g.nalloc) {
-            idtab_g.nalloc = MAX(256, 2 * idtab_g.nalloc);
-            idtab_g.obj = realloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0]));
-        } /* end if */
-
-        /* Insert the entry */
-        n = idtab_g.nobjs++;
-        idtab_g.obj[n].id = oi->addr;
-        idtab_g.obj[n].name = strdup(name);
-    } /* end if */
-} /* end sym_insert() */
-
-
-/*-------------------------------------------------------------------------
- * Function: sym_lookup
- *
- * Purpose: Find another name for the specified object.
- *
- * Return: Success: Ptr to another name.
- *
- *  Failure: NULL
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static char *
-sym_lookup(H5O_info_t *oi)
-{
-    int  n;
-
-    /*only one name possible*/
-    if(oi->rc < 2)
-        return NULL;
-
-    for(n = 0; n < idtab_g.nobjs; n++)
-        if(idtab_g.obj[n].id == oi->addr)
-            return idtab_g.obj[n].name;
-
-    return NULL;
-} /* end sym_lookup() */
-
-
-/*-------------------------------------------------------------------------
- * Function: fix_name
- *
- * Purpose: Returns a malloc'd buffer that contains the PATH and BASE
- *  names separated by a single slash. It also removes duplicate
- *  and trailing slashes.
- *
- * Return: Success: Ptr to fixed name from malloc()
- *
- *  Failure: NULL
- *
- * Programmer: Robb Matzke
- *              Thursday, January 21, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static char *
-fix_name(const char *path, const char *base)
-{
-    size_t n = (path ? strlen(path) : 0) + (base ? strlen(base) : 0) + 3;
-    char *s = malloc(n), prev='\0';
-    size_t len = 0;
-
-    if (path) {
-        /* Path, followed by slash */
-        for (/*void*/; *path; path++)
-            if ('/'!=*path || '/'!=prev)
-                prev = s[len++] = *path;
-        if ('/' != prev)
-            prev = s[len++] = '/';
-    }
-
-    if (base) {
-        /* Base name w/o trailing slashes */
-        const char *end = base + strlen(base);
-        while (end > base && '/' == end[-1])
-            --end;
-
-        for (/*void*/; base < end; base++)
-            if ('/' != *base || '/' != prev)
-                prev = s[len++] = *base;
-    }
-
-    s[len] = '\0';
-    return s;
-}
-
-
-/*-------------------------------------------------------------------------
  * Function: attribute_stats
  *
  * Purpose: Gather statistics about attributes on an object
@@ -453,25 +324,21 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
  *-------------------------------------------------------------------------
  */
 static herr_t
-group_stats(hid_t group, const char *name, const char *fullname,
-    const H5O_info_t *oi, H5L_iterate_t walk, iter_t *iter)
+group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
-    const char 		*last_container;
     H5G_info_t 		ginfo;                  /* Group information */
     unsigned 		bin;                   	/* "bin" the number of objects falls in */
     herr_t 		ret;
 
     /* Gather statistics about this type of object */
     iter->uniq_groups++;
-    if(iter->curr_depth > iter->max_depth)
-	iter->max_depth = iter->curr_depth;
 
     /* Get object header information */
     iter->group_ohdr_info.total_size += oi->hdr.space.total;
     iter->group_ohdr_info.free_size += oi->hdr.space.free;
 
     /* Get group information */
-    ret = H5Gget_info_by_name(group, name, &ginfo, H5P_DEFAULT);
+    ret = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT);
     assert(ret >= 0);
 
     /* Update link stats */
@@ -506,18 +373,6 @@ group_stats(hid_t group, const char *name, const char *fullname,
     ret = attribute_stats(iter, oi);
     assert(ret >= 0);
 
-    /* Update current container info */
-    last_container = iter->container;
-    iter->container = fullname;
-    iter->curr_depth++;
-
-    /* Recursively descend into current group's objects */
-    H5Literate_by_name(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, walk, iter, H5P_DEFAULT);
-
-    /* Revert current container info */
-    iter->container = last_container;
-    iter->curr_depth--;
-     
     return 0;
 } /* end group_stats() */
 
@@ -549,7 +404,7 @@ group_stats(hid_t group, const char *name, const char *fullname,
  *-------------------------------------------------------------------------
  */
 static herr_t
-dataset_stats(hid_t group, const char *name, const H5O_info_t *oi, iter_t *iter)
+dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
     unsigned 		bin;               /* "bin" the number of objects falls in */
     hid_t 		did;               /* Dataset ID */
@@ -575,7 +430,7 @@ dataset_stats(hid_t group, const char *name, const H5O_info_t *oi, iter_t *iter)
     iter->dset_ohdr_info.total_size += oi->hdr.space.total;
     iter->dset_ohdr_info.free_size += oi->hdr.space.free;
 
-    did = H5Dopen2(group, name, H5P_DEFAULT);
+    did = H5Dopen2(iter->fid, name, H5P_DEFAULT);
     assert(did > 0);
 
     /* Update dataset metadata info */
@@ -710,89 +565,90 @@ dataset_stats(hid_t group, const char *name, const H5O_info_t *oi, iter_t *iter)
 
 
 /*-------------------------------------------------------------------------
- * Function: walk
+ * Function: obj_stats
  *
- * Purpose: Gather statistics about the file
+ * Purpose: Gather statistics about an object
  *
  * Return: Success: 0
- *  	   Failure: -1
  *
- * Programmer: Quincey Koziol
- *             Tuesday, August 16, 2005
+ *  Failure: -1
  *
- * Modifications:
+ * Programmer: Quincey Koziol
+ *             Tuesday, November 6, 2007
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-walk(hid_t group, const char *name, const H5L_info_t *linfo, void *_iter)
+obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
+    void *_iter)
 {
     iter_t *iter = (iter_t *)_iter;
-    char *fullname = NULL;
-    herr_t ret;                     /* Generic return value */
-
-    if(!linfo || linfo->type == H5L_TYPE_HARD) {
-        H5O_info_t oi;
-        char *s;
-
-        /* Get object information */
-        ret = H5Oget_info_by_name(group, name, &oi, H5P_DEFAULT);
-        assert(ret >= 0);
-
-        /* If the object has already been printed then just show the object ID
-         * and return. */
-        if((s = sym_lookup(&oi))) {
-            printf("%s same as %s\n", name, s);
-        } else {
-            /* Get the full object name */
-            fullname = fix_name(iter->container, name);
-            sym_insert(&oi, fullname);
-
-            /* Gather some statistics about the object */
-            if(oi.rc > iter->max_links)
-                iter->max_links = oi.rc;
-
-            switch(oi.type) {
-                case H5O_TYPE_GROUP:
-                    group_stats(group, name, fullname, &oi, walk, iter);
-                    break;
-
-                case H5O_TYPE_DATASET:
-                    dataset_stats(group, name, &oi, iter);
-                    break;
-
-                case H5O_TYPE_NAMED_DATATYPE:
-                    /* Gather statistics about this type of object */
-                    iter->uniq_types++;
-                    break;
-
-                default:
-                    /* Gather statistics about this type of object */
-                    iter->uniq_others++;
-                    break;
-            } /* end switch */
-        }
-    } /* end if */
-    else {
-        switch(linfo->type) {
-            case H5L_TYPE_SOFT:
-            case H5L_TYPE_EXTERNAL:
-                /* Gather statistics about links and UD links */
-                iter->uniq_links++;
+
+    /* If the object has already been seen then just return */
+    if(NULL == already_visited) {
+        /* Gather some general statistics about the object */
+        if(oi->rc > iter->max_links)
+            iter->max_links = oi->rc;
+
+        switch(oi->type) {
+            case H5O_TYPE_GROUP:
+                group_stats(iter, path, oi);
+                break;
+
+            case H5O_TYPE_DATASET:
+                dataset_stats(iter, path, oi);
+                break;
+
+            case H5O_TYPE_NAMED_DATATYPE:
+                /* Gather statistics about this type of object */
+                iter->uniq_types++;
                 break;
 
             default:
                 /* Gather statistics about this type of object */
                 iter->uniq_others++;
                 break;
-        } /* end switch() */
-    } /* end else */
+        } /* end switch */
+    } /* end if */
 
-    if(fullname)
-        free(fullname);
+    return 0;
+} /* end obj_stats() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: lnk_stats
+ *
+ * Purpose: Gather statistics about a link
+ *
+ * Return: Success: 0
+ *
+ *  Failure: -1
+ *
+ * Programmer: Quincey Koziol
+ *             Tuesday, November 6, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+lnk_stats(const char UNUSED *path, const H5L_info_t *li, void *_iter)
+{
+    iter_t *iter = (iter_t *)_iter;
+
+    switch(li->type) {
+        case H5L_TYPE_SOFT:
+        case H5L_TYPE_EXTERNAL:
+            /* Gather statistics about links and UD links */
+            iter->uniq_links++;
+            break;
+
+        default:
+            /* Gather statistics about this type of object */
+            iter->uniq_others++;
+            break;
+    } /* end switch() */
 
     return 0;
-}
+} /* end lnk_stats() */
 
 
 /*-------------------------------------------------------------------------
@@ -915,13 +771,13 @@ parse_command_line(int argc, const char *argv[])
  *-------------------------------------------------------------------------
  */
 static herr_t
-iter_init(iter_t *iter)
+iter_init(iter_t *iter, hid_t fid)
 {
     /* Clear everything to zeros */
-    memset(iter, 0, sizeof(*iter));
+    HDmemset(iter, 0, sizeof(*iter));
 
-    /* Initialize non-zero information */
-    iter->container = "/";
+    /* Set the file ID for later use in callbacks */
+    iter->fid = fid;
 
     return 0;
 }
@@ -953,7 +809,6 @@ print_file_info(const iter_t *iter)
     printf("\t# of unique links: %lu\n", iter->uniq_links);
     printf("\t# of unique other: %lu\n", iter->uniq_others);
     printf("\tMax. # of links to object: %lu\n", iter->max_links);
-    printf("\tMax. depth of hierarchy: %lu\n", iter->max_depth);
     HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
 
     return 0;
@@ -1318,8 +1173,6 @@ main(int argc, const char *argv[])
     const char     	*fname = NULL;
     hid_t           	fid;
     struct handler_t   *hand;
-    char            	root[] = "/";
-    int             	i;
     H5F_info_t      	finfo;
 
 
@@ -1329,25 +1182,23 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
     hand = parse_command_line (argc, argv);
-    if (!hand) {
+    if(!hand) {
         error_msg(progname, "unable to parse command line arguments \n");
         leave(EXIT_FAILURE);
-    }
+    } /* end if */
 
     fname = argv[opt_ind];
-    if(!display_object)
-        hand[0].obj = root;
 
     printf("Filename: %s\n", fname);
 
     fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-    if (fid < 0) {
+    if(fid < 0) {
         error_msg(progname, "unable to open file \"%s\"\n", fname);
         leave(EXIT_FAILURE);
-    }
+    } /* end if */
 
     /* Initialize iter structure */
-    iter_init(&iter);
+    iter_init(&iter, fid);
     
     /* Get storge info for SOHM's btree/list/heap and superblock extension */
     if(H5Fget_info(fid, &finfo) < 0)
@@ -1357,15 +1208,23 @@ main(int argc, const char *argv[])
 	iter.SM_hdr_storage_size = finfo.sohm.hdr_size;
 	iter.SM_index_storage_size = finfo.sohm.msgs_info.index_size;
 	iter.SM_heap_storage_size = finfo.sohm.msgs_info.heap_size;
-    }
+    } /* end else */
 
     /* Walk the objects or all file */
-    i = 0;
-    while(hand[i].obj) {
-        walk(fid, hand[i].obj, NULL, &iter);
-        print_statistics(hand[i].obj, &iter);
-        i++;
-    } /* end while */
+    if(display_object) {
+        unsigned u;
+
+        u = 0;
+        while(hand[u].obj) {
+            h5trav_visit(fid, hand[u].obj, TRUE, TRUE, obj_stats, lnk_stats, &iter);
+            print_statistics(hand[u].obj, &iter);
+            u++;
+        } /* end while */
+    } /* end if */
+    else {
+        h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter);
+        print_statistics("/", &iter);
+    } /* end else */
 
     free(hand);
 
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 22396b6..28d20ce 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -46,7 +46,7 @@ static void gen_file(void)
     char	attrname[30];
 
     fapl = H5Pcreate(H5P_FILE_ACCESS);
-    ret = H5Pset_latest_format(fapl, 1);
+    ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
 
      /* Create dataset */
     file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
diff --git a/tools/h5stat/testfiles/h5stat_filters-file.ddl b/tools/h5stat/testfiles/h5stat_filters-file.ddl
index c6aeef0..7b8f47f 100644
--- a/tools/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-file.ddl
@@ -9,5 +9,4 @@ File information
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
-	Max. depth of hierarchy: 0
 	Max. # of objects in group: 16
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index 4dd6aee..df2e304 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -9,7 +9,6 @@ File information
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
-	Max. depth of hierarchy: 0
 	Max. # of objects in group: 16
 Object header size: (total/unused)
 	Groups: 48/8
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index 228d565..6881ca9 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -9,7 +9,6 @@ File information
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
-	Max. depth of hierarchy: 1
 	Max. # of objects in group: 351
 Object header size: (total/unused)
 	Groups: 51597/32292
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index 572965e..15a058e 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -9,7 +9,6 @@ File information
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
-	Max. depth of hierarchy: 0
 	Max. # of objects in group: 2
 Object header size: (total/unused)
 	Groups: 51/2
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8de1275..ab8643d 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -209,6 +209,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 4a6a8cd..4f4074f 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -810,7 +810,7 @@ hsize_t diff(hid_t file1_id,
            /*-------------------------------------------------------------------------
             * non verbose, check first if we have differences by enabling quiet mode
             * so that printing is off, and compare again if differences found,
-            * disabling quite mode
+            * disabling quiet mode
             *-------------------------------------------------------------------------
             */
             else {
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 75b773a..008b6b9 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -21,6 +21,12 @@
 #include 
 #include 
 
+#if 0
+#define H5DIFF_DO_TIME
+#endif
+#if 1
+#define H5DIFF_DO_NAN
+#endif
 
 /*-------------------------------------------------------------------------
  * printf formatting
@@ -61,8 +67,6 @@
 #define H5DIFF_FLT_EPSILON  .00001
 #define H5DIFF_DBL_EPSILON  .000000001
 
-static hbool_t equal_float(float value, float expected);
-static hbool_t equal_double(double value, double expected);
 
 /*-------------------------------------------------------------------------
  * -p relative error formula
@@ -126,8 +130,13 @@ static hbool_t all_zero(const void *_mem, size_t size);
 static int     ull2float(unsigned long_long ull_value, float *f_value);
 static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
+static hbool_t equal_float(float value, float expected);
+static hbool_t equal_double(double value, double expected);
 
-
+/*-------------------------------------------------------------------------
+ * NaN detection
+ *-------------------------------------------------------------------------
+ */
 typedef enum dtype_t 
 {
     FLT_FLOAT, FLT_DOUBLE,
@@ -154,7 +163,7 @@ static int my_isnan(dtype_t type, void *val);
 static
 int print_data(diff_opt_t *options)
 {
- return ( (options->m_report || options->m_verbose) && !options->m_quiet)?1:0;
+    return ( (options->m_report || options->m_verbose) && !options->m_quiet)?1:0;
 }
 
 /*-------------------------------------------------------------------------
@@ -253,170 +262,135 @@ hsize_t diff_array( void *_mem1,
                     hid_t container1_id,
                     hid_t container2_id) /* dataset where the reference came from*/
 {
- hsize_t       nfound=0;          /* number of differences found */
- size_t        size;              /* size of datum */
- unsigned char *mem1 = (unsigned char*)_mem1;
- unsigned char *mem2 = (unsigned char*)_mem2;
- unsigned char *tmp1;
- unsigned char *tmp2;
- hsize_t       acc[32];    /* accumulator position */
- hsize_t       pos[32];    /* matrix position */
- int           ph=1;       /* print header  */
- hsize_t       i;
- int           j;
-
-
- /* get the size. */
- size = H5Tget_size( m_type );
-
- acc[rank-1]=1;
- for(j=(rank-2); j>=0; j--)
- {
-  acc[j]=acc[j+1]*dims[j+1];
- }
- for ( j = 0; j < rank; j++)
-  pos[j]=0;
-
- if(H5Tis_variable_str(m_type))
- {
-  tmp1 = ((unsigned char**)mem1)[0];
-  tmp2 = ((unsigned char**)mem2)[0];
-  nfound+=diff_datum(
-   tmp1,
-   tmp2,
-   m_type,
-   (hsize_t)0,
-   rank,
-   dims,
-   acc,
-   pos,
-   options,
-   name1,
-   name2,
-   container1_id,
-   container2_id,
-   &ph);
- }
-
- else
- {
-  switch (H5Tget_class(m_type))
-  {
-  default:
-   assert(0);
-   break;
-
- /*-------------------------------------------------------------------------
-  * float and integer atomic types
-  *-------------------------------------------------------------------------
-  */
- 
-  case H5T_FLOAT:
-
-      if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
-      {
-
-#if defined (H5DIFF_DO_TIME)
-          int time;
-
-     #if defined (WIN32)
-          struct _timeb *tbstart = malloc(sizeof(struct _timeb));
-	      struct _timeb *tbstop = malloc(sizeof(struct _timeb));
-          _ftime( tbstart);
-     #else
-          struct timeb *tbstart = malloc(sizeof(struct timeb));
-	      struct timeb *tbstop = malloc(sizeof(struct timeb));
-          ftime( tbstart);
-     #endif
-
-#endif
-          
-         
-          
-          nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-
-
-#if defined (H5DIFF_DO_TIME)
-
-      #if defined (WIN32)
-          _ftime( tbstop );
-      #else
-          ftime( tbstop );
-      #endif
-
-          time = tbstop->time - tbstart->time;
-          printf(" TIME = %d\n", time );
-
-#endif
-          
-      }
-   else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
-    nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   break;
-
-  case H5T_INTEGER:
-
-   if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
-    nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
-    nfound=diff_uchar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
-    nfound=diff_short(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
-    nfound=diff_ushort(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_INT))
-    nfound=diff_int(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_UINT))
-    nfound=diff_uint(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_LONG))
-    nfound=diff_long(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
-    nfound=diff_ulong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
-    nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-   else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
-    nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-
-   break;
-
- /*-------------------------------------------------------------------------
-  * Other types than float and integer
-  *-------------------------------------------------------------------------
-  */
-
-  case H5T_COMPOUND:
-  case H5T_STRING:
-  case H5T_BITFIELD:
-  case H5T_OPAQUE:
-  case H5T_ENUM:
-  case H5T_ARRAY:
-  case H5T_VLEN:
-  case H5T_REFERENCE:
-
-   for ( i = 0; i < nelmts; i++)
-   {
-    nfound+=diff_datum(
-     mem1 + i * size,
-     mem2 + i * size, /* offset */
-     m_type,
-     i,
-     rank,
-     dims,
-     acc,
-     pos,
-     options,
-     name1,
-     name2,
-     container1_id,
-     container2_id,
-     &ph);
-    if (options->n && nfound>=options->count)
-     return nfound;
-   } /* i */
-  } /* switch */
- } /* else */
-
- return nfound;
+    hsize_t       nfound=0;          /* number of differences found */
+    size_t        size;              /* size of datum */
+    unsigned char *mem1 = (unsigned char*)_mem1;
+    unsigned char *mem2 = (unsigned char*)_mem2;
+    unsigned char *tmp1;
+    unsigned char *tmp2;
+    hsize_t       acc[32];    /* accumulator position */
+    hsize_t       pos[32];    /* matrix position */
+    int           ph=1;       /* print header  */
+    hsize_t       i;
+    int           j;
+    
+    
+    /* get the size. */
+    size = H5Tget_size( m_type );
+    
+    acc[rank-1]=1;
+    for(j=(rank-2); j>=0; j--)
+    {
+        acc[j]=acc[j+1]*dims[j+1];
+    }
+    for ( j = 0; j < rank; j++)
+        pos[j]=0;
+    
+    if(H5Tis_variable_str(m_type))
+    {
+        tmp1 = ((unsigned char**)mem1)[0];
+        tmp2 = ((unsigned char**)mem2)[0];
+        nfound+=diff_datum(
+            tmp1,
+            tmp2,
+            m_type,
+            (hsize_t)0,
+            rank,
+            dims,
+            acc,
+            pos,
+            options,
+            name1,
+            name2,
+            container1_id,
+            container2_id,
+            &ph);
+    }
+    
+    else
+    {
+        switch (H5Tget_class(m_type))
+        {
+        default:
+            assert(0);
+            break;
+            
+       /*-------------------------------------------------------------------------
+        * float and integer atomic types
+        *-------------------------------------------------------------------------
+        */
+            
+        case H5T_FLOAT:
+            
+            if (H5Tequal(m_type, H5T_NATIVE_FLOAT))            
+                nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
+                nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            break;
+            
+        case H5T_INTEGER:
+            
+            if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
+                nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
+                nfound=diff_uchar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
+                nfound=diff_short(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
+                nfound=diff_ushort(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_INT))
+                nfound=diff_int(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_UINT))
+                nfound=diff_uint(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_LONG))
+                nfound=diff_long(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
+                nfound=diff_ulong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
+                nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
+                nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            
+            break;
+            
+        /*-------------------------------------------------------------------------
+         * Other types than float and integer
+         *-------------------------------------------------------------------------
+         */
+            
+        case H5T_COMPOUND:
+        case H5T_STRING:
+        case H5T_BITFIELD:
+        case H5T_OPAQUE:
+        case H5T_ENUM:
+        case H5T_ARRAY:
+        case H5T_VLEN:
+        case H5T_REFERENCE:
+            
+            for ( i = 0; i < nelmts; i++)
+            {
+                nfound+=diff_datum(
+                    mem1 + i * size,
+                    mem2 + i * size, /* offset */
+                    m_type,
+                    i,
+                    rank,
+                    dims,
+                    acc,
+                    pos,
+                    options,
+                    name1,
+                    name2,
+                    container1_id,
+                    container2_id,
+                    &ph);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+            } /* i */
+        } /* switch */
+    } /* else */
+    
+    return nfound;
 }
 
 /*-------------------------------------------------------------------------
@@ -472,1640 +446,1778 @@ hsize_t diff_datum(void       *_mem1,
                    hid_t      container2_id, /*where the reference came from*/
                    int        *ph)           /*print header */
 {
- unsigned char *mem1 = (unsigned char*)_mem1;
- unsigned char *mem2 = (unsigned char*)_mem2;
- unsigned      u;
- hid_t         memb_type;
- size_t        type_size;
- size_t        offset;
- int           nmembs;
- int           j;
- hsize_t       nelmts;
- size_t        size=0;
- int           iszero1;
- int           iszero2;
- hid_t         obj1_id;
- hid_t         obj2_id;
- hsize_t       nfound=0;   /* differences found */
- int           ret=0;      /* check return error */
- float         f1, f2;
- double        per;
- int           both_zero;
-
- type_size = H5Tget_size( m_type );
-
- switch (H5Tget_class(m_type))
- {
- default:
-  assert(0);
-  break;
- case H5T_TIME:
-  assert(0);
-  break;
-
- /*-------------------------------------------------------------------------
-  * H5T_COMPOUND
-  *-------------------------------------------------------------------------
-  */
- case H5T_COMPOUND:
-  nmembs = H5Tget_nmembers(m_type);
-  for (j = 0; j < nmembs; j++)
-  {
-   offset    = H5Tget_member_offset(m_type, (unsigned)j);
-   memb_type = H5Tget_member_type(m_type, (unsigned)j);
-   nfound+=diff_datum(
-    mem1+offset,
-    mem2+offset,
-    memb_type,
-    i,
-    rank,
-    dims,
-    acc,
-    pos,
-    options,
-    obj1,
-    obj2,
-    container1_id,
-    container2_id,
-    ph);
-   H5Tclose(memb_type);
-  }
-  break;
-
- /*-------------------------------------------------------------------------
-  * H5T_STRING
-  *-------------------------------------------------------------------------
-  */
- case H5T_STRING:
-  {
-
-   H5T_str_t pad;
-   char      *s;
-
-   if(H5Tis_variable_str(m_type))
-   {
-   /* mem1 is the pointer into the struct where a `char*' is stored. So we have
-    * to dereference the pointer to get the `char*' to pass to HDstrlen(). */
-    s = *(char**)mem1;
-    if(s!=NULL)
-     size = HDstrlen(s);
-   }
-   else
-   {
-    s = (char *)mem1;
-    size = H5Tget_size(m_type);
-   }
-
-   pad = H5Tget_strpad(m_type);
-
-   /* check for NULL pointer for string */
-   if(s!=NULL)
-    for (u=0; u= 0) &&
-     (H5Tenum_nameof(m_type, mem2, enum_name2, sizeof enum_name2) >= 0))
-    {
-     if (HDstrcmp(enum_name1,enum_name2)!=0)
-     {
-      nfound=1;
-      if ( print_data(options) )
-      {
-       print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-       parallel_print(SPACES);
-       parallel_print(S_FORMAT,enum_name1,enum_name2);
-      }
-     }
-     else
-     {
-      for (u=0; u= 1 && ndims <= H5S_MAX_RANK);
-         
-         /* calculate the number of array elements */
-         for (u = 0, nelmts = 1; u len;
-
-  for (j = 0; j < (int)nelmts; j++)
-   nfound+=diff_datum(
-   ((char *)(((hvl_t *)mem1)->p)) + j * size,
-   ((char *)(((hvl_t *)mem2)->p)) + j * size, /* offset */
-   memb_type,
-   i,         /* index position */
-   rank,
-   dims,
-   acc,
-   pos,
-   options,
-   obj1,
-   obj2,
-   container1_id,
-   container2_id,
-   ph);
-
-  H5Tclose(memb_type);
-
-  break;
-
-
- case H5T_REFERENCE:
-
-  iszero1=all_zero(_mem1, H5Tget_size(m_type));
-  iszero2=all_zero(_mem2, H5Tget_size(m_type));
-  if (iszero1 != iszero2)
-  {
-   return 1;
-  }
-  else if (!iszero1 && !iszero2)
-  {
- 
- /*-------------------------------------------------------------------------
-  * H5T_STD_REF_DSETREG
-  * Dataset region reference
-  *-------------------------------------------------------------------------
-  */
-
-   if (H5Tequal(m_type, H5T_STD_REF_DSETREG))
-   {
-    hid_t  region1_id;
-    hid_t  region2_id;
-
-    if ((obj1_id = H5Rdereference(container1_id, H5R_DATASET_REGION, _mem1))<0)
-     ret= -1;
-    if ((obj2_id = H5Rdereference(container2_id, H5R_DATASET_REGION, _mem2))<0)
-     ret= -1;
-    if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1))<0)
-     ret= -1;
-    if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2))<0)
-     ret= -1;
-
-    if (ret==-1) {
-     options->err_stat=1;
-     return 0;
-    }
-
-    nfound = diff_region(obj1_id,obj2_id,region1_id,region2_id,options);
-
-    H5Oclose(obj1_id);
-    H5Oclose(obj2_id);
-    H5Sclose(region1_id);
-    H5Sclose(region2_id);
+        */
+        
+        {
+            char enum_name1[1024];
+            char enum_name2[1024];
+            
+            /* disable error reporting */
+            H5E_BEGIN_TRY {
+                
+                if ((H5Tenum_nameof(m_type, mem1, enum_name1, sizeof enum_name1) >= 0) &&
+                    (H5Tenum_nameof(m_type, mem2, enum_name2, sizeof enum_name2) >= 0))
+                {
+                    if (HDstrcmp(enum_name1,enum_name2)!=0)
+                    {
+                        nfound=1;
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(S_FORMAT,enum_name1,enum_name2);
+                        }
+                    }
+                    else
+                    {
+                        for (u=0; u= 1 && ndims <= H5S_MAX_RANK);
+            
+            /* calculate the number of array elements */
+            for (u = 0, nelmts = 1; u err_stat=1;
+                    return 0;
+                }
+                
+                nfound = diff_region(obj1_id,obj2_id,region1_id,region2_id,options);
+                
+                H5Oclose(obj1_id);
+                H5Oclose(obj2_id);
+                H5Sclose(region1_id);
+                H5Sclose(region2_id);
+                
+            }/*dataset reference*/
+            
+            
+           /*-------------------------------------------------------------------------
+            * H5T_STD_REF_OBJ
+            * Object references. get the type and OID of the referenced object
+            *-------------------------------------------------------------------------
+            */
+            else if (H5Tequal(m_type, H5T_STD_REF_OBJ))
+            {
+                H5O_type_t     obj1_type;
+                H5O_type_t     obj2_type;
+                
+                if(H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0)
+                    ret = -1;
+                if(H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0)
+                    ret = -1;
+                if(ret == -1) {
+                    options->err_stat = 1;
+                    return 0;
+                } /* end if */
+                
+                /* check object type */
+                if(obj1_type != obj2_type)
+                {
+                    parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2);
+                    options->not_cmp = 1;
+                    return 0;
+                }
+                
+                if((obj1_id = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0)
+                    ret = -1;
+                if((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0)
+                    ret = -1;
+                if(ret == -1) {
+                    options->err_stat = 1;
+                    return 0;
+                } /* end if */
+                
+                /* compare */
+                if(obj1_type == H5O_TYPE_DATASET)
+                    nfound = diff_datasetid(obj1_id,
+                    obj2_id,
+                    NULL,
+                    NULL,
+                    options);
+                else {
+                    parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>",
+                        obj1, obj2);
+                    options->not_cmp = 1;
+                }
+                
+                H5Oclose(obj1_id);
+                H5Oclose(obj2_id);
+                
+            }/*object reference*/
+            
+        }/*is zero*/
+        
+        
+        break;
 
+   /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+        
+    case H5T_VLEN:
+        
+        /* get the VL sequences's base datatype for each element */
+        memb_type = H5Tget_super(m_type);
+        size      = H5Tget_size(memb_type);
+        
+        /* get the number of sequence elements */
+        nelmts = ((hvl_t *)mem1)->len;
+        
+        for (j = 0; j < (int)nelmts; j++)
+            nfound+=diff_datum(
+            ((char *)(((hvl_t *)mem1)->p)) + j * size,
+            ((char *)(((hvl_t *)mem2)->p)) + j * size, /* offset */
+            memb_type,
+            i,         /* index position */
+            rank,
+            dims,
+            acc,
+            pos,
+            options,
+            obj1,
+            obj2,
+            container1_id,
+            container2_id,
+            ph);
+        
+        H5Tclose(memb_type);
+        
+        break;
+        
 
- /*-------------------------------------------------------------------------
-  * H5T_STD_REF_OBJ
-  * Object references. get the type and OID of the referenced object
-  *-------------------------------------------------------------------------
-  */
-   else if (H5Tequal(m_type, H5T_STD_REF_OBJ))
-   {
-    H5O_type_t     obj1_type;
-    H5O_type_t     obj2_type;
-
-    if(H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0)
-     ret = -1;
-    if(H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0)
-     ret = -1;
-    if(ret == -1) {
-     options->err_stat = 1;
-     return 0;
-    } /* end if */
-
-    /* check object type */
-    if(obj1_type != obj2_type)
-    {
-     parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2);
-     options->not_cmp = 1;
-     return 0;
-    }
-
-    if((obj1_id = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0)
-     ret = -1;
-    if((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0)
-     ret = -1;
-    if(ret == -1) {
-     options->err_stat = 1;
-     return 0;
-    } /* end if */
-
-    /* compare */
-    if(obj1_type == H5O_TYPE_DATASET)
-     nfound = diff_datasetid(obj1_id,
-      obj2_id,
-      NULL,
-      NULL,
-      options);
-    else {
-     parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>",
-      obj1, obj2);
-     options->not_cmp = 1;
-    }
-
-    H5Oclose(obj1_id);
-    H5Oclose(obj2_id);
-
-   }/*object reference*/
-
-  }/*is zero*/
-
-
-  break;
-
-
- case H5T_INTEGER:
-
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_SCHAR
-  *-------------------------------------------------------------------------
-  */
-  if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
-  {
-      char        temp1_char;
-      char        temp2_char;
-      assert(type_size==sizeof(char));
-      memcpy(&temp1_char, mem1, sizeof(char));
-      memcpy(&temp2_char, mem2, sizeof(char));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_char-temp2_char) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER(temp1_char,temp2_char);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER(temp1_char,temp2_char);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_char != temp2_char)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
-          }
-          nfound++;
-      }
-      
-  } /*H5T_NATIVE_SCHAR*/
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_UCHAR
-  *-------------------------------------------------------------------------
-  */
-  else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
-  {
-      unsigned char      temp1_uchar;
-      unsigned char      temp2_uchar;
-      assert(type_size==sizeof(unsigned char));
-      
-      memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
-      memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_uchar != temp2_uchar)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-          }
-          nfound++;
-      }
-      
-  } /*H5T_NATIVE_UCHAR*/
-
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_SHORT
-  *-------------------------------------------------------------------------
-  */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
-  {
-      short       temp1_short;
-      short       temp2_short;
-      assert(type_size==sizeof(short));
-      
-      memcpy(&temp1_short, mem1, sizeof(short));
-      memcpy(&temp2_short, mem2, sizeof(short));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_short-temp2_short) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER(temp1_short,temp2_short);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER(temp1_short,temp2_short);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_short != temp2_short)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
-          }
-          nfound++;
-      }
-      
-      
-  } /*H5T_NATIVE_SHORT*/
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_USHORT
-  *-------------------------------------------------------------------------
-  */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
-  {
-      unsigned short       temp1_ushort;
-      unsigned short       temp2_ushort;
-      assert(type_size==sizeof(short));
-      
-      memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
-      memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
-          {
-              
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                      PDIFF(temp1_ushort,temp2_ushort));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_ushort != temp2_ushort)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
-          }
-          nfound++;
-      }
-  } /*H5T_NATIVE_USHORT*/
-
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_INT
-  *-------------------------------------------------------------------------
-  */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_INT))
-  {
-      int         temp1_int;
-      int         temp2_int;
-      assert(type_size==sizeof(int));
-      
-      memcpy(&temp1_int, mem1, sizeof(int));
-      memcpy(&temp2_int, mem2, sizeof(int));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_int-temp2_int) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER(temp1_int,temp2_int);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER(temp1_int,temp2_int);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_int != temp2_int)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
-          }
-          nfound++;
-      }
-  } /*H5T_NATIVE_INT*/
-
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_UINT
-  *-------------------------------------------------------------------------
-  */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_UINT))
-  {
-      unsigned int         temp1_uint;
-      unsigned int         temp2_uint;
-      assert(type_size==sizeof(int));
-      
-      memcpy(&temp1_uint, mem1, sizeof(unsigned int));
-      memcpy(&temp2_uint, mem2, sizeof(unsigned int));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if ( PDIFF(temp1_uint,temp2_uint) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_uint != temp2_uint)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
-          }
-          nfound++;
-      }
-  } /*H5T_NATIVE_UINT*/
-
-
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_LONG
-  *-------------------------------------------------------------------------
-  */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_LONG))
-  {
-      long        temp1_long;
-      long        temp2_long;
-      assert(type_size==sizeof(long));
-      
-      memcpy(&temp1_long, mem1, sizeof(long));
-      memcpy(&temp2_long, mem2, sizeof(long));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_long-temp2_long) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER(temp1_long,temp2_long);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                      ABS(temp1_long-temp2_long));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(LI_FORMAT_P,temp1_long,temp2_long,ABS(temp1_long-temp2_long),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER(temp1_long,temp2_long);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(LI_FORMAT_P,temp1_long,temp2_long,
-                          ABS(temp1_long-temp2_long),
-                          per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_long != temp2_long)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
-          }
-          nfound++;
-      }
-  } /*H5T_NATIVE_LONG*/
+    
+   /*-------------------------------------------------------------------------
+    * H5T_INTEGER
+    *-------------------------------------------------------------------------
+    */        
+        
+    case H5T_INTEGER:
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_SCHAR
+        *-------------------------------------------------------------------------
+        */
+        if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
+        {
+            char        temp1_char;
+            char        temp2_char;
+            assert(type_size==sizeof(char));
+            memcpy(&temp1_char, mem1, sizeof(char));
+            memcpy(&temp2_char, mem2, sizeof(char));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if (ABS(temp1_char-temp2_char) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER(temp1_char,temp2_char);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER(temp1_char,temp2_char);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_char != temp2_char)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                }
+                nfound++;
+            }
+            
+        } /*H5T_NATIVE_SCHAR*/
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_UCHAR
+        *-------------------------------------------------------------------------
+        */
+        else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
+        {
+            unsigned char      temp1_uchar;
+            unsigned char      temp2_uchar;
+            assert(type_size==sizeof(unsigned char));
+            
+            memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
+            memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_uchar != temp2_uchar)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                }
+                nfound++;
+            }
+            
+        } /*H5T_NATIVE_UCHAR*/
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_SHORT
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
+        {
+            short       temp1_short;
+            short       temp2_short;
+            assert(type_size==sizeof(short));
+            
+            memcpy(&temp1_short, mem1, sizeof(short));
+            memcpy(&temp2_short, mem2, sizeof(short));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if (ABS(temp1_short-temp2_short) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER(temp1_short,temp2_short);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER(temp1_short,temp2_short);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_short != temp2_short)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                }
+                nfound++;
+            }
+            
+            
+        } /*H5T_NATIVE_SHORT*/
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_USHORT
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
+        {
+            unsigned short       temp1_ushort;
+            unsigned short       temp2_ushort;
+            assert(type_size==sizeof(short));
+            
+            memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
+            memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
+                {
+                    
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
+                            PDIFF(temp1_ushort,temp2_ushort));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_ushort != temp2_ushort)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                }
+                nfound++;
+            }
+        } /*H5T_NATIVE_USHORT*/
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_INT
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_INT))
+        {
+            int         temp1_int;
+            int         temp2_int;
+            assert(type_size==sizeof(int));
+            
+            memcpy(&temp1_int, mem1, sizeof(int));
+            memcpy(&temp2_int, mem2, sizeof(int));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if (ABS(temp1_int-temp2_int) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER(temp1_int,temp2_int);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER(temp1_int,temp2_int);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_int != temp2_int)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                }
+                nfound++;
+            }
+        } /*H5T_NATIVE_INT*/
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_UINT
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_UINT))
+        {
+            unsigned int         temp1_uint;
+            unsigned int         temp2_uint;
+            assert(type_size==sizeof(int));
+            
+            memcpy(&temp1_uint, mem1, sizeof(unsigned int));
+            memcpy(&temp2_uint, mem2, sizeof(unsigned int));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if ( PDIFF(temp1_uint,temp2_uint) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER_UNSIGN(signed int,temp1_uint,temp2_uint);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER_UNSIGN(signed int,temp1_uint,temp2_uint);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_uint != temp2_uint)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                }
+                nfound++;
+            }
+        } /*H5T_NATIVE_UINT*/
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_LONG
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_LONG))
+        {
+            long        temp1_long;
+            long        temp2_long;
+            assert(type_size==sizeof(long));
+            
+            memcpy(&temp1_long, mem1, sizeof(long));
+            memcpy(&temp2_long, mem2, sizeof(long));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if (ABS(temp1_long-temp2_long) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER(temp1_long,temp2_long);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
+                            ABS(temp1_long-temp2_long));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LI_FORMAT_P,temp1_long,temp2_long,ABS(temp1_long-temp2_long),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER(temp1_long,temp2_long);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LI_FORMAT_P,temp1_long,temp2_long,
+                                ABS(temp1_long-temp2_long),
+                                per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_long != temp2_long)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                }
+                nfound++;
+            }
+        } /*H5T_NATIVE_LONG*/
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_ULONG
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
+        {
+            unsigned long        temp1_ulong;
+            unsigned long        temp2_ulong;
+            assert(type_size==sizeof(unsigned long));
+            
+            memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
+            memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if ( PDIFF(temp1_ulong,temp2_ulong) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_ulong != temp2_ulong)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                }
+                nfound++;
+            }
+            
+            
+        } /*H5T_NATIVE_ULONG*/
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_LLONG
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
+        {
+            long_long        temp1_llong;
+            long_long        temp2_llong;
+            assert(type_size==sizeof(long_long));
+            
+            memcpy(&temp1_llong, mem1, sizeof(long_long));
+            memcpy(&temp2_llong, mem2, sizeof(long_long));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if (ABS(temp1_llong-temp2_llong) > options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                PER(temp1_llong,temp2_llong);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                PER(temp1_llong,temp2_llong);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent  && ABS(temp1_llong-temp2_llong) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_llong != temp2_llong)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                }
+                nfound++;
+            }
+            
+        } /*H5T_NATIVE_LLONG*/
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_ULLONG
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
+        {
+            unsigned long_long        temp1_ullong;
+            unsigned long_long        temp2_ullong;
+            assert(type_size==sizeof(unsigned long_long));
+            
+            memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
+            memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+            /* -d and !-p */
+            if (options->d && !options->p)
+            {
+                if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta)
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                    }
+                    nfound++;
+                }
+            }
+            /* !-d and -p */
+            else if (!options->d && options->p)
+            {
+                ull2float(temp1_ullong,&f1);
+                ull2float(temp2_ullong,&f2);
+                PER(f1,f2);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            /* -d and -p */
+            else if ( options->d && options->p)
+            {
+                ull2float(temp1_ullong,&f1);
+                ull2float(temp2_ullong,&f2);
+                PER(f1,f2);
+                
+                if (not_comparable && !both_zero) /* not comparable */
+                {
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                    }
+                    options->not_cmp=1;
+                    nfound++;
+                }
+                
+                else
+                    
+                    if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
+                    {
+                        
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            
+                            parallel_print(SPACES);
+                            parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
+                        }
+                        nfound++;
+                    }
+            }
+            else if (temp1_ullong != temp2_ullong)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                }
+                nfound++;
+            }
+            
+        } /*H5T_NATIVE_ULLONG*/
+        
+        
+        break; /* H5T_INTEGER class */
 
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_ULONG
-  *-------------------------------------------------------------------------
-  */
+     
+   /*-------------------------------------------------------------------------
+    * H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+        
+    case H5T_FLOAT:
+        
+        
+        
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_FLOAT
+        *-------------------------------------------------------------------------
+        */
+        if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
+        {
+            float temp1_float;
+            float temp2_float;
+            int   isnan1;
+            int   isnan2;
 
-  else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
-  {
-      unsigned long        temp1_ulong;
-      unsigned long        temp2_ulong;
-      assert(type_size==sizeof(unsigned long));
-      
-      memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
-      memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if ( PDIFF(temp1_ulong,temp2_ulong) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_ulong != temp2_ulong)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
-          }
-          nfound++;
-      }
-      
-      
-  } /*H5T_NATIVE_ULONG*/
+            assert(type_size==sizeof(float));
 
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_LLONG
-  *-------------------------------------------------------------------------
-  */
+            memcpy(&temp1_float, mem1, sizeof(float));
+            memcpy(&temp2_float, mem2, sizeof(float));
 
-  else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
-  {
-      long_long        temp1_llong;
-      long_long        temp2_llong;
-      assert(type_size==sizeof(long_long));
-      
-      memcpy(&temp1_llong, mem1, sizeof(long_long));
-      memcpy(&temp2_llong, mem2, sizeof(long_long));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_llong-temp2_llong) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          PER(temp1_llong,temp2_llong);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          PER(temp1_llong,temp2_llong);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent  && ABS(temp1_llong-temp2_llong) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_llong != temp2_llong)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
-          }
-          nfound++;
-      }
-      
-  } /*H5T_NATIVE_LLONG*/
+            /* logic for detecting NaNs is different with options -d, -p and no options */  
 
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_ULLONG
-  *-------------------------------------------------------------------------
-  */
+           /*-------------------------------------------------------------------------
+            * -d and !-p
+            *-------------------------------------------------------------------------
+            */
+            if (options->d && !options->p)
+            {
+                
+                
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+                
+                if ( !isnan1 && !isnan2)
+                {             
+                                    
+                    if (ABS(temp1_float-temp2_float) > options->delta)
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+                        }
+                        nfound++;
+                    }
+                    
+                } /* NaN */
+            }
+           /*-------------------------------------------------------------------------
+            * !-d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if (!options->d && options->p)
+            {
+                
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+                
+                if ( !isnan1 && !isnan2)
+                {   
+                    
+                    PER(temp1_float,temp2_float);
+                    
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+                    
+                    else
+                        
+                        if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(F_FORMAT_P,temp1_float,temp2_float,
+                                    ABS(temp1_float-temp2_float),
+                                    ABS(1-temp2_float/temp1_float));
+                            }
+                            nfound++;
+                        }
+                        
+                } /* NaN */
+            }
 
-  else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
-  {
-      unsigned long_long        temp1_ullong;
-      unsigned long_long        temp2_ullong;
-      assert(type_size==sizeof(unsigned long_long));
-      
-      memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
-      memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          ull2float(temp1_ullong,&f1);
-          ull2float(temp2_ullong,&f2);
-          PER(f1,f2);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                  }
-                  nfound++;
-              }
-      }
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          ull2float(temp1_ullong,&f1);
-          ull2float(temp2_ullong,&f2);
-          PER(f1,f2);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
-              {
-                  
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      
-                      parallel_print(SPACES);
-                      parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                  }
-                  nfound++;
-              }
-      }
-      else if (temp1_ullong != temp2_ullong)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
-          }
-          nfound++;
-      }
+           /*-------------------------------------------------------------------------
+            * -d and -p
+            *-------------------------------------------------------------------------
+            */
+            
+            else if ( options->d && options->p)
+            {
+                
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+                
+                if ( !isnan1 && !isnan2)
+                {   
+                    
+                    PER(temp1_float,temp2_float);
+                    
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                                ABS(temp1_float-temp2_float));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+                    
+                    else
+                        
+                        if ( per > options->percent )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(F_FORMAT_P,temp1_float,temp2_float,
+                                    ABS(temp1_float-temp2_float), 
+                                    ABS(1-temp2_float/temp1_float));
+                            }
+                            nfound++;
+                        }
+                        
+                } /* NaN */
+            }
+            
+           /*-------------------------------------------------------------------------
+            * no -d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if (equal_float(temp1_float,temp2_float)==FALSE)
+            {
+                
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+                }
+                nfound++;
+            }
+        } /*H5T_NATIVE_FLOAT*/
       
-  } /*H5T_NATIVE_ULLONG*/
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_DOUBLE
+        *-------------------------------------------------------------------------
+        */
+        
+        else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
+        {
+            double temp1_double;
+            double temp2_double;
+            int    isnan1;
+            int    isnan2;
 
 
-  break; /* H5T_INTEGER class */
+            assert(type_size==sizeof(double));
+            
+            memcpy(&temp1_double, mem1, sizeof(double));
+            memcpy(&temp2_double, mem2, sizeof(double));
 
- case H5T_FLOAT:
+           /* logic for detecting NaNs is different with options -d, -p and no options */  
 
- /*-------------------------------------------------------------------------
-  * H5T_NATIVE_FLOAT
-  *-------------------------------------------------------------------------
-  */
+           /*-------------------------------------------------------------------------
+            * -d and !-p
+            *-------------------------------------------------------------------------
+            */
+            if (options->d && !options->p)
+            {
 
-  if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
-  {
-      float       temp1_float;
-      float       temp2_float;
-      assert(type_size==sizeof(float));
-      memcpy(&temp1_float, mem1, sizeof(float));
-      memcpy(&temp2_float, mem2, sizeof(float));
-      
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_float-temp2_float) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-
-          PER(temp1_float,temp2_float);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(F_FORMAT_P,temp1_float,temp2_float,
-                          ABS(temp1_float-temp2_float),
-                          ABS(1-temp2_float/temp1_float));
-                  }
-                  nfound++;
-              }
-      }
-      
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          
-          PER(temp1_float,temp2_float);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                      ABS(temp1_float-temp2_float));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(F_FORMAT_P,temp1_float,temp2_float,
-                          ABS(temp1_float-temp2_float), 
-                          ABS(1-temp2_float/temp1_float));
-                  }
-                  nfound++;
-              }
-      }
-      
-      else if (equal_float(temp1_float,temp2_float)==FALSE)
-      {
-          
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
-          }
-          nfound++;
-      }
-      
-  } /*H5T_NATIVE_FLOAT*/
-
-  /*-------------------------------------------------------------------------
-   * H5T_NATIVE_DOUBLE
-   *-------------------------------------------------------------------------
-   */
-
-  else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
-  {
-      double      temp1_double;
-      double      temp2_double;
-      assert(type_size==sizeof(double));
-      
-      memcpy(&temp1_double, mem1, sizeof(double));
-      memcpy(&temp2_double, mem2, sizeof(double));
-      /* -d and !-p */
-      if (options->d && !options->p)
-      {
-          if (ABS(temp1_double-temp2_double) > options->delta)
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
-              }
-              nfound++;
-          }
-      }
-      /* !-d and -p */
-      else if (!options->d && options->p)
-      {
-          
-          PER(temp1_double,temp2_double);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                      ABS(temp1_double-temp2_double));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                          ABS(temp1_double-temp2_double),
-                          ABS(1-temp2_double/temp1_double));
-                  }
-                  nfound++;
-              }
-      }
-      
-      
-      /* -d and -p */
-      else if ( options->d && options->p)
-      {
-          
-          PER(temp1_double,temp2_double);
-          
-          if (not_comparable && !both_zero) /* not comparable */
-          {
-              if ( print_data(options) )
-              {
-                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                  parallel_print(SPACES);
-                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                      ABS(temp1_double-temp2_double));
-              }
-              options->not_cmp=1;
-              nfound++;
-          }
-          
-          else
-              
-              if ( per > options->percent && 
-                  ABS(temp1_double-temp2_double) > options->delta )
-              {
-                  if ( print_data(options) )
-                  {
-                      print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                      parallel_print(SPACES);
-                      parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                          ABS(temp1_double-temp2_double),
-                          ABS(1-temp2_double/temp1_double));
-                  }
-                  nfound++;
-              }
-      }
-      
-      else if (equal_double(temp1_double,temp2_double)==FALSE)
-      {
-          if ( print_data(options) )
-          {
-              print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
-          }
-          nfound++;
-      }
-  } /*H5T_NATIVE_DOUBLE*/
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+                
+                if ( !isnan1 && !isnan2)
+                {           
+                    
+                    if (ABS(temp1_double-temp2_double) > options->delta)
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        }
+                        nfound++;
+                    }
+                    
+                } /* NaN */
+            }
 
+           /*-------------------------------------------------------------------------
+            * !-d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if (!options->d && options->p)
+            {
 
-  break;   /* H5T_FLOAT class */
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+                
+                if ( !isnan1 && !isnan2)
+                {           
+                    
+                    PER(temp1_double,temp2_double);
+                    
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                                ABS(temp1_double-temp2_double));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+                    
+                    else
+                        
+                        if ( per > options->percent )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                                    ABS(temp1_double-temp2_double),
+                                    ABS(1-temp2_double/temp1_double));
+                            }
+                            nfound++;
+                        }
+                        
+                } /* NaN */
+            }
+            
+           /*-------------------------------------------------------------------------
+            * -d and -p 
+            *-------------------------------------------------------------------------
+            */
+            else if ( options->d && options->p)
+            {
 
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+                
+                if ( !isnan1 && !isnan2)
+                {           
+                    
+                    PER(temp1_double,temp2_double);
+                    
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                                ABS(temp1_double-temp2_double));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+                    
+                    else
+                        
+                        if ( per > options->percent && 
+                            ABS(temp1_double-temp2_double) > options->delta )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                                    ABS(temp1_double-temp2_double),
+                                    ABS(1-temp2_double/temp1_double));
+                            }
+                            nfound++;
+                        }
+                        
+                } /* NaN */
+            }
+            
+           /*-------------------------------------------------------------------------
+            * no -d and -p 
+            *-------------------------------------------------------------------------
+            */
+            else if (equal_double(temp1_double,temp2_double)==FALSE)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                }
+                nfound++;
+            }
+    } /*H5T_NATIVE_DOUBLE*/
+    
+    
+    break; /* H5T_FLOAT class */
+    
  } /* switch */
-
+ 
  return nfound;
 }
 
@@ -2143,17 +2255,17 @@ static hbool_t all_zero(const void *_mem, size_t size)
 static
 void print_region_block(int i, hsize_t *ptdata, int ndims)
 {
- int j;
-
- parallel_print("        ");
- for (j = 0; j < ndims; j++)
-  parallel_print("%s%lu", j ? "," : "   (",
-  (unsigned long)ptdata[i * 2 * ndims + j]);
- for (j = 0; j < ndims; j++)
-  parallel_print("%s%lu", j ? "," : ")-(",
-  (unsigned long)ptdata[i * 2 * ndims + j + ndims]);
- parallel_print(")");
-
+    int j;
+    
+    parallel_print("        ");
+    for (j = 0; j < ndims; j++)
+        parallel_print("%s%lu", j ? "," : "   (",
+        (unsigned long)ptdata[i * 2 * ndims + j]);
+    for (j = 0; j < ndims; j++)
+        parallel_print("%s%lu", j ? "," : ")-(",
+        (unsigned long)ptdata[i * 2 * ndims + j + ndims]);
+    parallel_print(")");
+    
 }
 
 
@@ -2170,14 +2282,14 @@ void print_region_block(int i, hsize_t *ptdata, int ndims)
 static
 void print_points(int i, hsize_t *ptdata, int ndims)
 {
- int j;
-
- parallel_print("              ");
- for (j = 0; j < ndims; j++)
-  parallel_print("%s%lu", j ? "," : "(",
-  (unsigned long)(ptdata[i * ndims + j]));
- parallel_print(")");
-
+    int j;
+    
+    parallel_print("              ");
+    for (j = 0; j < ndims; j++)
+        parallel_print("%s%lu", j ? "," : "(",
+        (unsigned long)(ptdata[i * ndims + j]));
+    parallel_print(")");
+    
 }
 
 /*-------------------------------------------------------------------------
@@ -2383,25 +2495,25 @@ hsize_t character_compare(unsigned char *mem1,
                   const char    *obj2,
                   int           *ph)
 {
- hsize_t            nfound=0;  /* differences found */
- unsigned char      temp1_uchar;
- unsigned char      temp2_uchar;
-
- memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
- memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-
- if (temp1_uchar != temp2_uchar)
- {
-  if ( print_data(options) )
-  {
-   print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-   parallel_print(SPACES);
-   parallel_print(C_FORMAT,temp1_uchar,temp2_uchar);
-  }
-  nfound++;
- }
-
- return nfound;
+    hsize_t            nfound=0;  /* differences found */
+    unsigned char      temp1_uchar;
+    unsigned char      temp2_uchar;
+    
+    memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
+    memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    
+    if (temp1_uchar != temp2_uchar)
+    {
+        if ( print_data(options) )
+        {
+            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            parallel_print(SPACES);
+            parallel_print(C_FORMAT,temp1_uchar,temp2_uchar);
+        }
+        nfound++;
+    }
+    
+    return nfound;
 }
 
 
@@ -2427,73 +2539,73 @@ hsize_t character_compare_opt(unsigned char *mem1,
                           const char    *obj2,
                           int           *ph)
 {
- hsize_t            nfound=0;  /* differences found */
- unsigned char      temp1_uchar;
- unsigned char      temp2_uchar;
- double             per;
- int                both_zero;
+    hsize_t            nfound=0;  /* differences found */
+    unsigned char      temp1_uchar;
+    unsigned char      temp2_uchar;
+    double             per;
+    int                both_zero;
+    
+    memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
+    memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
+    
+    /* -d and !-p */
+    
+    if (options->d && !options->p)
+    {
+        if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
+        {
+            if ( print_data(options) )
+            {
+                print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                parallel_print(SPACES);
+                parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+            }
+            nfound++;
+        }
+    }
+    /* !-d and -p */
+    else if (!options->d && options->p)
+    {
+        PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+        if ( per > options->percent )
+        {
+            if ( print_data(options) )
+            {
+                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                parallel_print(SPACES);
+                parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+            }
+            nfound++;
+        }
+    }
+    /* -d and -p */
+    else if ( options->d && options->p)
+    {
+        PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+        if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
+        {
+            if ( print_data(options) )
+            {
+                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                parallel_print(SPACES);
+                parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+            }
+            nfound++;
+        }
+    }
+    else if (temp1_uchar != temp2_uchar)
+    {
+        if ( print_data(options) )
+        {
+            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            parallel_print(SPACES);
+            parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+        }
+        nfound++;
+    }
+    
+    return nfound;
     
- memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
- memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
- 
- /* -d and !-p */
- 
- if (options->d && !options->p)
- {
-     if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
-     {
-         if ( print_data(options) )
-         {
-             print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-         }
-         nfound++;
-     }
- }
- /* !-d and -p */
- else if (!options->d && options->p)
- {
-     PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-     if ( per > options->percent )
-     {
-         if ( print_data(options) )
-         {
-             print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-         }
-         nfound++;
-     }
- }
- /* -d and -p */
- else if ( options->d && options->p)
- {
-     PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-     if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
-     {
-         if ( print_data(options) )
-         {
-             print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-         }
-         nfound++;
-     }
- }
- else if (temp1_uchar != temp2_uchar)
- {
-     if ( print_data(options) )
-     {
-         print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
-         parallel_print(SPACES);
-         parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
-     }
-     nfound++;
- }
- 
- return nfound;
- 
 }
 
 
@@ -2526,34 +2638,53 @@ hsize_t diff_float(unsigned char *mem1,
     hsize_t     i;
     double      per;
     int         both_zero;
+    int         isnan1;
+    int         isnan2;
     
-    
-    /* -d and !-p */
+
+ /*-------------------------------------------------------------------------
+  * -d and !-p 
+  *-------------------------------------------------------------------------
+  */
+ 
     if (options->d && !options->p)
     {
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
-            
-            if (ABS(temp1_float-temp2_float) > options->delta)
-            {
-                if ( print_data(options) )
+
+           /*-------------------------------------------------------------------------
+            * detect NaNs
+            *-------------------------------------------------------------------------
+            */
+            isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+            isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+
+            if ( !isnan1 && !isnan2)
+            {             
+                if (ABS(temp1_float-temp2_float) > options->delta)
                 {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+                    if ( print_data(options) )
+                    {
+                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+                    }
+                    nfound++;
                 }
-                nfound++;
-            }
+            } /* NaN */
             mem1+=sizeof(float);
             mem2+=sizeof(float);
             if (options->n && nfound>=options->count)
                 return nfound;
-        }
+        } /* i */
     }
-    
-    /* !-d and -p */
+
+ /*-------------------------------------------------------------------------
+  * !-d and -p 
+  *-------------------------------------------------------------------------
+  */
     else if (!options->d && options->p)
     {
         for ( i = 0; i < nelmts; i++)
@@ -2561,43 +2692,57 @@ hsize_t diff_float(unsigned char *mem1,
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
             
-            PER(temp1_float,temp2_float);
+           /*-------------------------------------------------------------------------
+            * detect NaNs
+            *-------------------------------------------------------------------------
+            */
+            isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+            isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
             
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                        ABS(temp1_float-temp2_float));
-                }
-                options->not_cmp=1;
-                nfound++;
-            }
-            
-            else
+            if ( !isnan1 && !isnan2)
+            {        
                 
-                if ( per > options->percent )
+                PER(temp1_float,temp2_float);
+                
+                if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P,temp1_float,temp2_float,
-                            ABS(temp1_float-temp2_float),
-                            ABS(1-temp2_float/temp1_float));
+                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                            ABS(temp1_float-temp2_float));
                     }
+                    options->not_cmp=1;
                     nfound++;
                 }
-                mem1+=sizeof(float);
-                mem2+=sizeof(float);
-                if (options->n && nfound>=options->count)
-                    return nfound;
-        }
+                
+                else
+                    
+                    if ( per > options->percent )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P,temp1_float,temp2_float,
+                                ABS(temp1_float-temp2_float),
+                                ABS(1-temp2_float/temp1_float));
+                        }
+                        nfound++;
+                    }
+            } /* NaN */
+            mem1+=sizeof(float);
+            mem2+=sizeof(float);
+            if (options->n && nfound>=options->count)
+                return nfound;
+        } /* i */
     }
     
-    /* -d and -p */
+ /*-------------------------------------------------------------------------
+  * -d and -p 
+  *-------------------------------------------------------------------------
+  */
     else if ( options->d && options->p)
     {
         
@@ -2606,43 +2751,75 @@ hsize_t diff_float(unsigned char *mem1,
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
             
-            PER(temp1_float,temp2_float);
-            
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                    parallel_print(SPACES);
-                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                        ABS(temp1_float-temp2_float));
-                }
-                options->not_cmp=1;
-                nfound++;
-            }
+            /*-------------------------------------------------------------------------
+            * detect NaNs
+            *-------------------------------------------------------------------------
+            */
+            isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
+            isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
             
-            else
+            if ( !isnan1 && !isnan2)
+            {        
                 
-                if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
+                PER(temp1_float,temp2_float);
+                
+                if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P,temp1_float,temp2_float,
-                            ABS(temp1_float-temp2_float),
-                            ABS(1-temp2_float/temp1_float));
+                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                            ABS(temp1_float-temp2_float));
                     }
+                    options->not_cmp=1;
                     nfound++;
                 }
-                mem1+=sizeof(float);
-                mem2+=sizeof(float);
-                if (options->n && nfound>=options->count)
-                    return nfound;
-        }
+                
+                else
+                    
+                    if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P,temp1_float,temp2_float,
+                                ABS(temp1_float-temp2_float),
+                                ABS(1-temp2_float/temp1_float));
+                        }
+                        nfound++;
+                    }
+                    
+            } /* NaN */
+            mem1+=sizeof(float);
+            mem2+=sizeof(float);
+            if (options->n && nfound>=options->count)
+                return nfound;
+        } /* i */
     }
+
+ /*-------------------------------------------------------------------------
+  * no -d and -p 
+  *-------------------------------------------------------------------------
+  */
     else
     {
+
+#if defined (H5DIFF_DO_TIME)
+          int time;
+
+     #if defined (WIN32)
+          struct _timeb *tbstart = malloc(sizeof(struct _timeb));
+	      struct _timeb *tbstop = malloc(sizeof(struct _timeb));
+          _ftime( tbstart);
+     #else
+          struct timeb *tbstart = malloc(sizeof(struct timeb));
+	      struct timeb *tbstop = malloc(sizeof(struct timeb));
+          ftime( tbstart);
+     #endif
+
+#endif
         
         for ( i = 0; i < nelmts; i++)
         {
@@ -2665,7 +2842,24 @@ hsize_t diff_float(unsigned char *mem1,
             mem2+=sizeof(float);
             if (options->n && nfound>=options->count)
                 return nfound;
+
         } /* nelmts */
+
+
+
+#if defined (H5DIFF_DO_TIME)
+
+      #if defined (WIN32)
+          _ftime( tbstop );
+      #else
+          ftime( tbstop );
+      #endif
+
+          time = tbstop->time - tbstart->time;
+          printf(" TIME = %d sec\n", time );
+
+#endif
+
         
     }
     
@@ -4705,7 +4899,7 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    equal_float, equal_double
+ * Function:    equal_double
  *
  * Purpose:     use a relative error formula to deal with floating point 
  *              uncertainty 
@@ -4714,18 +4908,50 @@ error:
  *              October 24, 2006
  *
  * Modifications:
+ *  8/1/2007. handle NaNs
  *
  *-------------------------------------------------------------------------
  */
-
-
-
 static 
 hbool_t equal_double(double value, double expected)                               
 {
     int both_zero;
     int is_zero;
 
+#if defined (H5DIFF_DO_NAN)
+
+/*-------------------------------------------------------------------------
+ * detect NaNs
+ *-------------------------------------------------------------------------
+ */
+    int isnan1 = my_isnan(FLT_DOUBLE,&value);
+    int isnan2 = my_isnan(FLT_DOUBLE,&expected);
+
+   /*-------------------------------------------------------------------------
+    * we consider NaN == NaN to be true 
+    *-------------------------------------------------------------------------
+    */
+    if ( isnan1 && isnan2 )
+    {
+        return TRUE;
+    }
+
+   /*-------------------------------------------------------------------------
+    * one is a NaN, do not compare but assume difference
+    *-------------------------------------------------------------------------
+    */
+    if ( (isnan1 && !isnan2) || ( !isnan1 && isnan2 ) )
+    {
+        return FALSE;
+    }
+
+   /*-------------------------------------------------------------------------
+    * both are not NaNs, compare
+    *-------------------------------------------------------------------------
+    */
+
+#endif
+
     BOTH_ZERO(value,expected)
     if (both_zero)
         return TRUE;
@@ -4741,8 +4967,6 @@ hbool_t equal_double(double value, double expected)
     
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    equal_float
  *
@@ -4763,6 +4987,8 @@ hbool_t equal_float(float value, float expected)
     int both_zero;
     int is_zero;
 
+#if defined (H5DIFF_DO_NAN)
+
 /*-------------------------------------------------------------------------
  * detect NaNs
  *-------------------------------------------------------------------------
@@ -4770,8 +4996,6 @@ hbool_t equal_float(float value, float expected)
     int isnan1 = my_isnan(FLT_FLOAT,&value);
     int isnan2 = my_isnan(FLT_FLOAT,&expected);
 
- 
-
    /*-------------------------------------------------------------------------
     * we consider NaN == NaN to be true 
     *-------------------------------------------------------------------------
@@ -4794,6 +5018,8 @@ hbool_t equal_float(float value, float expected)
     * both are not NaNs, compare
     *-------------------------------------------------------------------------
     */
+
+#endif
     
     BOTH_ZERO(value,expected)
     if (both_zero)
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 3d8c871..6fc09d7 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -30,6 +30,7 @@
 #include "h5tools_utils.h"
 #include "H5private.h"
 
+#define SANITY_CHECK
 
 #define ALIGN(A,Z)  ((((A) + (Z) - 1) / (Z)) * (Z))
 
@@ -612,7 +613,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
             }
 
             /*
-             * We need to break after each row of a dimension---> we should
+             * We need to break after each row_counter of a dimension---> we should
              * break at the end of the each last dimension well that is the
              * way the dumper did it before
              */
@@ -706,28 +707,40 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
  * Chapter:     H5Tools Library
  * Purpose:     Dump out a subset of a dataset.
  * Description:
- *      Select a hyperslab from the dataset DSET using the parameters
- *      specified in SSET. Dump this out to STREAM.
+ *
+ *  Select a hyperslab from the dataset DSET using the parameters
+ *   specified in SSET. Dump this out to STREAM.
+ *      
+ *  Hyperslabs select "count" blocks of size "block", spaced "stride" elements
+ *   from each other, starting at coordinate "start".
+ *
  * Return:
  *      On success, return SUCCEED. Otherwise, the function returns FAIL.
- * Programmer:
- *      Bill Wendling, Wednesday, 07. March 2001
- * Modifications:
- *      Pedro Vicente, 12 December 2006
- *       Add information to print array indices from the element position
- *       The algorythm used is 
+ *
+ * Original programmer:
+ *      Bill Wendling, Wednesday, March 07, 2001
+ *
+ * Rewritten with modified algorithm by:
+ *      Pedro Vicente, Wednesday, January 16, 2008, contributions from Quincey Koziol
+ *
+ * Algorithm
+ *
+ * In a inner loop, the parameters from SSET are translated into temporary 
+ * variables so that 1 row is printed at a time (getting the coordinate indices 
+ * at each row).
+ * We define the stride, count and block to be 1 in the row dimension to achieve 
+ * this and advance until all points are printed. 
+ * An outer loop for cases where dimensionality is greater than 2D is made. 
+ * In each iteration, the 2D block is displayed in the inner loop. The remaining 
+ * slower dimensions above the first 2 are incremented one at a time in the outer loop
+ *
+ * The element position is obtained from the matrix according to:
  *       Given an index I(z,y,x) its position from the beginning of an array 
  *       of sizes A(size_z, size_y,size_x) is given by
  *       Position of I(z,y,x) = index_z * size_y * size_x 
  *                             + index_y * size_x
  *                             + index_x
- *
- *      Pedro Vicente, Quincey Koziol, 4 January 2007
- *       Introduced an outer loop for cases where dimensionality is greater 
- *       than 2D. In each iteration a 2D block is displayed by rows in a inner
- *       loop. The remainning slower dimensions above the first 2 are incremented 
- *       one at a time in the outer loop
- *      
+ * 
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -755,13 +768,21 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
     hid_t             sm_space;                /* stripmine data space */
     hsize_t           count;                   /* hyperslab count */
     hsize_t           outer_count;             /* offset count */
-    unsigned int      row_dim;                 /* index of row dimension */
+    unsigned int      row_dim;                 /* index of row_counter dimension */
     int               current_outer_dim;       /* dimension for start */
     hsize_t           temp_start[H5S_MAX_RANK];/* temporary start inside offset count loop */
     hsize_t           max_start[H5S_MAX_RANK]; /* maximum start inside offset count loop */
     hsize_t           temp_count[H5S_MAX_RANK];/* temporary count inside offset count loop  */
-
-    int reset_dim;
+    hsize_t           temp_block[H5S_MAX_RANK];/* temporary block size used in loop  */
+    hsize_t           temp_stride[H5S_MAX_RANK];/* temporary stride size used in loop  */
+    int               reset_dim;
+    hsize_t           size_row_block;           /* size for blocks along rows */
+
+#if defined (SANITY_CHECK)
+    hsize_t total_points = 1; /* to print */
+    hsize_t printed_points = 0; /* printed */
+#endif
+    
 
     ret = FAIL;     /* be pessimistic */
     f_space = H5Dget_space(dset);
@@ -799,17 +820,32 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
     outer_count = 1;
     if (ctx.ndims > 2)
         for (i = 0; i < (size_t)ctx.ndims - 2; i++)
-            outer_count *= sset->count[ i ];
+        {
+            /* consider block size */
+            outer_count = outer_count * sset->count[ i ] * sset->block[ i ];
+
+        }
 
     if(ctx.ndims>0)
         init_acc_pos(&ctx,total_size);
 
+    /* calculate total number of points to print */
+#if defined (SANITY_CHECK)
+    for (i = 0; i < (size_t)ctx.ndims; i++)
+    {
+        total_points *= sset->count[ i ] * sset->block[ i ];;
+    }
+#endif
+    
+
 
     /* initialize temporary start, count and maximum start */
     for (i = 0; i < (size_t)ctx.ndims; i++)
     {
         temp_start[ i ] = sset->start[ i ];
         temp_count[ i ] = sset->count[ i ];
+        temp_block[ i ] = sset->block[ i ];
+        temp_stride[ i ] = sset->stride[ i ];
         max_start[ i ] = 0;
 
     }
@@ -828,29 +864,69 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
     for (n = 0; n < outer_count; n++)
     {
 
+        hsize_t row_counter = 0; 
+
         /* number of read iterations in inner loop, read by rows, to match 2D display */
         if (ctx.ndims > 1)
         {
-            count = sset->count[ row_dim ];
-            temp_count[ row_dim ] = 1;
+            
+        /* count is the number of iterations to display all the rows,
+            the block size count times */
+            count = sset->count[ row_dim ] * sset->block[ row_dim ];
+            
+            /* always 1 row_counter at a time, that is a block of size 1, 1 time */
+            temp_count[ row_dim ] = 1; 
+            temp_block[ row_dim ] = 1;  
+            
+            /* advance 1 row_counter at a time  */
+            if (sset->block[ row_dim ] > 1 )
+                temp_stride[ row_dim ] = 1;
+            
+            
         }
         /* for the 1D case */
         else
         {
             count = 1;
         }
-
         
+        
+        size_row_block = sset->block[ row_dim ];
+
+   
         /* display loop */
-        for (; count > 0; temp_start[ row_dim ] += sset->stride[ row_dim ],
-            count--) 
-        {
+        for (; count > 0; 
+               temp_start[ row_dim ] += temp_stride[ row_dim ],
+               count--)
+               {
+
+     
+                   /* jump rows if size of block exceeded
+                      cases where block > 1 only and stride > block */
+                   if ( size_row_block > 1 && 
+                        row_counter == size_row_block  &&
+                        sset->stride[ row_dim ] > sset->block[ row_dim ]
+                        )
+                   {
+
+                       hsize_t increase_rows = sset->stride[ row_dim ] -
+                           sset->block[ row_dim ];
+
+                       temp_start[ row_dim ] += increase_rows;
+
+                       row_counter = 0;
+                           
+                   }
+
+                   row_counter++;
+
+
             /* calculate the potential number of elements we're going to print */
             H5Sselect_hyperslab(f_space, H5S_SELECT_SET,
                 temp_start,
-                sset->stride,
+                temp_stride,
                 temp_count,
-                sset->block);
+                temp_block);
             sm_nelmts = H5Sget_select_npoints(f_space);
              
             if (sm_nelmts == 0) {
@@ -920,6 +996,13 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                 ctx.need_prefix = 1;
                 
                 ctx.continuation++;
+                
+                
+#if defined (SANITY_CHECK)
+                printed_points += sm_nelmts;
+#endif
+
+
         } /* count */
 
         if (ctx.ndims > 2)
@@ -930,8 +1013,9 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
             /* set start to original from current_outer_dim up */
             for (i = current_outer_dim + 1; i < ctx.ndims; i++)
             {
-                temp_start[ i ] = sset->start[ i ]; 
+                temp_start[ i ] = sset->start[ i ];
             }
+
             
             /* increment start dimension */
             do
@@ -941,6 +1025,11 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                 if (temp_start[ current_outer_dim ] >= max_start[ current_outer_dim ])
                 {
                     temp_start[ current_outer_dim ] = sset->start[ current_outer_dim ];
+
+                    /* consider block */
+                    if ( sset->block[ current_outer_dim ] > 1 )
+                        temp_start[ current_outer_dim ]++;
+
                     current_outer_dim--;
                     reset_dim = 1;
                 }
@@ -951,6 +1040,11 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
         
     } /* outer_count */
 
+#if defined (SANITY_CHECK)
+    assert( printed_points == total_points );
+#endif
+
+
     /* Terminate the output */
     if (ctx.cur_column) {
         fputs(OPT(info->line_suf, ""), stream);
@@ -1459,9 +1553,6 @@ int do_bin_output(FILE *stream, hsize_t nelmts, hid_t tid, void *_mem)
 static
 int render_bin_output(FILE *stream, hid_t tid, void *_mem)
 {
-#if 0
- #define DEBUG_H5DUMP_BIN 1
-#endif
  unsigned char     *mem  = (unsigned char*)_mem;
  size_t             size;   /* datum size */
  float              tempfloat;
diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c
index 123065b..de1e2c3 100644
--- a/tools/lib/h5tools_ref.c
+++ b/tools/lib/h5tools_ref.c
@@ -20,6 +20,7 @@
 #include "H5SLprivate.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
+#include "h5trav.h"
 
 
 /*
@@ -42,15 +43,12 @@ typedef struct {
 } ref_path_node_t;
 
 static H5SL_t *ref_path_table = NULL;   /* the "table" (implemented with a skip list) */
-static hid_t thefile;
+static hid_t thefile = (-1);
 
 extern char  *progname;
 extern int   d_status;
 
 static int ref_path_table_put(const char *, haddr_t objno);
-static hbool_t ref_path_table_find(haddr_t objno);
-static herr_t fill_ref_path_table_cb(hid_t group, const char *obj_name,
-    const H5L_info_t *linfo, void *op_data);
 
 /*-------------------------------------------------------------------------
  * Function:    free_ref_path_info
@@ -77,6 +75,61 @@ free_ref_path_info(void *item, void UNUSED *key, void UNUSED *operator_data/*in,
 }
 
 /*-------------------------------------------------------------------------
+ * Function:    init_ref_path_cb
+ *
+ * Purpose:     Called by interator to create references for
+ *              all objects and enter them in the table.
+ *
+ * Return:      Error status.
+ *
+ * Programmer:  REMcG
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+init_ref_path_cb(const char *obj_name, const H5O_info_t *oinfo,
+    const char *already_seen, void UNUSED *_udata)
+{
+    /* Check if the object is already in the path table */
+    if(NULL == already_seen) {
+        /* Insert the object into the path table */
+        ref_path_table_put(obj_name, oinfo->addr);
+    } /* end if */
+
+    return 0;
+}
+
+/*-------------------------------------------------------------------------
+ * Function:    init_ref_path_table
+ *
+ * Purpose:     Initalize the reference path table
+ *
+ * Return:      Non-negative on success, negative on failure
+ *
+ * Programmer:  Quincey Koziol
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+init_ref_path_table(void)
+{
+    /* Sanity check */
+    HDassert(thefile > 0);
+
+    /* Create skip list to store reference path information */
+    if((ref_path_table = H5SL_create(H5SL_TYPE_HADDR, 0.5, (size_t)16))==NULL)
+        return (-1);
+
+    /* Iterate over objects in this file */
+    if(h5trav_visit(thefile, "/", TRUE, TRUE, init_ref_path_cb, NULL, NULL) < 0) {
+        error_msg(progname, "unable to construct reference path table\n");
+        d_status = EXIT_FAILURE;
+    } /* end if */
+
+    return(0);
+}
+
+/*-------------------------------------------------------------------------
  * Function:    term_ref_path_table
  *
  * Purpose:     Terminate the reference path table
@@ -137,39 +190,11 @@ ref_path_table_lookup(const char *thepath)
     if(H5Oget_info_by_name(thefile, thepath, &oi, H5P_DEFAULT) < 0)
         return HADDR_UNDEF;
 
-    /* All existing objects in the file had better be in the table */
-    HDassert(ref_path_table_find(oi.addr));
-
     /* Return OID */
     return(oi.addr);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    ref_path_table_find
- *
- * Purpose:     Looks up a table entry given a object number.
- *              Used during construction of the table.
- *
- * Return:      TRUE/FALSE on success, can't fail
- *
- * Programmer:  Quincey Koziol
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static hbool_t
-ref_path_table_find(haddr_t objno)
-{
-    HDassert(ref_path_table);
-
-    if(H5SL_search(ref_path_table, &objno) == NULL)
-        return FALSE;
-    else
-        return TRUE;
-}
-
-/*-------------------------------------------------------------------------
  * Function:    ref_path_table_put
  *
  * Purpose:     Enter the 'obj' with 'path' in the table (assumes its not
@@ -200,7 +225,7 @@ ref_path_table_put(const char *path, haddr_t objno)
         return(-1);
 
     new_node->objno = objno;
-    new_node->path = path;
+    new_node->path = HDstrdup(path);
 
     return(H5SL_insert(ref_path_table, new_node, &(new_node->objno)));
 }
@@ -237,17 +262,17 @@ get_fake_xid (void) {
 haddr_t
 ref_path_table_gen_fake(const char *path)
 {
-    const char *dup_path;
     haddr_t fake_objno;
 
-    if((dup_path = HDstrdup(path)) == NULL)
-        return HADDR_UNDEF;
-
     /* Generate fake ID for string */
     fake_objno = get_fake_xid();
 
-    /* Insert "fake" object into table (takes ownership of path) */
-    ref_path_table_put(dup_path, fake_objno);
+    /* Create ref path table, if it hasn't already been created */
+    if(ref_path_table == NULL)
+        init_ref_path_table();
+
+    /* Insert "fake" object into table */
+    ref_path_table_put(path, fake_objno);
 
     return(fake_objno);
 }
@@ -271,74 +296,19 @@ lookup_ref_path(haddr_t ref)
     ref_path_node_t *node;
 
     /* Be safer for h5ls */
-    if(!ref_path_table)
+    if(thefile < 0)
         return(NULL);
 
+    /* Create ref path table, if it hasn't already been created */
+    if(ref_path_table == NULL)
+        init_ref_path_table();
+
     node = H5SL_search(ref_path_table, &ref);
 
     return(node ? node->path : NULL);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    fill_ref_path_table_cb
- *
- * Purpose:     Called by interator to create references for
- *              all objects and enter them in the table.
- *
- * Return:      Error status.
- *
- * Programmer:  REMcG
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-fill_ref_path_table_cb(hid_t group, const char *obj_name, const H5L_info_t *linfo,
-    void *op_data)
-{
-    if(linfo->type == H5L_TYPE_HARD) {
-        H5O_info_t              oinfo;
-
-        H5Oget_info_by_name(group, obj_name, &oinfo, H5P_DEFAULT);
-
-        /* Check if the object is already in the path table */
-        if(!ref_path_table_find(oinfo.addr)) {
-            const char *obj_prefix = (const char *)op_data;
-            size_t                  tmp_len;
-            char                   *thepath;
-
-            /* Compute length for this object's path */
-            tmp_len = HDstrlen(obj_prefix) + HDstrlen(obj_name) + 2;
-
-            /* Allocate room for the path for this object */
-            if((thepath = (char *)HDmalloc(tmp_len)) == NULL)
-                return FAIL;
-
-            /* Build the name for this object */
-            HDstrcpy(thepath, obj_prefix);
-            HDstrcat(thepath, "/");
-            HDstrcat(thepath, obj_name);
-
-            /* Insert the object into the path table (takes ownership of the path) */
-            ref_path_table_put(thepath, oinfo.addr);
-
-            if(oinfo.type == H5O_TYPE_GROUP) {
-                /* Iterate over objects in this group, using this group's
-                 * name as their prefix
-                 */
-                if(H5Literate_by_name(group, obj_name, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, thepath, H5P_DEFAULT) < 0) {
-                    error_msg(progname, "unable to dump group \"%s\"\n", thepath);
-                    d_status = EXIT_FAILURE;
-                } /* end if */
-            } /* end if */
-        } /* end if */
-    } /* end if */
-
-    return 0;
-}
-
-/*-------------------------------------------------------------------------
  * Function:    fill_ref_path_table
  *
  * Purpose:     Called by interator to create references for
@@ -348,37 +318,15 @@ fill_ref_path_table_cb(hid_t group, const char *obj_name, const H5L_info_t *linf
  *
  * Programmer:  REMcG
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
 fill_ref_path_table(hid_t fid)
 {
-    H5O_info_t              oinfo;
-    char                   *root_path;
-
     /* Set file ID for later queries (XXX: this should be fixed) */
     thefile = fid;
 
-    /* Create skip list to store reference path information */
-    if((ref_path_table = H5SL_create(H5SL_TYPE_HADDR, 0.5, (size_t)16))==NULL)
-        return (-1);
-
-    /* Build the name for root group */
-    root_path = HDstrdup("/");
-
-    /* Get info for root group */
-    H5Oget_info_by_name(fid, root_path, &oinfo, H5P_DEFAULT);
-
-    /* Insert the root group into the path table (takes ownership of path) */
-    ref_path_table_put(root_path, oinfo.addr);
-
-    /* Iterate over objects in this file */
-    if(H5Literate(fid, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, (void *)"") < 0) {
-        error_msg(progname, "unable to dump root group\n");
-        d_status = EXIT_FAILURE;
-    } /* end if */
+    /* Defer creating the ref path table until it's needed */
 
     return 0;
 }
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index cb38e7a..512a3fb 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -30,6 +30,7 @@
 
 #include "h5tools_utils.h"
 #include "H5private.h"
+#include "h5trav.h"
 
 /* global variables */
 int   nCols = 80;
@@ -44,10 +45,7 @@ static void init_table(table_t **tbl);
 #ifdef H5DUMP_DEBUG
 static void dump_table(char* tablename, table_t *table);
 #endif  /* H5DUMP_DEBUG */
-static void add_obj(table_t *table, haddr_t objno, char *objname, hbool_t recorded);
-static char * build_obj_path_name(const char *prefix, const char *name);
-static herr_t find_objs_cb(hid_t group, const char *name, const H5L_info_t *info,
-    void *op_data);
+static void add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t recorded);
 
 
 /*-------------------------------------------------------------------------
@@ -428,44 +426,15 @@ search_obj(table_t *table, haddr_t objno)
 {
     unsigned u;
 
-    for (u = 0; u < table->nobjs; u++)
-        if (table->objs[u].objno == objno)
-        return &(table->objs[u]);
+    for(u = 0; u < table->nobjs; u++)
+        if(table->objs[u].objno == objno)
+            return &(table->objs[u]);
 
     return NULL;
 }
 
 
 /*-------------------------------------------------------------------------
- * Function:    build_obj_path_name
- *
- * Purpose:     Allocate space & build path name from prefix & name
- *
- * Return:      Success:    SUCCEED
- *
- *              Failure:    FAIL
- *
- * Programmer:  Quincey Koziol
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static char *
-build_obj_path_name(const char *prefix, const char *name)
-{
-    char *path;
-
-    path = HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2);
-    HDstrcpy(path, prefix);
-    HDstrcat(path,"/");
-    HDstrcat(path,name); /* absolute name of the data set */
-
-    return(path);
-} /* end build_obj_path_name() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    find_objs_cb
  *
  * Purpose:     Callback to find objects, committed types and store them in tables
@@ -481,90 +450,65 @@ build_obj_path_name(const char *prefix, const char *name)
  *-------------------------------------------------------------------------
  */
 static herr_t
-find_objs_cb(hid_t group, const char *name, const H5L_info_t UNUSED *linfo, void *op_data)
+find_objs_cb(const char *name, const H5O_info_t *oinfo, const char *already_seen,
+    void *op_data)
 {
-    H5O_info_t oinfo;
     find_objs_t *info = (find_objs_t*)op_data;
     herr_t ret_value = 0;
 
-    if(H5Oget_info_by_name(group, name, &oinfo, H5P_DEFAULT) < 0)
-        ;     /* keep going */
-    else {
-        switch(oinfo.type) {
-            char   *tmp;
-            size_t tmp_len;
-
-            case H5O_TYPE_GROUP:
-                if(search_obj(info->group_table, oinfo.addr) == NULL) {
-                    char *old_prefix;
+    switch(oinfo->type) {
+        case H5O_TYPE_GROUP:
+            if(NULL == already_seen)
+                add_obj(info->group_table, oinfo->addr, name, TRUE);
+            break;
 
-                    tmp = build_obj_path_name(info->prefix, name);
-                    add_obj(info->group_table, oinfo.addr, tmp, TRUE);
+        case H5O_TYPE_DATASET:
+            if(NULL == already_seen) {
+                hid_t dset;
 
-                    old_prefix = info->prefix;
-                    tmp_len = HDstrlen(tmp);
-                    info->prefix = HDmalloc(tmp_len+1);
-                    HDstrcpy(info->prefix, tmp);
+                /* Add the dataset to the list of objects */
+                add_obj(info->dset_table, oinfo->addr, name, TRUE);
 
-                    if(H5Literate_by_name(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT) < 0)
-                        ret_value = FAIL;
+                /* Check for a dataset that uses a named datatype */
+                if((dset = H5Dopen2(info->fid, name, H5P_DEFAULT)) >= 0) {
+                    hid_t type = H5Dget_type(dset);
 
-                    info->prefix = old_prefix;
-                } /* end if */
-                break;
-
-            case H5O_TYPE_DATASET:
-                if(search_obj(info->dset_table, oinfo.addr) == NULL) {
-                    hid_t dset;
-
-                    tmp = build_obj_path_name(info->prefix, name);
-                    add_obj(info->dset_table, oinfo.addr, tmp, TRUE);
-
-                    if((dset = H5Dopen2(group, name, H5P_DEFAULT)) >= 0) {
-                        hid_t type;
+                    if(H5Tcommitted(type) > 0) {
+                        H5O_info_t type_oinfo;
 
-                        type = H5Dget_type(dset);
-
-                        if(H5Tcommitted(type) > 0) {
-                            H5Oget_info(type, &oinfo);
-                            if(search_obj(info->type_table, oinfo.addr) == NULL) {
-                                char *type_name = HDstrdup(tmp);
-
-                                add_obj(info->type_table, oinfo.addr, type_name, FALSE);
-                            } /* end if */
-                        } /* end if */
-
-                        H5Tclose(type);
-                        H5Dclose(dset);
+                        H5Oget_info(type, &type_oinfo);
+                        if(search_obj(info->type_table, type_oinfo.addr) == NULL)
+                            add_obj(info->type_table, type_oinfo.addr, name, FALSE);
                     } /* end if */
-                    else
-                        ret_value = FAIL;
-                } /* end if */
-                break;
 
-            case H5O_TYPE_NAMED_DATATYPE:
-            {
-                obj_t *found_obj;
-
-                tmp = build_obj_path_name(info->prefix, name);
-                if((found_obj = search_obj(info->type_table, oinfo.addr)) == NULL)
-                    add_obj(info->type_table, oinfo.addr, tmp, TRUE);
-                else {
-                    /* Use latest version of name */
-                    HDfree(found_obj->objname);
-                    found_obj->objname = HDstrdup(tmp);
-
-                    /* Mark named datatype as having valid name */
-                    found_obj->recorded = TRUE;
-                } /* end else */
-                break;
-            }
-
-            default:
-                /* Ignore links, etc. */
-                break;
+                    H5Tclose(type);
+                    H5Dclose(dset);
+                } /* end if */
+                else
+                    ret_value = FAIL;
+            } /* end if */
+            break;
+
+        case H5O_TYPE_NAMED_DATATYPE:
+        {
+            obj_t *found_obj;
+
+            if((found_obj = search_obj(info->type_table, oinfo->addr)) == NULL)
+                add_obj(info->type_table, oinfo->addr, name, TRUE);
+            else {
+                /* Use latest version of name */
+                HDfree(found_obj->objname);
+                found_obj->objname = HDstrdup(name);
+
+                /* Mark named datatype as having valid name */
+                found_obj->recorded = TRUE;
+            } /* end else */
+            break;
         }
-    } /* end else */
+
+        default:
+            break;
+    } /* end switch */
 
     return ret_value;
 }
@@ -589,31 +533,19 @@ herr_t
 init_objs(hid_t fid, find_objs_t *info, table_t **group_table,
     table_t **dset_table, table_t **type_table)
 {
-    H5O_info_t oinfo;
-
     /* Initialize the tables */
     init_table(group_table);
     init_table(dset_table);
     init_table(type_table);
 
     /* Init the find_objs_t */
-    info->prefix = HDcalloc(1, 1);
+    info->fid = fid;
     info->group_table = *group_table;
     info->type_table = *type_table;
     info->dset_table = *dset_table;
 
-    /* add the root group as an object, it may have hard links to it */
-    if(H5Oget_info(fid, &oinfo) < 0)
-        return FAIL;
-    else {
-        /* call with an empty string, it appends '/' group separator */
-        char *tmp = build_obj_path_name(info->prefix, "");
-
-        add_obj(info->group_table, oinfo.addr, tmp, TRUE);
-    } /* end else */
-
     /* Find all shared objects */
-    return(H5Literate(fid, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info));
+    return(h5trav_visit(fid, "/", TRUE, TRUE, find_objs_cb, NULL, info));
 }
 
 
@@ -632,22 +564,22 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table,
  *-------------------------------------------------------------------------
  */
 static void
-add_obj(table_t *table, haddr_t objno, char *objname, hbool_t record)
+add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t record)
 {
     unsigned u;
 
     /* See if we need to make table larger */
-    if (table->nobjs == table->size) {
+    if(table->nobjs == table->size) {
         table->size *= 2;
-        table->objs = HDrealloc(table->objs, table->size * sizeof(obj_t));
-    }
+        table->objs = HDrealloc(table->objs, table->size * sizeof(table->objs[0]));
+    } /* end if */
 
     /* Increment number of objects in table */
     u = table->nobjs++;
 
     /* Set information about object */
     table->objs[u].objno = objno;
-    table->objs[u].objname = objname;
+    table->objs[u].objname = HDstrdup(objname);
     table->objs[u].recorded = record;
     table->objs[u].displayed = 0;
 }
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index e604e5a..e7b175c 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -95,7 +95,7 @@ typedef struct table_t {
 
 /*this struct stores the information that is passed to the find_objs function*/
 typedef struct find_objs_t {
-    char *prefix;
+    hid_t fid;
     table_t *group_table;
     table_t *type_table;
     table_t *dset_table;
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 97de021..14ced60 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -24,24 +24,25 @@
 typedef struct trav_addr_t {
     size_t      nalloc;
     size_t      nused;
-    haddr_t     *addrs;
+    struct {
+        haddr_t addr;
+        char *path;
+    } *objs;
 } trav_addr_t;
 
 typedef struct {
-    herr_t (*visit_obj)(const char *path_name, const H5O_info_t *oinfo, hbool_t already_visited, void *udata);
-    herr_t (*visit_lnk)(const char *path_name, const H5L_info_t *linfo, void *udata);
+    h5trav_obj_func_t visit_obj;        /* Callback for visiting objects */
+    h5trav_lnk_func_t visit_lnk;        /* Callback for visiting links */
     void *udata;                /* User data to pass to callbacks */
 } trav_visitor_t;
 
 typedef struct {
     trav_addr_t *seen;              /* List of addresses seen already */
-    const char *curr_path;          /* Current path to parent group */
     const trav_visitor_t *visitor;  /* Information for visiting each link/object */
 } trav_ud_traverse_t;
 
 typedef struct {
     hid_t fid;                      /* File ID being traversed */
-    trav_table_t *table;            /* Table for tracking name of objects with >1 hard link */
 } trav_print_udata_t;
 
 /*-------------------------------------------------------------------------
@@ -52,10 +53,8 @@ static void trav_table_add(trav_table_t *table,
                         const char *objname,
                         const H5O_info_t *oinfo);
 
-static size_t trav_table_search(const trav_table_t *table, haddr_t objno);
-
 static void trav_table_addlink(trav_table_t *table,
-                        size_t j /* the object index */,
+                        haddr_t objno,
                         const char *path);
 
 /*-------------------------------------------------------------------------
@@ -78,19 +77,20 @@ static void trav_table_addlink(trav_table_t *table,
  *-------------------------------------------------------------------------
  */
 static void
-trav_addr_add(trav_addr_t *visited, haddr_t addr)
+trav_addr_add(trav_addr_t *visited, haddr_t addr, const char *path)
 {
     size_t idx;         /* Index of address to use */
 
     /* Allocate space if necessary */
     if(visited->nused == visited->nalloc) {
         visited->nalloc = MAX(1, visited->nalloc * 2);;
-        visited->addrs = (haddr_t *)HDrealloc(visited->addrs, visited->nalloc * sizeof(haddr_t));
+        visited->objs = HDrealloc(visited->objs, visited->nalloc * sizeof(visited->objs[0]));
     } /* end if */
 
     /* Append it */
     idx = visited->nused++;
-    visited->addrs[idx] = addr;
+    visited->objs[idx].addr = addr;
+    visited->objs[idx].path = HDstrdup(path);
 } /* end trav_addr_add() */
 
 
@@ -107,7 +107,7 @@ trav_addr_add(trav_addr_t *visited, haddr_t addr)
  *
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static const char *
 trav_addr_visited(trav_addr_t *visited, haddr_t addr)
 {
     size_t u;           /* Local index variable */
@@ -115,11 +115,11 @@ trav_addr_visited(trav_addr_t *visited, haddr_t addr)
     /* Look for address */
     for(u = 0; u < visited->nused; u++)
         /* Check for address already in array */
-        if(visited->addrs[u] == addr)
-            return(TRUE);
+        if(visited->objs[u].addr == addr)
+            return(visited->objs[u].path);
 
     /* Didn't find address */
-    return(FALSE);
+    return(NULL);
 } /* end trav_addr_visited() */
 
 
@@ -135,68 +135,44 @@ trav_addr_visited(trav_addr_t *visited, haddr_t addr)
  *-------------------------------------------------------------------------
  */
 static herr_t
-traverse_cb(hid_t loc_id, const char *link_name, const H5L_info_t *linfo,
+traverse_cb(hid_t loc_id, const char *path, const H5L_info_t *linfo,
     void *_udata)
 {
     trav_ud_traverse_t *udata = (trav_ud_traverse_t *)_udata;     /* User data */
-    hbool_t is_group = FALSE;           /* If the object is a group */
-    hbool_t already_visited = FALSE;    /* Whether the link/object was already visited */
-    char *link_path;            /* Full path name of a link */
+    char *full_name;
+    const char *already_visited = NULL; /* Whether the link/object was already visited */
 
-    /* Construct the full path name of this link */
-    link_path = (char*)HDmalloc(HDstrlen(udata->curr_path) + HDstrlen(link_name) + 2);
-    HDassert(link_path);
-    HDstrcpy(link_path, udata->curr_path);
-    HDstrcat(link_path, "/");
-    HDstrcat(link_path, link_name);
+    /* Create the full path name for the link */
+    full_name = HDmalloc(HDstrlen(path) + 2);
+    *full_name = '/';
+    HDstrcpy(full_name + 1, path);
 
     /* Perform the correct action for different types of links */
     if(linfo->type == H5L_TYPE_HARD) {
         H5O_info_t oinfo;
 
         /* Get information about the object */
-        if(H5Oget_info_by_name(loc_id, link_name, &oinfo, H5P_DEFAULT) < 0)
+        if(H5Oget_info_by_name(loc_id, path, &oinfo, H5P_DEFAULT) < 0)
             return(H5_ITER_ERROR);
 
         /* If the object has multiple links, add it to the list of addresses
          *  already visited, if it isn't there already
          */
-        if(oinfo.rc > 1) {
-            already_visited = trav_addr_visited(udata->seen, oinfo.addr);
-            if(!already_visited)
-                trav_addr_add(udata->seen, oinfo.addr);
-        } /* end if */
-
-        /* Check if object is a group, for later */
-        is_group = (oinfo.type == H5O_TYPE_GROUP) ? TRUE : FALSE;
+        if(oinfo.rc > 1)
+            if(NULL == (already_visited = trav_addr_visited(udata->seen, oinfo.addr)))
+                trav_addr_add(udata->seen, oinfo.addr, full_name);
 
         /* Make 'visit object' callback */
         if(udata->visitor->visit_obj)
-            (*udata->visitor->visit_obj)(link_path, &oinfo, already_visited, udata->visitor->udata);
+            (*udata->visitor->visit_obj)(full_name, &oinfo, already_visited, udata->visitor->udata);
     } /* end if */
     else {
         /* Make 'visit link' callback */
         if(udata->visitor->visit_lnk)
-            (*udata->visitor->visit_lnk)(link_path, linfo, udata->visitor->udata);
+            (*udata->visitor->visit_lnk)(full_name, linfo, udata->visitor->udata);
     } /* end else */
 
-    /* Check for group that we haven't visited yet & recurse */
-    if(is_group && !already_visited) {
-        const char *prev_path = udata->curr_path;     /* Previous path to link's parent group */
-
-        /* Set current path to this object */
-        udata->curr_path = link_path;
-
-        /* Iterate over all links in group object */
-        if(H5Literate_by_name(loc_id, link_name, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, udata, H5P_DEFAULT) < 0)
-            return(H5_ITER_ERROR);
-
-        /* Restore path in udata */
-        udata->curr_path = prev_path;
-    } /* end if */
-
-    /* Free path name for current link/object */
-    HDfree(link_path);
+    HDfree(full_name);
 
     return(H5_ITER_CONT);
 } /* end traverse_cb() */
@@ -217,39 +193,58 @@ traverse_cb(hid_t loc_id, const char *link_name, const H5L_info_t *linfo,
  *-------------------------------------------------------------------------
  */
 static int
-traverse(hid_t file_id, const trav_visitor_t *visitor)
+traverse(hid_t file_id, const char *grp_name, hbool_t visit_start,
+    hbool_t recurse, const trav_visitor_t *visitor)
 {
-    H5O_info_t  oinfo;          /* Object info for root group */
-    trav_addr_t seen;           /* List of addresses seen */
-    trav_ud_traverse_t udata;   /* User data for iteration callback */
+    H5O_info_t  oinfo;          /* Object info for starting group */
 
-    /* Get info for root group */
-    if(H5Oget_info(file_id, &oinfo) < 0)
+    /* Get info for starting object */
+    if(H5Oget_info_by_name(file_id, grp_name, &oinfo, H5P_DEFAULT) < 0)
         return -1;
 
-    /* Visit the root group of the file */
-    (*visitor->visit_obj)("/", &oinfo, FALSE, visitor->udata);
+    /* Visit the starting object */
+    if(visit_start && visitor->visit_obj)
+        (*visitor->visit_obj)(grp_name, &oinfo, NULL, visitor->udata);
 
-    /* Init addresses seen */
-    seen.nused = seen.nalloc = 0;
-    seen.addrs = NULL;
+    /* Go visiting, if the object is a group */
+    if(oinfo.type == H5O_TYPE_GROUP) {
+        trav_addr_t seen;           /* List of addresses seen */
+        trav_ud_traverse_t udata;   /* User data for iteration callback */
 
-    /* Check for multiple links to root group */
-    if(oinfo.rc > 1)
-        trav_addr_add(&seen, oinfo.addr);
+        /* Init addresses seen */
+        seen.nused = seen.nalloc = 0;
+        seen.objs = NULL;
 
-    /* Set up user data structure */
-    udata.seen = &seen;
-    udata.curr_path = "";
-    udata.visitor = visitor;
+        /* Check for multiple links to top group */
+        if(oinfo.rc > 1)
+            trav_addr_add(&seen, oinfo.addr, grp_name);
 
-    /* Iterate over all links in root group */
-    if(H5Literate(file_id, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, &udata) < 0)
-        return -1;
+        /* Set up user data structure */
+        udata.seen = &seen;
+        udata.visitor = visitor;
 
-    /* Free visited addresses table */
-    if(seen.addrs)
-        HDfree(seen.addrs);
+        /* Check for iteration of links vs. visiting all links recursively */
+        if(recurse) {
+            /* Visit all links in group, recursively */
+            if(H5Lvisit_by_name(file_id, grp_name, H5_INDEX_NAME, H5_ITER_INC, traverse_cb, &udata, H5P_DEFAULT) < 0)
+                return -1;
+        } /* end if */
+        else {
+            /* Iterate over links in group */
+            if(H5Literate_by_name(file_id, grp_name, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, &udata, H5P_DEFAULT) < 0)
+                return -1;
+        } /* end else */
+
+        /* Free visited addresses table */
+        if(seen.objs) {
+            size_t u;       /* Local index variable */
+
+            /* Free paths to objects */
+            for(u = 0; u < seen.nused; u++)
+                HDfree(seen.objs[u].path);
+            HDfree(seen.objs);
+        } /* end if */
+    } /* end if */
 
     return 0;
 }
@@ -301,7 +296,7 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
  */
 static int
 trav_info_visit_obj(const char *path, const H5O_info_t *oinfo,
-    hbool_t UNUSED already_visited, void *udata)
+    const char UNUSED *already_visited, void *udata)
 {
     /* Add the object to the 'info' struct */
     /* (object types map directly to "traversal" types) */
@@ -359,7 +354,7 @@ h5trav_getinfo(hid_t file_id, trav_info_t *info)
     info_visitor.udata = info;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if(traverse(file_id, &info_visitor) < 0)
+    if(traverse(file_id, "/", TRUE, TRUE, &info_visitor) < 0)
         return -1;
 
     return 0;
@@ -470,24 +465,17 @@ trav_info_free(trav_info_t *info)
  */
 static int
 trav_table_visit_obj(const char *path, const H5O_info_t *oinfo,
-    hbool_t already_visited, void *udata)
+    const char *already_visited, void *udata)
 {
     trav_table_t *table = (trav_table_t *)udata;
 
     /* Check if we've already seen this object */
-    if(!already_visited)
+    if(NULL == already_visited)
         /* add object to table */
         trav_table_add(table, path, oinfo);
-    else {
-        size_t found;           /* Index of original object seen */
-
-        /* Look for object in existing table */
-        found = trav_table_search(table, oinfo->addr);
-        HDassert(found < table->nobjs);
-
+    else
         /* Add alias for object to table */
-        trav_table_addlink(table, found, path);
-    } /* end else */
+        trav_table_addlink(table, oinfo->addr, path);
 
     return(0);
 } /* end trav_table_visit_obj() */
@@ -541,7 +529,7 @@ h5trav_gettable(hid_t fid, trav_table_t *table)
     table_visitor.udata = table;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if(traverse(fid, &table_visitor) < 0)
+    if(traverse(fid, "/", TRUE, TRUE, &table_visitor) < 0)
         return -1;
     return 0;
 }
@@ -670,25 +658,33 @@ trav_table_add(trav_table_t *table,
  */
 
 static void
-trav_table_addlink(trav_table_t *table,
-                        size_t j /* the object index */,
-                        const char *path)
+trav_table_addlink(trav_table_t *table, haddr_t objno, const char *path)
 {
-    size_t new;
+    size_t i;           /* Local index variable */
 
-    /* already inserted */
-    if(HDstrcmp(table->objs[j].name, path) == 0)
-        return;
+    for(i = 0; i < table->nobjs; i++) {
+        if(table->objs[i].objno == objno) {
+            size_t n;
 
-    /* allocate space if necessary */
-    if(table->objs[j].nlinks == (unsigned)table->objs[j].sizelinks) {
-        table->objs[j].sizelinks = MAX(1, table->objs[j].sizelinks * 2);
-        table->objs[j].links = (trav_link_t*)HDrealloc(table->objs[j].links, table->objs[j].sizelinks * sizeof(trav_link_t));
-    } /* end if */
+            /* already inserted? */
+            if(HDstrcmp(table->objs[i].name, path) == 0)
+                return;
+
+            /* allocate space if necessary */
+            if(table->objs[i].nlinks == (unsigned)table->objs[i].sizelinks) {
+                table->objs[i].sizelinks = MAX(1, table->objs[i].sizelinks * 2);
+                table->objs[i].links = (trav_link_t*)HDrealloc(table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t));
+            } /* end if */
 
-    /* insert it */
-    new = table->objs[j].nlinks++;
-    table->objs[j].links[new].new_name = (char *)HDstrdup(path);
+            /* insert it */
+            n = table->objs[i].nlinks++;
+            table->objs[i].links[n].new_name = (char *)HDstrdup(path);
+
+            return;
+        } /* end for */
+    } /* end for */
+
+    HDassert(0 && "object not in table?!?");
 }
 
 
@@ -809,10 +805,8 @@ void trav_table_free( trav_table_t *table )
  */
 static int
 trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
-    hbool_t already_visited, void *udata)
+    const char *already_visited, void UNUSED *udata)
 {
-    trav_print_udata_t *print_udata = (trav_print_udata_t *)udata;
-
     /* Print the name of the object */
     /* (no new-line, so that objects that we've encountered before can print
      *  the name of the original object)
@@ -836,26 +830,12 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
     } /* end switch */
 
     /* Check if we've already seen this object */
-    if(!already_visited) {
+    if(NULL == already_visited)
         /* Finish printing line about object */
         printf("\n");
-
-        /* Check if we will encounter another hard link to this object */
-        if(oinfo->rc > 1) {
-            /* Add object to table */
-            trav_table_add(print_udata->table, path, oinfo);
-        } /* end if */
-    } /* end if */
-    else {
-        size_t found;           /* Index of original object seen */
-
-        /* Locate object in table */
-        found = trav_table_search(print_udata->table, oinfo->addr);
-        HDassert(found < print_udata->table->nobjs);
-
-        /* Print the link's destination */
-        printf(" -> %s\n", print_udata->table->objs[found].name);
-    } /* end else */
+    else
+        /* Print the link's original name */
+        printf(" -> %s\n", already_visited);
 
     return(0);
 } /* end trav_print_visit_obj() */
@@ -938,16 +918,11 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
 int
 h5trav_print(hid_t fid)
 {
-    trav_table_t *table = NULL;         /* Table for objects w/multiple hard links */
     trav_print_udata_t print_udata;     /* User data for traversal */
     trav_visitor_t print_visitor;       /* Visitor structure for printing objects */
 
-    /* Initialize the table */
-    trav_table_init(&table);
-
     /* Init user data for printing */
     print_udata.fid = fid;
-    print_udata.table = table;
 
     /* Init visitor structure */
     print_visitor.visit_obj = trav_print_visit_obj;
@@ -955,11 +930,42 @@ h5trav_print(hid_t fid)
     print_visitor.udata = &print_udata;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if(traverse(fid, &print_visitor) < 0)
+    if(traverse(fid, "/", TRUE, TRUE, &print_visitor) < 0)
         return -1;
 
-    /* Free table */
-    trav_table_free(table);
+    return 0;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: h5trav_visit
+ *
+ * Purpose: Generic traversal routine for visiting objects and links
+ *
+ * Return: 0, -1 on error
+ *
+ * Programmer: Quincey Koziol, koziol@hdfgroup.org
+ *
+ * Date: November 6, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int
+h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start,
+    hbool_t recurse, h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk,
+    void *udata)
+{
+    trav_visitor_t visitor;             /* Visitor structure for objects */
+
+    /* Init visitor structure */
+    visitor.visit_obj = visit_obj;
+    visitor.visit_lnk = visit_lnk;
+    visitor.udata = udata;
+
+    /* Traverse all objects in the file, visiting each object & link */
+    if(traverse(fid, grp_name, visit_start, recurse, &visitor) < 0)
+        return -1;
 
     return 0;
 }
diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h
index 05bc3cb..5c07331 100644
--- a/tools/lib/h5trav.h
+++ b/tools/lib/h5trav.h
@@ -18,6 +18,12 @@
 
 #include "hdf5.h"
 
+/* Typedefs for visiting objects */
+typedef herr_t (*h5trav_obj_func_t)(const char *path_name, const H5O_info_t *oinfo,
+        const char *first_seen, void *udata);
+typedef herr_t (*h5trav_lnk_func_t)(const char *path_name, const H5L_info_t *linfo,
+        void *udata);
+
 /*-------------------------------------------------------------------------
  * public enum to specify type of an object
  * the TYPE can be:
@@ -101,6 +107,14 @@ extern "C" {
 #endif
 
 /*-------------------------------------------------------------------------
+ * "h5trav general" public functions
+ *-------------------------------------------------------------------------
+ */
+int h5trav_visit(hid_t file_id, const char *grp_name, hbool_t visit_start,
+    hbool_t recurse, h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk,
+    void *udata);
+
+/*-------------------------------------------------------------------------
  * "h5trav info" public functions
  *-------------------------------------------------------------------------
  */
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 44d54c0..0644f5d 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -228,6 +228,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = /bin/sh
 SIZE_T = @SIZE_T@
 STATIC_SHARED = @STATIC_SHARED@
+STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
 TESTPARALLEL = @TESTPARALLEL@
 TIME = @TIME@
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index c39d07b..fbb6163 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -233,8 +233,8 @@ main(int argc, const char *argv[])
 
     /* Check for creating groups with new format version */
     if(params.latest) {
-        /* Set the "use the latest version of the format flag */
-        if(H5Pset_latest_format(fapl_id, TRUE) < 0) {
+        /* Set the "use the latest version of the format" bounds */
+        if(H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
             error_msg(progname, "Could not set property for using latest version of the format\n");
             leave(EXIT_FAILURE);
         } /* end if */
diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls
index c4d1778..9cad76f 100644
--- a/tools/testfiles/h5copytst.out.ls
+++ b/tools/testfiles/h5copytst.out.ls
@@ -2,58 +2,61 @@
 Expected output for 'h5ls ../testfiles/h5copytst.out.h5'
 #############################
 Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
 /A                       Group
-    Location:  1:90344
+    Location:  1:89936
     Links:     1
 /A/B1                    Group
-    Location:  1:91048
+    Location:  1:90640
     Links:     1
 /A/B1/simple             Dataset {6/6}
-    Location:  1:90216
+    Location:  1:89808
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /A/B2                    Group
-    Location:  1:94584
+    Location:  1:94176
     Links:     1
 /A/B2/simple2            Dataset {6/6}
-    Location:  1:94456
+    Location:  1:94048
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /C                       Group
-    Location:  1:97792
+    Location:  1:97384
     Links:     1
 /C/D                     Group
-    Location:  1:98496
+    Location:  1:98088
     Links:     1
 /C/D/simple              Dataset {6/6}
-    Location:  1:97664
+    Location:  1:97256
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /E                       Group
-    Location:  1:103920
+    Location:  1:112000
     Links:     1
 /E/F                     Group
-    Location:  1:103960
+    Location:  1:112704
     Links:     1
 /E/F/grp_dsets           Group
-    Location:  1:100608
+    Location:  1:100200
     Links:     1
 /E/F/grp_dsets/chunk     Dataset {6/6}
-    Location:  1:102744
+    Location:  1:104384
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compact   Dataset {6/6}
-    Location:  1:103200
+    Location:  1:104840
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compound  Dataset {2/2}
-    Location:  1:103336
+    Location:  1:104976
     Links:     1
     Storage:   

     Type:      struct {
@@ -61,60 +64,60 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /E/F/grp_dsets/compressed Dataset {6/6}
-    Location:  1:103552
+    Location:  1:107288
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/named_vl  Dataset {2/2}
-    Location:  1:103768
+    Location:  1:111600
     Links:     1
     Storage:   

-    Type:      shared-1:103720 variable length of
+    Type:      shared-1:107456 variable length of
                    32-bit little-endian integer
 /E/F/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:112240
+    Location:  1:111728
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /E/F/grp_dsets/simple    Dataset {6/6}
-    Location:  1:112384
+    Location:  1:111872
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /E/F/grp_dsets/vl        Type
-    Location:  1:103720
+    Location:  1:107456
     Links:     2
-    Type:      shared-1:103720 variable length of
+    Type:      shared-1:107456 variable length of
                    32-bit little-endian integer
 /G                       Group
-    Location:  1:128176
+    Location:  1:127648
     Links:     1
 /G/H                     Group
-    Location:  1:128880
+    Location:  1:128352
     Links:     1
 /G/H/grp_nested          Group
-    Location:  1:115160
+    Location:  1:114728
     Links:     1
 /G/H/grp_nested/grp_dsets Group
-    Location:  1:115952
+    Location:  1:115520
     Links:     1
 /G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:118088
+    Location:  1:119704
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:120688
+    Location:  1:120160
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:120824
+    Location:  1:120296
     Links:     1
     Storage:   

     Type:      struct {
@@ -122,34 +125,34 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:123136
+    Location:  1:122608
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:127448
+    Location:  1:126920
     Links:     1
     Storage:   

-    Type:      shared-1:123304 variable length of
+    Type:      shared-1:122776 variable length of
                    32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:127576
+    Location:  1:127048
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:127720
+    Location:  1:127192
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/vl Type
-    Location:  1:123304
+    Location:  1:122776
     Links:     2
-    Type:      shared-1:123304 variable length of
+    Type:      shared-1:122776 variable length of
                    32-bit little-endian integer
 /chunk                   Dataset {6/6}
     Location:  1:6216
@@ -181,18 +184,18 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
     Location:  1:33760
     Links:     1
 /grp_dsets/chunk         Dataset {6/6}
-    Location:  1:35896
+    Location:  1:37944
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /grp_dsets/compact       Dataset {6/6}
-    Location:  1:36352
+    Location:  1:38400
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_dsets/compound      Dataset {2/2}
-    Location:  1:36488
+    Location:  1:38536
     Links:     1
     Storage:   

     Type:      struct {
@@ -200,62 +203,62 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_dsets/compressed    Dataset {6/6}
-    Location:  1:36704
+    Location:  1:40848
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_dsets/named_vl      Dataset {2/2}
-    Location:  1:36920
+    Location:  1:45160
     Links:     1
     Storage:   

-    Type:      shared-1:36872 variable length of
+    Type:      shared-1:41016 variable length of
                    32-bit little-endian integer
 /grp_dsets/nested_vl     Dataset {2/2}
-    Location:  1:45392
+    Location:  1:45288
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_dsets/simple        Dataset {6/6}
-    Location:  1:45536
+    Location:  1:45432
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_dsets/simple_group  Dataset {6/6}
-    Location:  1:61744
+    Location:  1:61544
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_dsets/vl            Type
-    Location:  1:36872
+    Location:  1:41016
     Links:     2
-    Type:      shared-1:36872 variable length of
+    Type:      shared-1:41016 variable length of
                    32-bit little-endian integer
 /grp_empty               Group
     Location:  1:32968
     Links:     1
 /grp_nested              Group
-    Location:  1:46328
+    Location:  1:46224
     Links:     1
 /grp_nested/grp_dsets    Group
-    Location:  1:47120
+    Location:  1:47016
     Links:     1
 /grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:49256
+    Location:  1:51200
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:51856
+    Location:  1:51656
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:51992
+    Location:  1:51792
     Links:     1
     Storage:   

     Type:      struct {
@@ -263,51 +266,51 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:54304
+    Location:  1:54104
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:58616
+    Location:  1:58416
     Links:     1
     Storage:   

-    Type:      shared-1:54472 variable length of
+    Type:      shared-1:54272 variable length of
                    32-bit little-endian integer
 /grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:58744
+    Location:  1:58544
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:58888
+    Location:  1:58688
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_nested/grp_dsets/vl Type
-    Location:  1:54472
+    Location:  1:54272
     Links:     2
-    Type:      shared-1:54472 variable length of
+    Type:      shared-1:54272 variable length of
                    32-bit little-endian integer
 /grp_rename              Group
-    Location:  1:62952
+    Location:  1:62752
     Links:     1
 /grp_rename/chunk        Dataset {6/6}
-    Location:  1:65088
+    Location:  1:66936
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/compact      Dataset {6/6}
-    Location:  1:65544
+    Location:  1:67392
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/compound     Dataset {2/2}
-    Location:  1:65680
+    Location:  1:67528
     Links:     1
     Storage:   

     Type:      struct {
@@ -315,28 +318,28 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/compressed   Dataset {6/6}
-    Location:  1:65896
+    Location:  1:69840
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets    Group
-    Location:  1:75936
+    Location:  1:75632
     Links:     1
 /grp_rename/grp_dsets/chunk Dataset {6/6}
-    Location:  1:78072
+    Location:  1:79816
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compact Dataset {6/6}
-    Location:  1:78528
+    Location:  1:80272
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/compound Dataset {2/2}
-    Location:  1:78664
+    Location:  1:80408
     Links:     1
     Storage:   

     Type:      struct {
@@ -344,57 +347,57 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /grp_rename/grp_dsets/compressed Dataset {6/6}
-    Location:  1:78880
+    Location:  1:82720
     Links:     1
     Chunks:    {2} 8 bytes
     Storage:   

     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:79096
+    Location:  1:87032
     Links:     1
     Storage:   

-    Type:      shared-1:79048 variable length of
+    Type:      shared-1:82888 variable length of
                    32-bit little-endian integer
 /grp_rename/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:87568
+    Location:  1:87160
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/grp_dsets/simple Dataset {6/6}
-    Location:  1:87712
+    Location:  1:87304
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/grp_dsets/vl Type
-    Location:  1:79048
+    Location:  1:82888
     Links:     2
-    Type:      shared-1:79048 variable length of
+    Type:      shared-1:82888 variable length of
                    32-bit little-endian integer
 /grp_rename/named_vl     Dataset {2/2}
-    Location:  1:66112
+    Location:  1:74152
     Links:     1
     Storage:   

-    Type:      shared-1:66064 variable length of
+    Type:      shared-1:70008 variable length of
                    32-bit little-endian integer
 /grp_rename/nested_vl    Dataset {2/2}
-    Location:  1:74584
+    Location:  1:74280
     Links:     1
     Storage:   

     Type:      variable length of
                    variable length of
                        32-bit little-endian integer
 /grp_rename/simple       Dataset {6/6}
-    Location:  1:74728
+    Location:  1:74424
     Links:     1
     Storage:   

     Type:      32-bit little-endian integer
 /grp_rename/vl           Type
-    Location:  1:66064
+    Location:  1:70008
     Links:     2
-    Type:      shared-1:66064 variable length of
+    Type:      shared-1:70008 variable length of
                    32-bit little-endian integer
 /named_vl                Dataset {2/2}
     Location:  1:13104
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index 0f17c6d..1d93779 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -21,6 +21,8 @@ file1     file2
     x           /g1/fp1        
     x           /g1/fp15       
     x           /g1/fp16       
+    x           /g1/fp17       
+    x           /g1/fp18       
     x           /g1/fp2        
            x    /g2            
 
diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/testfiles/h5diff_basic1.h5
index e672d65..389e2b3 100644
Binary files a/tools/testfiles/h5diff_basic1.h5 and b/tools/testfiles/h5diff_basic1.h5 differ
diff --git a/tools/testfiles/h5mkgrp_nested.ls b/tools/testfiles/h5mkgrp_nested.ls
index 2b9fb25..472656d 100644
--- a/tools/testfiles/h5mkgrp_nested.ls
+++ b/tools/testfiles/h5mkgrp_nested.ls
@@ -2,6 +2,9 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_nested.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
 /one                     Group
     Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_latest.ls
index f0bab6f..c00292d 100644
--- a/tools/testfiles/h5mkgrp_nested_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_latest.ls
@@ -2,6 +2,10 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver.
+/                        Group
+    Location:  1:48
+    Links:     1
+    Modified:  XXXX-XX-XX XX:XX:XX XXX
 /one                     Group
     Location:  1:195
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_mult.ls b/tools/testfiles/h5mkgrp_nested_mult.ls
index 4fccd83..6a22ffd 100644
--- a/tools/testfiles/h5mkgrp_nested_mult.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult.ls
@@ -2,6 +2,9 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_mult.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
 /one                     Group
     Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_latest.ls
index 7835050..0b19ff9 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult_latest.ls
@@ -2,6 +2,10 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver.
+/                        Group
+    Location:  1:48
+    Links:     1
+    Modified:  XXXX-XX-XX XX:XX:XX XXX
 /one                     Group
     Location:  1:195
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/testfiles/h5mkgrp_several.ls
index dcbe3eb..bbf5c92 100644
--- a/tools/testfiles/h5mkgrp_several.ls
+++ b/tools/testfiles/h5mkgrp_several.ls
@@ -2,6 +2,9 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_several.h5'
 #############################
 Opened "../testfiles/h5mkgrp_several.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
 /one                     Group
     Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several_latest.ls b/tools/testfiles/h5mkgrp_several_latest.ls
index c59107e..a3b5224 100644
--- a/tools/testfiles/h5mkgrp_several_latest.ls
+++ b/tools/testfiles/h5mkgrp_several_latest.ls
@@ -2,6 +2,10 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_several_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_several_latest.h5" with sec2 driver.
+/                        Group
+    Location:  1:48
+    Links:     1
+    Modified:  XXXX-XX-XX XX:XX:XX XXX
 /one                     Group
     Location:  1:195
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/testfiles/h5mkgrp_single.ls
index 1f7e828..e9932f7 100644
--- a/tools/testfiles/h5mkgrp_single.ls
+++ b/tools/testfiles/h5mkgrp_single.ls
@@ -2,6 +2,9 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_single.h5'
 #############################
 Opened "../testfiles/h5mkgrp_single.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
 /single                  Group
     Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_single_latest.ls b/tools/testfiles/h5mkgrp_single_latest.ls
index 7f5ee72..b6e6ea4 100644
--- a/tools/testfiles/h5mkgrp_single_latest.ls
+++ b/tools/testfiles/h5mkgrp_single_latest.ls
@@ -2,6 +2,10 @@
 Expected output for 'h5ls ../testfiles/h5mkgrp_single_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_single_latest.h5" with sec2 driver.
+/                        Group
+    Location:  1:48
+    Links:     1
+    Modified:  XXXX-XX-XX XX:XX:XX XXX
 /latest                  Group
     Location:  1:195
     Links:     1
diff --git a/tools/testfiles/tall-2.ls b/tools/testfiles/tall-2.ls
index 5513214..2e4cd37 100644
--- a/tools/testfiles/tall-2.ls
+++ b/tools/testfiles/tall-2.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tall.h5'
 #############################
+/                        Group
 /g1                      Group
 /g1/g1.1                 Group
 /g1/g1.1/dset1.1.1       Dataset {10, 10}
diff --git a/tools/testfiles/tarray1.ls b/tools/testfiles/tarray1.ls
index 83a51a8..60c002d 100644
--- a/tools/testfiles/tarray1.ls
+++ b/tools/testfiles/tarray1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tarray1.h5'
 #############################
+/                        Group
 /Dataset1                Dataset {4}
     Data:
         (0) [0,1,2,3], [10,11,12,13], [20,21,22,23], [30,31,32,33]
diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls
index 88b24cd..0448868 100644
--- a/tools/testfiles/tattr2.ls
+++ b/tools/testfiles/tattr2.ls
@@ -2,149 +2,6 @@
  output for 'h5ls -w80 -v -S tattr2.h5'
 #############################
 Opened "tattr2.h5" with sec2 driver.
-    Attribute: array     {2}
-        Type:      [3] 32-bit little-endian integer
-        Data:  [1,2,3], [4,5,6]
-    Attribute: array2D   {3, 2}
-        Type:      [3] 32-bit little-endian integer
-        Data:
-            (0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15], [16,17,18]
-    Attribute: array3D   {4, 3, 2}
-        Type:      [3] 32-bit little-endian integer
-        Data:
-            (0,0,0) [1,2,3], [4,5,6], [7,8,9], [10,11,12], [13,14,15],
-            (0,2,1) [16,17,18], [19,20,21], [22,23,24], [25,26,27], [28,29,30],
-            (1,2,0) [31,32,33], [34,35,36], [37,38,39], [40,41,42], [43,44,45],
-            (2,1,1) [46,47,48], [49,50,51], [52,53,54], [55,56,57], [58,59,60],
-            (3,1,0) [61,62,63], [64,65,66], [67,68,69], [70,71,72]
-    Attribute: bitfield  {2}
-        Type:      8-bit bitfield
-        Data:  0x01, 0x02
-    Attribute: bitfield2D {3, 2}
-        Type:      8-bit bitfield
-        Data:
-            (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-    Attribute: bitfield3D {4, 3, 2}
-        Type:      8-bit bitfield
-        Data:
-            (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
-            (3,1,0) 0x15, 0x16, 0x17, 0x18
-    Attribute: compound  {2}
-        Type:      struct {
-                   "a"                +0    8-bit integer
-                   "b"                +4    IEEE 64-bit little-endian float
-               } 12 bytes
-        Data:  {1, 2}, {3, 4}
-    Attribute: compound2D {3, 2}
-        Type:      struct {
-                   "a"                +0    8-bit integer
-                   "b"                +4    IEEE 64-bit little-endian float
-               } 12 bytes
-        Data:
-            (0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}
-    Attribute: compound3D {4, 3, 2}
-        Type:      struct {
-                   "a"                +0    8-bit integer
-                   "b"                +4    IEEE 64-bit little-endian float
-               } 12 bytes
-        Data:
-            (0,0,0) {1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}, {11, 12}, {13, 
-            (1,0,0)  14}, {15, 16}, {17, 18}, {19, 20}, {21, 22}, {23, 24},
-            (2,0,0) {25, 26}, {27, 28}, {29, 30}, {31, 32}, {33, 34}, {35, 36},
-            (3,0,0) {37, 38}, {39, 40}, {41, 42}, {43, 44}, {45, 46}, {47, 48}
-    Attribute: enum      {2}
-        Type:      enum 32-bit little-endian integer {
-                   RED              = 0
-                   GREEN            = 1
-               }
-        Data:  RED, RED
-    Attribute: enum2D    {3, 2}
-        Type:      enum 32-bit little-endian integer {
-                   RED              = 0
-                   GREEN            = 1
-               }
-        Data:
-            (0,0) RED, RED, RED, RED, RED, RED
-    Attribute: enum3D    {4, 3, 2}
-        Type:      enum 32-bit little-endian integer {
-                   RED              = 0
-                   GREEN            = 1
-               }
-        Data:
-            (0,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED,
-            (2,0,0) RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED
-    Attribute: float     {2}
-        Type:      IEEE 32-bit little-endian float
-        Data:  1, 2
-    Attribute: float2D   {3, 2}
-        Type:      IEEE 32-bit little-endian float
-        Data:
-            (0,0) 1, 2, 3, 4, 5, 6
-    Attribute: float3D   {4, 3, 2}
-        Type:      IEEE 32-bit little-endian float
-        Data:
-            (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-            (2,2,1) 18, 19, 20, 21, 22, 23, 24
-    Attribute: integer   {2}
-        Type:      32-bit little-endian integer
-        Data:  1, 2
-    Attribute: integer2D {3, 2}
-        Type:      32-bit little-endian integer
-        Data:
-            (0,0) 1, 2, 3, 4, 5, 6
-    Attribute: integer3D {4, 3, 2}
-        Type:      32-bit little-endian integer
-        Data:
-            (0,0,0) 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-            (2,2,1) 18, 19, 20, 21, 22, 23, 24
-    Attribute: opaque    {2}
-        Type:      1-byte opaque type
-               (tag = "1-byte opaque type")
-        Data:  0x01, 0x02
-    Attribute: opaque2D  {3, 2}
-        Type:      1-byte opaque type
-               (tag = "1-byte opaque type")
-        Data:
-            (0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-    Attribute: opaque3D  {4, 3, 2}
-        Type:      1-byte opaque type
-               (tag = "1-byte opaque type")
-        Data:
-            (0,0,0) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            (1,2,0) 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
-            (3,1,0) 0x15, 0x16, 0x17, 0x18
-    Attribute: string    {2}
-        Type:      2-byte null-terminated ASCII string
-        Data:  "ab", "de"
-    Attribute: string2D  {3, 2}
-        Type:      2-byte null-terminated ASCII string
-        Data:
-            (0,0) "ab", "cd", "ef", "gh", "ij", "kl"
-    Attribute: string3D  {4, 3, 2}
-        Type:      2-byte null-terminated ASCII string
-        Data:
-            (0,0,0) "ab", "cd", "ef", "gh", "ij", "kl", "mn", "pq", "rs", "tu",
-            (1,2,0) "vw", "xz", "AB", "CD", "EF", "GH", "IJ", "KL", "MN", "PQ",
-            (3,1,0) "RS", "TU", "VW", "XZ"
-    Attribute: vlen      {2}
-        Type:      variable length of
-                   32-bit little-endian integer
-        Data:  (1), (2,3)
-    Attribute: vlen2D    {3, 2}
-        Type:      variable length of
-                   32-bit little-endian integer
-        Data:
-            (0,0) (0), (1), (2,3), (4,5), (6,7,8), (9,10,11)
-    Attribute: vlen3D    {4, 3, 2}
-        Type:      variable length of
-                   32-bit little-endian integer
-        Data:
-            (0,0,0) (0), (1), (2), (3), (4), (5), (6,7), (8,9), (10,11),
-            (1,1,1) (12,13), (14,15), (16,17), (18,19,20), (21,22,23),
-            (2,1,0) (24,25,26), (27,28,29), (30,31,32), (33,34,35),
-            (3,0,0) (36,37,38,39), (40,41,42,43), (44,45,46,47), (48,49,50,51),
-            (3,2,0) (52,53,54,55), (56,57,58,59)
 dset                     Dataset {2/2}
     Attribute: array     {2}
         Type:      [3] 32-bit little-endian integer
diff --git a/tools/testfiles/tcomp-1.ls b/tools/testfiles/tcomp-1.ls
index 599fe68..9cfb47d 100644
--- a/tools/testfiles/tcomp-1.ls
+++ b/tools/testfiles/tcomp-1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tcompound.h5'
 #############################
+/                        Group
 /dset1                   Dataset {5}
     Data:
         (0) {0, 0, 1}, {1, 1, 0.5}, {2, 4, 0.333333333333333}, {3, 9, 0.25},
diff --git a/tools/testfiles/tdset-1.ls b/tools/testfiles/tdset-1.ls
index 6853429..b6e4671 100644
--- a/tools/testfiles/tdset-1.ls
+++ b/tools/testfiles/tdset-1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tdset.h5'
 #############################
+/                        Group
 /dset1                   Dataset {10, 20}
     Data:
         (0,0) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
diff --git a/tools/testfiles/textlink-1.ls b/tools/testfiles/textlink-1.ls
index f92786b..87be5a7 100644
--- a/tools/testfiles/textlink-1.ls
+++ b/tools/testfiles/textlink-1.ls
@@ -1,5 +1,6 @@
 #############################
  output for 'h5ls -w80 -r textlink.h5'
 #############################
+/                        Group
 /extlink1                -> file: filename    path: objname
 /extlink2                -> file: anotherfile    path: anotherobj
diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls
index 62ebe70..0ca929d 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/testfiles/tgroup-1.ls
@@ -1,17 +1,29 @@
 #############################
  output for 'h5ls -w80 -r -g tgroup.h5'
 #############################
-/                        Group
-/g1                      Group
-/g1/g1.1                 Group
-/g1/g1.2                 Group
-/g2                      Group
-/g2/g2.1                 Group
-/g2/g2.1/g2.1.1          Group
-/g2/g2.1/g2.1.2          Group
-/g2/g2.1/g2.1.3          Group
-/g3                      Group
-/g3/g3.1                 Group
-/g3/g3.2                 Group
-/g3/g3.3                 Group
-/g3/g3.4                 Group
+Error: 'recursive' option not compatible with 'group info' option!
+
+usage: h5ls [OPTIONS] [OBJECTS...]
+   OPTIONS
+      -h, -?, --help   Print a usage message and exit
+      -a, --address    Print addresses for raw data
+      -d, --data       Print the values of datasets
+      -e, --errors     Show all HDF5 error reporting
+      -f, --full       Print full path names instead of base names
+      -g, --group      Show information about a group, not its contents
+      -l, --label      Label members of compound datasets
+      -r, --recursive  List all groups recursively, avoiding cycles
+      -s, --string     Print 1-byte integer datasets as ASCII
+      -S, --simple     Use a machine-readable output format
+      -wN, --width=N   Set the number of columns of output
+      -v, --verbose    Generate more verbose output
+      -V, --version    Print version number and exit
+      --vfd=DRIVER     Use the specified virtual file driver
+      -x, --hexdump    Show raw data in hexadecimal format
+
+   OBJECTS
+      Each object consists of an HDF5 file name optionally followed by a
+      slash and an object name within the file (if no object is specified
+      within the file then the contents of the root group are displayed).
+      The file name may include a printf(3C) integer format such as
+      "%05d" to open a file family.
diff --git a/tools/testfiles/tgroup-2.ls b/tools/testfiles/tgroup-2.ls
new file mode 100644
index 0000000..0817d93
--- /dev/null
+++ b/tools/testfiles/tgroup-2.ls
@@ -0,0 +1,4 @@
+#############################
+ output for 'h5ls -w80 -g tgroup.h5/g1'
+#############################
+g1                       Group
diff --git a/tools/testfiles/tindicessub1.ddl b/tools/testfiles/tindicessub1.ddl
index 6195a78..0173fb5 100644
--- a/tools/testfiles/tindicessub1.ddl
+++ b/tools/testfiles/tindicessub1.ddl
@@ -1,19 +1,17 @@
 #############################
-Expected output for 'h5dump -d 1d -s 3 -c 40 taindices.h5'
+Expected output for 'h5dump -d 1d -s 1 -S 10 -c 2 -k 3 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "1d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 100 ) / ( 100 ) }
    SUBSET {
-      START ( 3 );
-      STRIDE ( 1 );
-      COUNT ( 40 );
-      BLOCK ( 1 );
+      START ( 1 );
+      STRIDE ( 10 );
+      COUNT ( 2 );
+      BLOCK ( 3 );
       DATA {
-      (3): 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-      (21): 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
-      (37): 37, 38, 39, 40, 41, 42
+      (1): 1, 2, 3, 11, 12, 13
       }
    }
 }
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/testfiles/tindicessub2.ddl
index 9fc987c..7b70d12 100644
--- a/tools/testfiles/tindicessub2.ddl
+++ b/tools/testfiles/tindicessub2.ddl
@@ -1,22 +1,22 @@
 #############################
-Expected output for 'h5dump -d 2d -s 1,3 -c 6,4 taindices.h5'
+Expected output for 'h5dump -d 2d -s 1,2 -S 3,3 -c 3,2 -k 2,2 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "2d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
    SUBSET {
-      START ( 1, 3 );
-      STRIDE ( 1, 1 );
-      COUNT ( 6, 4 );
-      BLOCK ( 1, 1 );
+      START ( 1, 2 );
+      STRIDE ( 3, 3 );
+      COUNT ( 3, 2 );
+      BLOCK ( 2, 2 );
       DATA {
-      (1,3): 13, 14, 15, 16,
-      (2,3):  23, 24, 25, 26,
-      (3,3):  33, 34, 35, 36,
-      (4,3):  43, 44, 45, 46,
-      (5,3):  53, 54, 55, 56,
-      (6,3):  63, 64, 65, 66
+      (1,2): 12, 13, 15, 16,
+      (2,2):  22, 23, 25, 26,
+      (4,2):  42, 43, 45, 46,
+      (5,2):  52, 53, 55, 56,
+      (7,2):  72, 73, 75, 76,
+      (8,2):  82, 83, 85, 86
       }
    }
 }
diff --git a/tools/testfiles/tindicessub3.ddl b/tools/testfiles/tindicessub3.ddl
index ba86242..fde8e82 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/testfiles/tindicessub3.ddl
@@ -1,28 +1,24 @@
 #############################
-Expected output for 'h5dump -d 3d -s 0,1,3 -c 2,6,4 taindices.h5'
+Expected output for 'h5dump -d 3d -s 0,1,2 -S 1,3,3 -c 2,2,2 -k 1,2,2 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "3d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 2, 10, 10 ) / ( 2, 10, 10 ) }
    SUBSET {
-      START ( 0, 1, 3 );
-      STRIDE ( 1, 1, 1 );
-      COUNT ( 2, 6, 4 );
-      BLOCK ( 1, 1, 1 );
+      START ( 0, 1, 2 );
+      STRIDE ( 1, 3, 3 );
+      COUNT ( 2, 2, 2 );
+      BLOCK ( 1, 2, 2 );
       DATA {
-      (0,1,3): 13, 14, 15, 16,
-      (0,2,3):  23, 24, 25, 26,
-      (0,3,3):  33, 34, 35, 36,
-      (0,4,3):  43, 44, 45, 46,
-      (0,5,3):  53, 54, 55, 56,
-      (0,6,3):  63, 64, 65, 66
-      (1,1,3):  113, 114, 115, 116,
-      (1,2,3):  123, 124, 125, 126,
-      (1,3,3):  133, 134, 135, 136,
-      (1,4,3):  143, 144, 145, 146,
-      (1,5,3):  153, 154, 155, 156,
-      (1,6,3):  163, 164, 165, 166
+      (0,1,2): 12, 13, 15, 16,
+      (0,2,2):  22, 23, 25, 26,
+      (0,4,2):  42, 43, 45, 46,
+      (0,5,2):  52, 53, 55, 56
+      (1,1,2):  112, 113, 115, 116,
+      (1,2,2):  122, 123, 125, 126,
+      (1,4,2):  142, 143, 145, 146,
+      (1,5,2):  152, 153, 155, 156
       }
    }
 }
diff --git a/tools/testfiles/tindicessub4.ddl b/tools/testfiles/tindicessub4.ddl
index 99fca01..a57bee6 100644
--- a/tools/testfiles/tindicessub4.ddl
+++ b/tools/testfiles/tindicessub4.ddl
@@ -1,40 +1,40 @@
 #############################
-Expected output for 'h5dump -d 4d -s 0,0,1,3 -c 2,2,6,4 taindices.h5'
+Expected output for 'h5dump -d 4d -s 0,0,1,2 -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "4d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 2, 2, 10, 10 ) / ( 2, 2, 10, 10 ) }
    SUBSET {
-      START ( 0, 0, 1, 3 );
-      STRIDE ( 1, 1, 1, 1 );
-      COUNT ( 2, 2, 6, 4 );
-      BLOCK ( 1, 1, 1, 1 );
+      START ( 0, 0, 1, 2 );
+      STRIDE ( 1, 1, 3, 3 );
+      COUNT ( 2, 2, 3, 2 );
+      BLOCK ( 1, 1, 2, 2 );
       DATA {
-      (0,0,1,3): 13, 14, 15, 16,
-      (0,0,2,3):  23, 24, 25, 26,
-      (0,0,3,3):  33, 34, 35, 36,
-      (0,0,4,3):  43, 44, 45, 46,
-      (0,0,5,3):  53, 54, 55, 56,
-      (0,0,6,3):  63, 64, 65, 66
-      (0,1,1,3):  113, 114, 115, 116,
-      (0,1,2,3):  123, 124, 125, 126,
-      (0,1,3,3):  133, 134, 135, 136,
-      (0,1,4,3):  143, 144, 145, 146,
-      (0,1,5,3):  153, 154, 155, 156,
-      (0,1,6,3):  163, 164, 165, 166
-      (1,0,1,3):  213, 214, 215, 216,
-      (1,0,2,3):  223, 224, 225, 226,
-      (1,0,3,3):  233, 234, 235, 236,
-      (1,0,4,3):  243, 244, 245, 246,
-      (1,0,5,3):  253, 254, 255, 256,
-      (1,0,6,3):  263, 264, 265, 266
-      (1,1,1,3):  313, 314, 315, 316,
-      (1,1,2,3):  323, 324, 325, 326,
-      (1,1,3,3):  333, 334, 335, 336,
-      (1,1,4,3):  343, 344, 345, 346,
-      (1,1,5,3):  353, 354, 355, 356,
-      (1,1,6,3):  363, 364, 365, 366
+      (0,0,1,2): 12, 13, 15, 16,
+      (0,0,2,2):  22, 23, 25, 26,
+      (0,0,4,2):  42, 43, 45, 46,
+      (0,0,5,2):  52, 53, 55, 56,
+      (0,0,7,2):  72, 73, 75, 76,
+      (0,0,8,2):  82, 83, 85, 86
+      (0,1,1,2):  112, 113, 115, 116,
+      (0,1,2,2):  122, 123, 125, 126,
+      (0,1,4,2):  142, 143, 145, 146,
+      (0,1,5,2):  152, 153, 155, 156,
+      (0,1,7,2):  172, 173, 175, 176,
+      (0,1,8,2):  182, 183, 185, 186
+      (1,0,1,2):  212, 213, 215, 216,
+      (1,0,2,2):  222, 223, 225, 226,
+      (1,0,4,2):  242, 243, 245, 246,
+      (1,0,5,2):  252, 253, 255, 256,
+      (1,0,7,2):  272, 273, 275, 276,
+      (1,0,8,2):  282, 283, 285, 286
+      (1,1,1,2):  312, 313, 315, 316,
+      (1,1,2,2):  322, 323, 325, 326,
+      (1,1,4,2):  342, 343, 345, 346,
+      (1,1,5,2):  352, 353, 355, 356,
+      (1,1,7,2):  372, 373, 375, 376,
+      (1,1,8,2):  382, 383, 385, 386
       }
    }
 }
diff --git a/tools/testfiles/tloop-1.ls b/tools/testfiles/tloop-1.ls
index b9631b7..22cb6c7 100644
--- a/tools/testfiles/tloop-1.ls
+++ b/tools/testfiles/tloop-1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tloop.h5'
 #############################
+/                        Group
 /g1                      Group
 /g1/g1.1                 Group
 /g1/g1.1/g2.1            Group, same as /g1
diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/testfiles/tnestcomp-1.ls
index eef41ef..9dc193d 100644
--- a/tools/testfiles/tnestcomp-1.ls
+++ b/tools/testfiles/tnestcomp-1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tnestedcomp.h5'
 #############################
+/                        Group
 /ArrayOfStructures       Dataset {10}
     Data:
         (0) {0, 0, 1, {"A", [-100,100]}}, {1, 1, 0.5, {"B", [-100,100]}},
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index bae9f79..b7b802b 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -5,7 +5,7 @@ usage: h5dump [OPTIONS] file
   OPTIONS
      -h, --help           Print a usage message and exit
      -n, --contents       Print a list of the file contents and exit
-     -B, --bootblock      Print the content of the boot block
+     -B, --superblock     Print the content of the super block
      -H, --header         Print the header only; no data is displayed
      -A, --onlyattr       Print the header and value of attributes
      -i, --object-ids     Print the object ids
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] file
      -a P, --attribute=P  Print the specified attribute
      -d P, --dataset=P    Print the specified dataset
      -y, --noindex        Do not print array indices with the data
-     -p,   --properties   Print dataset filters, storage layout and fill value
+     -p, --properties     Print dataset filters, storage layout and fill value
      -f D, --filedriver=D Specify which driver to open the file with
      -g P, --group=P      Print the specified group and all members
      -l P, --soft-link=P  Print the value(s) of the specified soft link
diff --git a/tools/testfiles/tsaf.ls b/tools/testfiles/tsaf.ls
index 8efc0f2..96d4811 100644
--- a/tools/testfiles/tsaf.ls
+++ b/tools/testfiles/tsaf.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tsaf.h5'
 #############################
+/                        Group
 /.DSL_METADATA           Dataset {5919/Inf}
     Data:
         (0) 47, 32, 67, 79, 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, 116,
diff --git a/tools/testfiles/tslink-1.ls b/tools/testfiles/tslink-1.ls
index 05b9bca..4c16958 100644
--- a/tools/testfiles/tslink-1.ls
+++ b/tools/testfiles/tslink-1.ls
@@ -1,5 +1,6 @@
 #############################
  output for 'h5ls -w80 -r tslink.h5'
 #############################
+/                        Group
 /slink1                  -> somevalue
 /slink2                  -> linkvalue
diff --git a/tools/testfiles/tstr-1.ls b/tools/testfiles/tstr-1.ls
index 1961fd4..8a223cc 100644
--- a/tools/testfiles/tstr-1.ls
+++ b/tools/testfiles/tstr-1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tstr.h5'
 #############################
+/                        Group
 /comp1                   Dataset {3, 6}
     Data:
         (0,0) {[0,1,4,9,16,25,36,49,64,81,1,4,9,16,25,36,49,64,81,100,4,9,16,
diff --git a/tools/testfiles/tudlink-1.ls b/tools/testfiles/tudlink-1.ls
index e83fce7..b8578ce 100644
--- a/tools/testfiles/tudlink-1.ls
+++ b/tools/testfiles/tudlink-1.ls
@@ -1,5 +1,6 @@
 #############################
  output for 'h5ls -w80 -r tudlink.h5'
 #############################
+/                        Group
 /udlink1                 -> cannot follow UD links
 /udlink2                 -> cannot follow UD links
diff --git a/tools/testfiles/tvldtypes1.ls b/tools/testfiles/tvldtypes1.ls
index cf1688e..4c4c162 100644
--- a/tools/testfiles/tvldtypes1.ls
+++ b/tools/testfiles/tvldtypes1.ls
@@ -1,6 +1,7 @@
 #############################
  output for 'h5ls -w80 -r -d tvldtypes1.h5'
 #############################
+/                        Group
 /Dataset1.0              Dataset {4}
     Data:
         (0) (0), (10,11), (20,21,22), (30,31,32,33)
diff --git a/vms/build.com b/vms/build.com
new file mode 100644
index 0000000..f65a45b
--- /dev/null
+++ b/vms/build.com
@@ -0,0 +1,51 @@
+$!#
+$!# 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.
+$!#
+$!
+$!
+$! This file builds C, Frtran, C++ HDF5 librraies and runs the tests
+$! Specify location of the top HDF5 source directory
+$
+$ hdf5top == "sys$sysusers:[pourmale.hdf5]"
+$ len = F$LENGTH(hdf5top)
+$ tmp = F$EXTRACT(0, len-1, hdf5top)
+$ hdf5vms     = tmp + ".VMS]"
+$ hdf5ctest   = tmp + ".TEST]"
+$ hdf5f90test = tmp + ".FORTRAN.TEST]"
+$ hdf5cxxtest = tmp  + ".C__.TEST]"
+$ hdf5toolstest = tmp  + ".TOOLS.TESTFILES]"
+$ h5importtest  = tmp  + ".TOOLS.H5IMPORT.TESTFILES]"
+$ set def 'hdf5vms'
+$@make
+$ set def 'hdf5ctest'
+$@check
+$ set def 'hdf5f90test'
+$@check
+$ set def 'hdf5cxxtest'
+$@check
+$ set def 'hdf5toolstest'
+$ copy [-.h5dump]check_h5dump.com     check_h5dump.com 
+$ copy [-.h5ls]check_h5ls.com         check_h5ls.com
+$ copy [-.h5diff]check_h5diff.com     check_h5diff.com
+$ copy [-.h5repack]check_h5repack.com check_h5repack.com
+$@check_h5dump.com
+$@check_h5ls.com
+$@check_h5diff.com
+$@check_h5repack.com
+$!
+$ set def 'h5importtest'
+$ copy [.-]check_h5import.com check_h5import.com
+$@check_h5import.com
+$
+$ exit
diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com
index 4dd8145..37ee782 100644
--- a/vms/c++/examples/make.com
+++ b/vms/c++/examples/make.com
@@ -15,9 +15,10 @@ $!#
 $!
 $! Make HDF5 C++ examples
 $!
-$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS"
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
 $
-$ ccc := cxx 'cxxopt /include=([-.-.src], [-.src])
+$ ccc := cxx 'cxxopt /include=([-.-.include])
 $!
 $!
 $ cxxobj= "create.cxx, readdata.cxx, writedata.cxx, compound.cxx,"+-
@@ -29,48 +30,48 @@ $ type sys$input
 
        Creating create 
 $ cxxlink  create, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
        Creating readdata  
 $ cxxlink  readdata, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating writedata  
 $ cxxlink  writedata, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ !                              
 $ type sys$input
 
        Creating compound 
 $ cxxlink  compound, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating extend_ds  
 $ cxxlink  extend_ds, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating chunks 
 $ cxxlink  chunks, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ type sys$input
 
        Creating h5group 
 $ cxxlink  h5group, -
-           [-.src]hdf5_cplus.olb/lib, -
-           [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+           [-.-.lib]hdf5_cplus.olb/lib, -
+           [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $!
 $ exit
diff --git a/vms/examples/make.com b/vms/examples/make.com
index 590ce67..0df772a 100644
--- a/vms/examples/make.com
+++ b/vms/examples/make.com
@@ -17,8 +17,9 @@ $!
 $! Make HDF5 C examples
 $!
 $! ccopt = "/float=ieee_float/nowarnings/define=H5_VMS"
-$!
-$ ccc := cc 'ccopt /include=([-.src])
+$
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ ccc := cc 'ccopt /include=([-.-.include])
 $ type sys$input
  	Compiling  C examples
 $!
@@ -31,49 +32,49 @@ $
 $ type sys$input
        Creating h5_write 
 $ link     h5_write, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_read 
 $ link     h5_read, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_extend_write
 $ link     h5_extend_write, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_chunk_read 
 $ link     h5_chunk_read, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_compound 
 $ link     h5_compound, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_group 
 $ link     h5_group, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_select 
 $ link     h5_select, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_attribute 
 $ link     h5_attribute, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_mount 
 $ link     h5_mount, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_reference 
 $ link     h5_reference, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_ref2reg
 $ link     h5_ref2reg, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
        Creating h5_drivers
 $ link     h5_drivers, -
-            [-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+            [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com
index 7134038..9f18198 100644
--- a/vms/fortran/examples/make.com
+++ b/vms/fortran/examples/make.com
@@ -16,8 +16,9 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 Fortran examples
 $!
-$! fcopt = "/float=ieee_float/define=H5_VMS"
-$ fff := fortran 'fcopt /module=[-.src]
+$ fcopt = "/float=ieee_float/define=H5_VMS"
+$ define zlib_dir sys$sysusers:[pourmale.zlib-1_2_3]
+$ fff := fortran 'fcopt /module=[-.-.include]
 $
 $ type sys$input
 	Compiling HDF5 Fortran examples
@@ -33,84 +34,84 @@ $ type sys$input
 
         Creating dsetexample 
 $ link       dsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating fileexample
 $ link       fileexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating rwdsetexample
 $ link       rwdsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating attrexample
 $ link       attrexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating groupexample
 $ link       groupexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpsexample
 $ link       grpsexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpdsetexample
 $ link       grpdsetexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating hyperslab
 $ link       hyperslab ,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating selectele
 $ link       selectele,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating grpit
 $ link       grpit,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refobjexample
 $ link       refobjexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating refregexample
 $ link       refregexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating mountexample
 $ link       mountexample,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
 
         Creating compound
 $ link       compound,-
-             [-.src]hdf5_fortran.olb/lib,-
-             [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
+             [-.-.lib]hdf5_fortran.olb/lib,-
+             [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ exit
diff --git a/vms/install.com b/vms/install.com
new file mode 100644
index 0000000..21ebbbd
--- /dev/null
+++ b/vms/install.com
@@ -0,0 +1,157 @@
+$!#
+$!# 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.
+$!#
+$!
+$!
+$! This command file installs built binaries, header files, examples and
+$! scripts under [.hdf5] directory in the main distribution
+$!
+$ 
+$!
+$!
+$ hdf5top      = F$DIRECTORY()
+$ len          = F$LENGTH(hdf5top)
+$ hdf5top_dir  = F$EXTRACT(0, len-4, hdf5top)
+$!
+$ hdf5src               = hdf5top_dir + "SRC]"
+$ hdf5examples          = hdf5top_dir + "EXAMPLES]"
+$ hdf5tools_h5copy      = hdf5top_dir + "TOOLS.H5COPY]"
+$ hdf5tools_h5diff      = hdf5top_dir + "TOOLS.H5DIFF]"
+$ hdf5tools_h5dump      = hdf5top_dir + "TOOLS.H5DUMP]"
+$ hdf5tools_h5ls        = hdf5top_dir + "TOOLS.H5LS]"
+$ hdf5tools_h5repack    = hdf5top_dir + "TOOLS.H5REPACK]"
+$ hdf5tools_h5jam       = hdf5top_dir + "TOOLS.H5JAM]"
+$ hdf5tools_h5import    = hdf5top_dir + "TOOLS.H5IMPORT]"
+$ hdf5fortran_examples  = hdf5top_dir + "FORTRAN.EXAMPLES]"
+$ hdf5fortran_src       = hdf5top_dir + "FORTRAN.SRC]"
+$ hdf5cxx_src           = hdf5top_dir + "C__.SRC]"
+$ hdf5cxx_examples      = hdf5top_dir + "C__.EXAMPLES]"
+$!
+$ hdf5install            = hdf5top_dir + "HDF5]"
+$ hdf5install_include    = hdf5top_dir + "HDF5.INCLUDE]"
+$ hdf5install_examples   = hdf5top_dir + "HDF5.EXAMPLES]"
+$ hdf5install_examples_c         = hdf5top_dir + "HDF5.EXAMPLES.C]"
+$ hdf5install_examples_f90       = hdf5top_dir + "HDF5.EXAMPLES.F90]"
+$ hdf5install_examples_cxx       = hdf5top_dir + "HDF5.EXAMPLES.CXX]"
+$ hdf5install_lib        = hdf5top_dir + "HDF5.LIB]"
+$ hdf5install_bin        = hdf5top_dir + "HDF5.BIN]"
+$
+$ if F$SEARCH(hdf5install) .NES. ""
+$    then write sys$output "''hdf5install' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install'..."
+$    create/dir 'hdf5install'
+$ endif
+$
+$ if F$SEARCH(hdf5install_include) .NES. ""
+$    then write sys$output "''hdf5install_include' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_include'..."
+$    create/dir 'hdf5install_include' 
+$ endif
+$ if F$SEARCH(hdf5install_lib) .NES. ""
+$    then write sys$output "''hdf5install_lib' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_lib'..."
+$    create/dir 'hdf5install_lib' 
+$ endif
+$ if F$SEARCH(hdf5install_bin) .NES. ""
+$    then write sys$output "''hdf5install_bin' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_bin'..."
+$    create/dir 'hdf5install_bin' 
+$ endif
+$ if F$SEARCH(hdf5install_examples) .NES. ""
+$    then write sys$output "''hdf5install_examples' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples'..."
+$    create/dir 'hdf5install_examples' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_c) .NES. ""
+$    then write sys$output "''hdf5install_examples_c' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_c'..."
+$    create/dir 'hdf5install_examples_c' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_f90) .NES. ""
+$    then write sys$output "''hdf5install_examples_f90' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_f90'..."
+$    create/dir 'hdf5install_examples_f90' 
+$ endif
+$ if F$SEARCH(hdf5install_examples_cxx) .NES. ""
+$    then write sys$output "''hdf5install_examples_cxx' directory exists, will not create"
+$ else
+$    write sys$output "Creating ''hdf5install_examples_cxx'..."
+$    create/dir 'hdf5install_examples_cxx' 
+$ endif
+
+$!
+$ write sys$output "Installing C library and header files"
+$ set def 'hdf5src'
+$ copy HDF5.olb 'hdf5install_lib'
+$ copy *.h      'hdf5install_include'
+$ del 'hdf5install_include'*private*.*;*
+$!
+$ write sys$output "Installing Fortran library module files"
+$ set def 'hdf5fortran_src'
+$ copy HDF5_FORTRAN.olb 'hdf5install_lib'
+$ copy *.F90$MOD      'hdf5install_include'
+$!
+$ write sys$output "Installing C++ library and header files"
+$ set def 'hdf5cxx_src'
+$ copy HDF5_CPLUS.olb 'hdf5install_lib'
+$ copy *.h      'hdf5install_include'
+$!
+$ write sys$output "Installing utilties"
+$ set def 'hdf5tools_h5copy'
+$ copy h5copy.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5diff'
+$ copy h5diff.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5dump'
+$ copy h5dump.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5repack'
+$ copy h5repack.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5ls'
+$ copy h5ls.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5jam'
+$ copy h5jam.exe   'hdf5install_bin'
+$ copy h5unjam.exe 'hdf5install_bin'
+$!
+$ set def 'hdf5tools_h5import'
+$ copy h5import.exe 'hdf5install_bin'
+$!
+$ write sys$output "Installing examples"
+$ set def 'hdf5examples'
+$ copy *.c 'hdf5install_examples_c'
+$!
+$ set def 'hdf5fortran_examples'
+$ copy *.f90 'hdf5install_examples_f90'
+$!
+$ set def 'hdf5cxx_examples'
+$ copy *.cpp 'hdf5install_examples_cxx'
+$ rename 'hdf5install_examples_cxx'*.cpp 'hdf5install_examples_cxx'*.cxx
+$
+$ 
+$!
+$ set def 'hdf5top'
+$ copy [.examples]*.com 'hdf5install_examples_c'
+$ copy [.fortran.examples]*.com 'hdf5install_examples_f90'
+$ copy [.c__.examples]*.com 'hdf5install_examples_cxx'
+$ exit
diff --git a/vms/make.com b/vms/make.com
index 5a9b698..224e095 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -17,16 +17,13 @@ $!
 $! This file copies all make files from the VMS directory to the 
 $! source directories and builds libraries, tests, and utilties
 $!
-$ copy [.c__.examples]*.com     [-.c__.examples]
 $ copy [.c__.src]make.com       [-.c__.src]
 $ copy [.c__.test]*.com         [-.c__.test]
-$ copy [.fortran.examples]*.com [-.fortran.examples]
 $ copy [.fortran.src]make.com   [-.fortran.src]
 $ copy [.fortran.test]*.com     [-.fortran.test]
 $ copy [.src]make.com           [-.src]
 $ copy [.src]h5pubconf.h        [-.src]
 $ copy [.test]*.com             [-.test]
-$ copy [.examples]*.com         [-.examples]
 $ copy [.tools.h5copy]*.com     [-.tools.h5copy]
 $ copy [.tools.h5dump]*.com     [-.tools.h5dump]
 $ copy [.tools.h5ls]*.com       [-.tools.h5ls]
@@ -35,6 +32,7 @@ $ copy [.tools.h5repack]*.com   [-.tools.h5repack]
 $ copy [.tools.h5import]*.com   [-.tools.h5import]
 $ copy [.tools.h5jam]*.com      [-.tools.h5jam]
 $ copy [.tools.lib]make.com     [-.tools.lib]
+$ copy [.tools.testfiles]*.ddl  [-.tools.testfiles]
 $!
 $! Define location of ZLIB library. If you do not have it on your system, download
 $! source code from http://www.zlib.net/, build and install on your system
@@ -123,25 +121,12 @@ $ @make.com
 $!
 $ write sys$output "Building C++ library"
 $ set def 'hdf5cxx_src'
-$ rename *.cpp *.cxx
+$ copy *.cpp *.cxx
 $ @make.com
 $!
 $ write sys$output "Building C++ library tests"
 $ set def 'hdf5cxx_test'
-$ rename *.cpp *.cxx
-$ @make.com
-$!
-$ write sys$output "Building C examples"
-$ set def 'hdf5examples'
-$ @make.com
-$!
-$ write sys$output "Building Fortran examples"
-$ set def 'hdf5fortran_examples'
-$ @make.com
-$!
-$ write sys$output "Building C++ examples"
-$ set def 'hdf5cxx_examples'
-$ rename *.cpp *.cxx
+$ copy *.cpp *.cxx
 $ @make.com
 $!
 $ set def 'hdf5top'
diff --git a/vms/src/make.com b/vms/src/make.com
index d88180b..abcaf1e 100644
--- a/vms/src/make.com
+++ b/vms/src/make.com
@@ -35,7 +35,7 @@ $ cobj= "H5, H5checksum, H5dbg, H5system, H5timer, H5trace,"+-
         "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, H5FDstdio,"+-
+        "H5FDmpiposix, H5FDmulti, H5FDsec2, H5FDspace, H5FDstdio,"+-
         "H5FDdirect, H5FL, H5FO, H5Ffake,"+-
         "H5FS, H5FScache, H5FSdbg, H5FSsection,"+-
         "H5G, H5Gcompact, H5Gdeprec, H5Gent, H5Gint, H5Glink, H5Gloc, H5Gname, H5Gnode, H5Gstab,"+-
diff --git a/vms/test/make.com b/vms/test/make.com
index 1a4d6f4..4a55f1e 100644
--- a/vms/test/make.com
+++ b/vms/test/make.com
@@ -24,7 +24,7 @@ $ type sys$input
 $
 $ cobj= "h5test.c, testframe.c, testhdf5.c, tarray.c, tattr.c, tconfig.c, "+-
         "tchecksum.c,"+- 
-        "tfile.c, tgenprop.c, th5o.c, th5s.c, theap.c, tid.c, titerate.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"
@@ -34,7 +34,7 @@ $ library/create/replace []libh5test h5test, testframe, cache_common
 $ type sys$input
        Creating libh5test
 $ link     testhdf5,tarray,tattr,tchecksum,tconfig, -
-           tfile,tgenprop,th5o,th5s,theap,tid,titerate, -
+           tfile,tgenprop,th5o,th5s,tcoords,theap,tid,titerate, -
            tmeta,tmisc,ttime,trefer,trefstr, -
            tselect,tsohm,tskiplist,ttst,tunicode,tvltypes, -
            tvlstr, -
diff --git a/vms/tools/h5diff/check.com b/vms/tools/h5diff/check.com
deleted file mode 100644
index 3c8cb8f..0000000
--- a/vms/tools/h5diff/check.com
+++ /dev/null
@@ -1,231 +0,0 @@
-$!#
-$!# 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.
-$!#
-$!
-$! h5diff testing script
-$!
-$ define sys$output h5diff.out
-$ define sys$error  h5diff.err
-$ h5diff :== $sys$sysusers:[pourmale.hdf5.tools.h5diff]h5diff.exe
-
-
-
-$! 1.0
-$ h5diff -h
-
-$! 1.1 normal mode
-$ h5diff file1.h5 file2.h5 
-
-$! 1.2 normal mode with objects
-$ h5diff file1.h5 file2.h5  g1/dset1 g1/dset2
-
-$! 1.3 report mode
-$ h5diff file1.h5 file2.h5 -r
-
-$! 1.4 report  mode with objects
-$ h5diff file1.h5 file2.h5  -r g1/dset1 g1/dset2
-
-$! 1.5 with -d
-$ h5diff file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4
-
-$! 1.6 with -p
-$ h5diff file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4
-
-$! 1.7 verbose mode
-$ h5diff file1.h5 file2.h5 -v  
-
-$! 1.8 quiet mode 
-$ h5diff file1.h5 file2.h5 -q
-
-$! ##############################################################################
-$! # not comparable types
-$! ##############################################################################
-
-$! 2.0
-$ h5diff file3.h5 file3.h5 -v dset group
-
-$! 2.1
-$ h5diff file3.h5 file3.h5 -v dset link
-
-$! 2.2
-$ h5diff file3.h5 file3.h5 -v dset type
-
-$! 2.3
-$ h5diff file3.h5 file3.h5 -v group group
-
-$! 2.4
-$ h5diff file3.h5 file3.h5 -v type type
-
-$! 2.5
-$ h5diff file3.h5 file3.h5 -v link link
-
-
-$! ##############################################################################
-$! # Dataset types
-$! ##############################################################################
-
-$! 5.0
-$ h5diff file4.h5 file4.h5 -v dset0a dset0b
-
-$! 5.1
-$ h5diff file4.h5 file4.h5 -v dset1a dset1b
-
-$! 5.2
-$ h5diff file4.h5 file4.h5 -v dset2a dset2b
-
-$! 5.3
-$ h5diff file4.h5 file4.h5 -v dset3a dset4b
-
-$! 5.4
-$ h5diff file4.h5 file4.h5 -v dset4a dset4b
-
-$! 5.5
-$ h5diff file4.h5 file4.h5 -v dset5a dset5b
-
-$! 5.6
-$ h5diff file4.h5 file4.h5 -v dset6a dset6b
-
-$! 5.7
-$ h5diff file4.h5 file4.h5 -v dset7a dset7b
-
-$! 5.8 long_long test; different format of long_long print  in Linux and IRIX
-$!$! h5diff h5diff_58.txt file4.h5 file4.h5 dset8a dset8b
-
-$! ##############################################################################
-$! # Error messages
-$! ##############################################################################
-
-
-$! 6.0: Check if the command line number of arguments is less than 3
-$ h5diff file1.h5 
-
-$! 6.1: Check for invalid options
-$ h5diff file1.h5 file2.h5 -x 
-
-$! ##############################################################################
-$! # -d 
-$! ##############################################################################
-
-$! 6.2: no value
-$ h5diff file1.h5 file2.h5  -d g1/dset3 g1/dset4
-
-$! 6.3: negative value
-$ h5diff file1.h5 file2.h5  -d -4 g1/dset3 g1/dset4
-
-$! 6.4: zero
-$ h5diff file1.h5 file2.h5  -d 0 g1/dset3 g1/dset4
-
-$! 6.5: non number
-$ h5diff file1.h5 file2.h5  -d u g1/dset3 g1/dset4
-
-$! 6.6: hexadecimal
-$ h5diff file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4
-
-$! 6.7: string
-$ h5diff file1.h5 file2.h5  -d "1" g1/dset3 g1/dset4
-
-$! 6.8: repeated option
-$ h5diff file1.h5 file2.h5  -d 1 -d 2 g1/dset3 g1/dset4
-
-$! 6.9: number larger than biggest difference
-$ h5diff file1.h5 file2.h5  -d 200 g1/dset3 g1/dset4
-
-$! 6.10: number smaller than smallest difference
-$ h5diff file1.h5 file2.h5  -d 1 g1/dset3 g1/dset4
-
-
-$! ##############################################################################
-$! # -p
-$! ##############################################################################
-
-
-$! 6.11: no value
-$ h5diff file1.h5 file2.h5 -r -p g1/dset3 g1/dset4
-
-$! 6.12: negative value
-$ h5diff file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4
-
-$! 6.13: zero
-$ h5diff file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4
-
-$! 6.14: non number
-$ h5diff file1.h5 file2.h5 -p u g1/dset3 g1/dset4
-
-$! 6.15: hexadecimal
-$ h5diff file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4
-
-$! 6.16: string
-$ h5diff file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4
-
-$! 6.17: repeated option
-$ h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4
-
-$! 6.18: number larger than biggest difference
-$ h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4
-
-$! 6.19: number smaller than smallest difference
-$ h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4
-
-
-
-$! ##############################################################################
-$! # -n
-$! ##############################################################################
-
-
-$! 6.20: no value
-$ h5diff file1.h5 file2.h5 -n g1/dset3 g1/dset4
-
-$! 6.21: negative value
-$ h5diff file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4
-
-$! 6.22: zero
-$ h5diff file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4
-
-$! 6.23: non number
-$ h5diff file1.h5 file2.h5 -n u g1/dset3 g1/dset4
-
-$! 6.24: hexadecimal
-$ h5diff file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4
-
-$! 6.25: string
-$ h5diff file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4
-
-$! 6.26: repeated option
-$ h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4
-
-$! 6.27: number larger than biggest difference
-$ h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4
-
-$! 6.28: number smaller than smallest difference
-$ h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4
-
-$! ##############################################################################
-$! # non valid files
-$! ##############################################################################
-
-$ h5diff file1.h6 file2.h6
-
-$! ##############################################################################
-$! # attributes
-$! ##############################################################################
-
-$ h5diff file5.h5 file6.h5 -v
-
-$! ##############################################################################
-$! # all dataset datatypes
-$! ##############################################################################
-
-$ h5diff file7.h5 file8.h5 -v
-
diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com
index f5ea68f..9d16b12 100644
--- a/vms/tools/h5diff/check_h5diff.com
+++ b/vms/tools/h5diff/check_h5diff.com
@@ -18,6 +18,12 @@ $ ! This command file tests h5diff utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5diff utiltity
+===================================
+
 $ ! Define h5diff symbol
 $ !
 $! set message/notext/nofacility/noidentification/noseverity
@@ -27,47 +33,43 @@ $ temp = F$EXTRACT(0, len-10, current_dir)
 $ h5diff_dir = temp + "H5DIFF]"
 $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe
 $ !
-$ ! Define output for diff command that compares expected and actual
-$ ! outputs of h5diff
-$ !
-$ create h5diff.log
+
 $ !
 $ ! h5diff tests
 $ !
 $
-
 $!# 1.0
 $ CALL TOOLTEST h5diff_10.txt "-h"
 $!
 $!# 1.1 normal mode
-$ CALL TOOLTEST h5diff_11.txt  "file1.h5 file2.h5" 
+$ CALL TOOLTEST h5diff_11.txt  "h5diff_basic1.h5 h5diff_basic2.h5" 
 $!
 $!# 1.2 normal mode with objects
-$ CALL TOOLTEST h5diff_12.txt  "file1.h5 file2.h5  g1/dset1 g1/dset2"
+$ CALL TOOLTEST h5diff_12.txt  "h5diff_basic1.h5 h5diff_basic2.h5  g1/dset1 g1/dset2"
 $!
 $!# 1.3 report mode
-$ CALL TOOLTEST h5diff_13.txt "file1.h5 file2.h5 -r"
+$ CALL TOOLTEST h5diff_13.txt "-r h5diff_basic1.h5 h5diff_basic2.h5"
 $!
 $!# 1.4 report  mode with objects
-$ CALL TOOLTEST h5diff_14.txt  "file1.h5 file2.h5  -r g1/dset1 g1/dset2"
+$ CALL TOOLTEST h5diff_14.txt  "-r h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2"
 $!
 $!# 1.5 with -d
-$ CALL TOOLTEST h5diff_15.txt "file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_15.txt " --report --delta=5 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
-$!# 1.6 with -p
-$ CALL TOOLTEST h5diff_16.txt "file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4"
+$!# 1.6.1 with -p (int)
+$ CALL TOOLTEST h5diff_16_1.txt "-v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset5 g1/dset6"
 $!
-$!# 1.7 verbose mode
-$ CALL TOOLTEST h5diff_17.txt "file1.h5 file2.h5 -v"  
+$!# 1.6.2 with -p (unsigned long long)
+$ CALL TOOLTEST h5diff_16_2.txt "--verbose --relative=0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset7 g1/dset8"
 $!
-$!# 1.8 quiet mode 
-$ CALL TOOLTEST h5diff_18.txt "file1.h5 file2.h5 -q"
+$!# 1.6.3 with -p (int)
+$ CALL TOOLTEST h5diff_16_3.txt "-v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10"
 $!
-$!# 1.9.1 with -p (int)
-$ CALL TOOLTEST h5diff_191.txt "file1.h5 file1.h5 -v -p 0.02 g1/dset5 g1/dset6"
+$!# 1.7 verbose mode
+$ CALL TOOLTEST h5diff_17.txt "-v h5diff_basic1.h5 h5diff_basic2.h5"  
 $!
-$!# 1.9.2 with -p (unsigned long_long)
-$ CALL TOOLTEST h5diff_192.txt "file1.h5 file1.h5 -v -p 0.02 g1/dset7 g1/dset8"
+$!# 1.8 quiet mode 
+$ CALL TOOLTEST h5diff_18.txt "-q h5diff_basic1.h5 h5diff_basic2.h5"
 $!
 $!
 $!# ##############################################################################
@@ -75,35 +77,35 @@ $!# # not comparable types
 $!# ##############################################################################
 $!
 $!# 2.0
-$ CALL TOOLTEST h5diff_20.txt "file3.h5 file3.h5 -v dset g1"
+$ CALL TOOLTEST h5diff_20.txt "-v h5diff_types.h5 h5diff_types.h5 dset g1"
 $
 $!# 2.1
-$ CALL TOOLTEST h5diff_21.txt "file3.h5 file3.h5 -v dset l1"
+$ CALL TOOLTEST h5diff_21.txt "-v h5diff_types.h5 h5diff_types.h5 dset l1"
 $!
 $!# 2.2
-$ CALL TOOLTEST h5diff_22.txt "file3.h5 file3.h5 -v dset t1"
+$ CALL TOOLTEST h5diff_22.txt "-v h5diff_types.h5 h5diff_types.h5 dset t1"
 $!
 $!# ##############################################################################
 $!# # compare groups, types, links (no differences and differences)
 $!# ##############################################################################
 $!
 $!# 2.3
-$ CALL TOOLTEST h5diff_23.txt "file3.h5 file3.h5 -v g1 g1"
+$ CALL TOOLTEST h5diff_23.txt "-v h5diff_types.h5 h5diff_types.h5 g1 g1"
 $!
 $!# 2.4
-$ CALL TOOLTEST h5diff_24.txt "file3.h5 file3.h5 -v t1 t1"
+$ CALL TOOLTEST h5diff_24.txt "-v h5diff_types.h5 h5diff_types.h5 t1 t1"
 $!
 $!# 2.5
-$ CALL TOOLTEST h5diff_25.txt "file3.h5 file3.h5 -v l1 l1" 
+$ CALL TOOLTEST h5diff_25.txt "-v h5diff_types.h5 h5diff_types.h5 l1 l1" 
 $!
 $!# 2.6
-$ CALL TOOLTEST h5diff_26.txt "file3.h5 file3.h5 -v g1 g2"
+$ CALL TOOLTEST h5diff_26.txt "-v h5diff_types.h5 h5diff_types.h5 g1 g2"
 $!
 $!# 2.7
-$ CALL TOOLTEST h5diff_27.txt "file3.h5 file3.h5 -v t1 t2"
+$ CALL TOOLTEST h5diff_27.txt "-v h5diff_types.h5 h5diff_types.h5 t1 t2"
 $!
 $!# 2.8
-$ CALL TOOLTEST h5diff_28.txt "file3.h5 file3.h5 -v l1 l2"
+$ CALL TOOLTEST h5diff_28.txt "-v h5diff_types.h5 h5diff_types.h5 l1 l2"
 $!
 $!
 $!
@@ -112,31 +114,31 @@ $!# # Dataset types
 $!# ##############################################################################
 $
 $!# 5.0
-$ CALL TOOLTEST h5diff_50.txt "file4.h5 file4.h5 -v dset0a dset0b"
+$ CALL TOOLTEST h5diff_50.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset0a dset0b"
 $!
 $!# 5.1
-$ CALL TOOLTEST h5diff_51.txt "file4.h5 file4.h5 -v dset1a dset1b"
+$ CALL TOOLTEST h5diff_51.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset1a dset1b"
 $!
 $!# 5.2
-$ CALL TOOLTEST h5diff_52.txt "file4.h5 file4.h5 -v dset2a dset2b"
+$ CALL TOOLTEST h5diff_52.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset2a dset2b"
 $!
 $!# 5.3
-$ CALL TOOLTEST h5diff_53.txt "file4.h5 file4.h5 -v dset3a dset4b"
+$ CALL TOOLTEST h5diff_53.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset3a dset4b"
 $!
 $!# 5.4
-$ CALL TOOLTEST h5diff_54.txt "file4.h5 file4.h5 -v dset4a dset4b"
+$ CALL TOOLTEST h5diff_54.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset4a dset4b"
 $!
 $!# 5.5
-$ CALL TOOLTEST h5diff_55.txt "file4.h5 file4.h5 -v dset5a dset5b"
+$ CALL TOOLTEST h5diff_55.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset5a dset5b"
 $!
 $!# 5.6
-$ CALL TOOLTEST h5diff_56.txt "file4.h5 file4.h5 -v dset6a dset6b"
+$ CALL TOOLTEST h5diff_56.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b"
 $!
 $!# 5.7
-$ CALL TOOLTEST h5diff_57.txt "file4.h5 file4.h5 -v dset7a dset7b"
+$ CALL TOOLTEST h5diff_57.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b"
 $!
-$#! 5.8 (region reference)
-$ CALL TOOLTEST h5diff_58.txt "file7.h5 file8.h5 -v refreg"
+$!# 5.8 (region reference)
+$ CALL TOOLTEST h5diff_58.txt "-v h5diff_dset1.h5 h5diff_dset2.h5 refreg"
 $!
 $!# ##############################################################################
 $!# # Error messages
@@ -144,41 +146,38 @@ $!# ############################################################################
 $!
 $!
 $!# 6.0: Check if the command line number of arguments is less than 3
-$ CALL TOOLTEST h5diff_600.txt "file1.h5" 
-$!
-$!# 6.1: Check for invalid options
-$ CALL TOOLTEST h5diff_601.txt "file1.h5 file2.h5 -x" 
+$ CALL TOOLTEST h5diff_600.txt "h5diff_basic1.h5" 
 $!
 $!# ##############################################################################
 $!# # -d 
 $!# ##############################################################################
 $!
 $!# 6.2: no value
-$ CALL TOOLTEST h5diff_602.txt "file1.h5 file2.h5  -d g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_602.txt "-d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.3: negative value
-$ CALL TOOLTEST h5diff_603.txt "file1.h5 file2.h5  -d -4 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_603.txt "-d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.4: zero
-$ CALL TOOLTEST h5diff_604.txt "file1.h5 file2.h5  -d 0 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_604.txt "-d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.5: non number
-$ CALL TOOLTEST h5diff_605.txt "file1.h5 file2.h5  -d u g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_605.txt "-d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.6: hexadecimal
-$ CALL TOOLTEST h5diff_606.txt "file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_606.txt "-d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.7: string
-$ CALL TOOLTEST h5diff_607.txt "file1.h5 file2.h5  -d "1" g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_607.txt "-d """1""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.8: repeated option
-$ CALL TOOLTEST h5diff_608.txt "file1.h5 file2.h5  -d 1 -d 2 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_608.txt "-d 1 -d 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.9: number larger than biggest difference
-$ CALL TOOLTEST h5diff_609.txt "file1.h5 file2.h5  -d 200 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_609.txt "-d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.10: number smaller than smallest difference
-$ CALL TOOLTEST h5diff_610.txt "file1.h5 file2.h5  -d 1 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_610.txt "-d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!
 $!# ##############################################################################
@@ -187,31 +186,31 @@ $!# ############################################################################
 $!
 $!
 $!# 6.11: no value
-$ CALL TOOLTEST h5diff_611.txt "file1.h5 file2.h5 -r -p g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_611.txt "-r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.12: negative value
-$ CALL TOOLTEST h5diff_612.txt "file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_612.txt "-p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.13: zero
-$ CALL TOOLTEST h5diff_613.txt "file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_613.txt "-p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.14: non number
-$ CALL TOOLTEST h5diff_614.txt "file1.h5 file2.h5 -p u g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_614.txt "-p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.15: hexadecimal
-$ CALL TOOLTEST h5diff_615.txt "file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_615.txt "-p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.16: string
-$ CALL TOOLTEST h5diff_616.txt "file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4"
+$! CALL TOOLTEST h5diff_616.txt "-p """0.21""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.17: repeated option
-$ CALL TOOLTEST h5diff_617.txt "file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_617.txt "-p 0.21 -p 0.22 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.18: number larger than biggest difference
-$ CALL TOOLTEST h5diff_618.txt "file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_618.txt "-p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.19: number smaller than smallest difference
-$ CALL TOOLTEST h5diff_619.txt "file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_619.txt "-p 0.005 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!
 $!
@@ -221,31 +220,31 @@ $!# ############################################################################
 $!
 $!
 $!# 6.20: no value
-$ CALL TOOLTEST h5diff_620.txt "file1.h5 file2.h5 -n g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_620.txt "-n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.21: negative value
-$ CALL TOOLTEST h5diff_621.txt "file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_621.txt "-n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.22: zero
-$ CALL TOOLTEST h5diff_622.txt "file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_622.txt "-n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.23: non number
-$ CALL TOOLTEST h5diff_623.txt "file1.h5 file2.h5 -n u g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_623.txt "-n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.24: hexadecimal
-$ CALL TOOLTEST h5diff_624.txt "file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_624.txt "-n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.25: string
-$ CALL TOOLTEST h5diff_625.txt "file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_625.txt "-n """2""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.26: repeated option
-$ CALL TOOLTEST h5diff_626.txt "file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_626.txt "-n 2 -n 3 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.27: number larger than biggest difference
-$ CALL TOOLTEST h5diff_627.txt "file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_627.txt "--count=200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.28: number smaller than smallest difference
-$ CALL TOOLTEST h5diff_628.txt "file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4"
+$ CALL TOOLTEST h5diff_628.txt "-n 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# ##############################################################################
 $!# 6.29  non valid files
@@ -257,26 +256,33 @@ $!# ############################################################################
 $!# 7.  attributes
 $!# ##############################################################################
 $!
-$ CALL TOOLTEST h5diff_70.txt "file5.h5 file6.h5 -v"
+$ CALL TOOLTEST h5diff_70.txt "-v h5diff_attr1.h5 h5diff_attr2.h5"
 $!
 $!# ##############################################################################
 $!# 8.  all dataset datatypes
 $!# ##############################################################################
 $!
-$ CALL TOOLTEST h5diff_80.txt "file7.h5 file8.h5 -v"
+$ CALL TOOLTEST h5diff_80.txt "-v h5diff_dset1.h5 h5diff_dset2.h5"
 $!
 $!# 9. compare a file with itself
 $!
-$ CALL TOOLTEST h5diff_90.txt "file1.h5 file1.h5"
+$ CALL TOOLTEST h5diff_90.txt "-v h5diff_basic2.h5 h5diff_basic2.h5"
+$!
+$! 10. read by hyperslab, print indexes
+$ CALL TOOLTEST h5diff_100.txt "-v h5diff_hyper1.h5 h5diff_hyper2.h5"
+$!
+$! 11. floating point comparison
+$ CALL TOOLTEST h5diff_101.txt "-v h5diff_basic1.h5 h5diff_basic1.h5 g1/d1  g1/d2"
+$ CALL TOOLTEST h5diff_102.txt "-v h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1  g1/fp2"
 $!
 $!
 $!
 $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
-$ base = F$EXTRACT(0,len-2,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ base = F$EXTRACT(0,len-3,P1)
+$ actual = base + "h5diffout"
+$ actual_err = base + "h5differr"
 $
 $ begin = "Testing h5diff "
 $ !
@@ -295,7 +301,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -324,12 +330,17 @@ $  write sys$output line
 $ ! 
 $ ! Append the result to the log file 
 $ !
-$ append h5diff_temp.dif h5diff.log
+$ append/new_version h5diff_temp.dif h5diff.log
+$ append/new_version 'actual'        h5diff_output.txt
 $ !
 $ ! Delete temporary files
 $ !
-$! del *.out;*
-$! del *.dif;*
+$ if F$SEARCH(actual_err)  .NES. ""
+$ then
+$  del *.h5differr;*
+$ endif
+$  del *.h5diffout;*
+$  del h5diff_temp.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index d09c474..9c69c85 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -19,27 +19,27 @@ $!
 $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
-$ type sys$input
-       Creating h5diff  
 $!
 $ cobj= "h5diff_main, h5diff_common, h5diffgentest"
 
 $!                               
 $ ccc 'cobj 
 $ type sys$input
-       Creating h5diffgentest
+       Creating h5diffgentest ...
 $ link/exe=h5diffgentest.exe -
            h5diffgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
-       Created  h5difftest
+       Finished  h5difftest
+
 $
 $ type sys$input
-       Creating h5diff
+       Creating h5diff ...
 $ link/exe=h5diff.exe -
            h5diff_main, h5diff_common, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-       Created  h5diff
+       Finished  h5diff
+
 $!
 $ exit
diff --git a/vms/tools/h5dump/check.com b/vms/tools/h5dump/check.com
deleted file mode 100644
index 8c3b383..0000000
--- a/vms/tools/h5dump/check.com
+++ /dev/null
@@ -1,199 +0,0 @@
-$!#
-$!# 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.
-$!#
-$!
-$! h5dump testing script
-$!
-$! Some tests suppose to fail; to prevent exit from the command 
-$! file and continue with outher tests, those tests are commented out
-$! for now with the comment "has error message"
-$! Some features like filters and file drivers have not been tested yet
-$!
-$!          EIP, April 12, 2006
-$!
-$ define sys$output h5dump.out
-$! define sys$error  h5dump.err
-$ h5dump :== $sys$sysusers:[pourmale.hdf5.tools.h5dump]h5dump.exe
-$! test for displaying groups 
-$ h5dump  tgroup.h5
-$!
-$! test for displaying the selected groups (has error message)
-$! h5dump --group=/g2 --group / -g /y tgroup.h5
-$! test for displaying simple space datasets
-$ h5dump tdset.h5
-$! h5dump  -"H" -d dset1 -d /dset2 --dataset=dset3 tdset.h5
-$! h5dump  -"H" -d dset1 -d /dset2 -d dset3 tdset.h5
-$!
-$! test for displaying attributes
-$ h5dump  tattr.h5
-$! 
-$! test for displaying the selected attributes of string type and scalar space
-$! (has error message)
-$! h5dump  -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5
-$! test for header and error messages
-$ h5dump  -"A" tnamed_dtype_attr.h5
-$! test for displaying soft links
-$ h5dump  tslink.h5
-$! test for displaying the selected link
-$ h5dump -l slink2 tslink.h5
-$! tests for hard links
-$ h5dump thlink.h5
-$ h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5
-$ h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5
-$ h5dump -g /g1 thlink.h5
-$ h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5
-$! tests for compound data types
-$ h5dump tcompound.h5
-$! test for named data types
-$ h5dump -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5
-$! test for unamed type 
-$! test complicated compound datatype
-$ h5dump tcompound_complex.h5
-$!test for the nested compound type
-$ h5dump tnestedcomp.h5
-$! test for options
-$ h5dump tall.h5
-$ h5dump --header -g /g1/g1.1 -a attr2 tall.h5
-$ h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5
-$! test for loop detection
-$ h5dump tloop.h5
-$! test for string 
-$ h5dump tstr.h5
-$ h5dump tstr2.h5
-$! test for file created by Lib SAF team
-$ h5dump tsaf.h5
-$! test for file with variable length data
-$ h5dump tvldtypes1.h5
-$ h5dump tvldtypes2.h5
-$ h5dump tvldtypes3.h5
-$ h5dump tvldtypes4.h5
-$ h5dump tvldtypes5.h5
-$!test for file with variable length string data
-$ h5dump tvlstr.h5
-$! test for files with array data
-$ h5dump tarray1.h5
-$ h5dump tarray2.h5
-$ h5dump tarray3.h5
-$ h5dump tarray4.h5
-$ h5dump tarray5.h5
-$ h5dump tarray6.h5
-$ h5dump tarray7.h5
-$! test for files with empty data
-$ h5dump tempty.h5
-$! test for files with groups that have comments
-$ h5dump tgrp_comments.h5
-$! test the --filedriver flag
-$! h5dump  --filedriver=split tsplit_file
-$! h5dump  --filedriver=family tfamily%05d.h5
-$! h5dump  --filedriver=multi tmulti
-$! test for files with group names which reach > 1024 bytes in size
-$ h5dump  -w157 tlarge_objname.h5
-$ h5dump  -"A" tall.h5
-$! test '-r' to print attributes in ASCII instead of decimal
-$ h5dump  -"A" -r tall.h5
-$! test Subsetting
-$ h5dump --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5
-$ h5dump -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5
-$ h5dump -d "/dset1[1,1;;;]" tdset.h5
-$ h5dump -d "/dset1[;3,2;4,4;1,4]" tdset2.h5
-$! test printing characters in ASCII instead of decimal
-$ h5dump -r tchar.h5
-$! test failure handling
-$! Missing file name (has error message)
-$! h5dump 
-$! rev. 2004
-$ h5dump -"H" -"B" -d dset tfcontents1.h5
-$ h5dump -"B" tfcontents2.h5
-$! test -p with a non existing dataset (has error message)
-$! h5dump -p -d bogus tfcontents1.h5
-$! test for file contents
-$ h5dump -n tfcontents1.h5
-$! tests for storage layout
-$! compact
-$ h5dump --header -p -d compact tfilters.h5
-$! contiguous
-$ h5dump --header -p -d contiguous tfilters.h5
-$! chunked
-$ h5dump --header -p -d chunked tfilters.h5
-$! external 
-$ h5dump --header -p -d external tfilters.h5
-$! fill values
-$ h5dump -p tfvalues.h5
-$! several datatype, with references , print path
-$ h5dump  tattr2.h5
-$! escape/not escape non printable characters
-$ h5dump -e tstr3.h5
-$ h5dump tstr3.h5
-$! char data as ASCII with non escape
-$ h5dump  -r -d str4 tstr3.h5
-$! array indices print/not print
-$ h5dump taindices.h5
-$ h5dump -y taindices.h5
-$! tests for filters
-$! SZIP
-$!option="-H -p -d szip tfilters.h5"
-$!if test $USE_FILTER_SZIP != "yes"; then
-$! SKIP $option
-$!else
-$!$! h5dump tszip.ddl $option
-$!fi
-$! deflate
-$!option="-H -p -d deflate tfilters.h5"
-$!if test $USE_FILTER_DEFLATE != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tdeflate.ddl $option
-$!fi
-$!$! shuffle
-$!option="-H -p -d shuffle tfilters.h5"
-$!if test $USE_FILTER_SHUFFLE != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tshuffle.ddl $option
-$!fi
-$! fletcher32
-$!option="-H -p -d fletcher32  tfilters.h5"
-$!if test $USE_FILTER_FLETCHER32 != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tfletcher32.ddl $option
-$!fi
-$! nbit
-$!option="-H -p -d nbit  tfilters.h5"
-$!if test $USE_FILTER_NBIT != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tnbit.ddl $option
-$!fi
-$!$! scaleoffset
-$!option="-H -p -d scaleoffset  tfilters.h5"
-$!if test $USE_FILTER_SCALEOFFSET != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tscaleoffset.ddl $option
-$!fi
-$! all
-$!option="-H -p -d all  tfilters.h5"
-$!if test $USE_FILTER_FLETCHER32 != "yes" -o  $USE_FILTER_SZIP != "yes" -o  $USE_FILTER_DEFLATE != "yes" -o  $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o  $USE_FILTER_SCALEOFFSET != "yes"; then
-$! SKIP $option
-$!else
-$! $! h5dump tallfilters.ddl $option
-$!fi
-$! user defined
-$ h5dump  -"H"  -p -d myfilter  tfilters.h5    
-$! test for displaying dataset and attribute of null space
-$ h5dump tnullspace.h5
-$! test for displaying objects with very long names
-$ h5dump tlonglinks.h5
-$ exit
diff --git a/vms/tools/h5dump/check_h5dump.com b/vms/tools/h5dump/check_h5dump.com
index f8b4212..2c34731 100644
--- a/vms/tools/h5dump/check_h5dump.com
+++ b/vms/tools/h5dump/check_h5dump.com
@@ -16,6 +16,13 @@ $ !
 $ ! This command file tests h5dump utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
+$ type sys$input
+
+===================================
+       Testing h5dump utiltity
+===================================
+
+$
 $ !
 $ ! Define h5dump symbol
 $ !
@@ -26,11 +33,6 @@ $ temp = F$EXTRACT(0, len-10, current_dir)
 $ h5dump_dir = temp + "H5DUMP]"
 $ h5dump :== $sys$disk:'h5dump_dir'h5dump.exe
 $ !
-$ ! Define output for diff command that compares expected and actual
-$ ! outputs of h5dump
-$ !
-$ create h5dump.log
-$ !
 $ ! h5dump tests
 $ !
 $
@@ -40,7 +42,6 @@ $ ! Test for displaying groups
 $ CALL TOOLTEST tgroup-1.ddl "tgroup.h5"
 $ ! Test for displaying the selected groups
 $ CALL TOOLTEST tgroup-2.ddl "--group=/g2 --group / -g /y tgroup.h5"
-$
 $ ! Test for displaying simple space datasets
 $ CALL TOOLTEST tdset-1.ddl "tdset.h5"
 $ ! Test for displaying selected datasets
@@ -71,7 +72,7 @@ $ CALL TOOLTEST tcomp-1.ddl "tcompound.h5"
 $ ! test for named data types
 $ CALL TOOLTEST tcomp-2.ddl "-t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5"
 $ ! Test for unamed type 
-$ CALL TOOLTEST tcomp-3.ddl "-t /#6632:0 -g /group2 tcompound.h5"
+$ CALL TOOLTEST tcomp-3.ddl "-t /#6632 -g /group2 tcompound.h5"
 $ ! Test complicated compound datatype
 $ CALL TOOLTEST tcomp-4.ddl "tcompound_complex.h5"
 $
@@ -134,9 +135,9 @@ $ CALL TOOLTEST tall-2B.ddl "-"""A""" -r tall.h5"
 $
 $ ! Test Subsetting
 $ CALL TOOLTEST tall-4s.ddl "--dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5"
-$ CALL TOOLTEST tall-5s.ddl "-d """/"g"1/"g"1.1/"dset"1.1.2[0;2;10;]""" tall.h5"
-$ CALL TOOLTEST tdset-3s.ddl "-d """/"dset"1[1,1;;;]""" tdset.h5"
-$ CALL TOOLTEST tdset2-1s.ddl "-d """/"dset"1[;3,2;4,4;1,4]""" tdset2.h5"
+$ CALL TOOLTEST tall-5s.ddl "-d /g1/g1.1/dset1.1.2[0;2;10;] tall.h5"
+$ CALL TOOLTEST tdset-3s.ddl "-d /dset1[1,1;;;] tdset.h5"
+$! CALL TOOLTEST tdset-3s.ddl "-d """/"dset"1[;3,2;4,4;1,4]""" tdset2.h5"
 $
 $ ! Test printing characters in ASCII instead of decimal
 $ CALL TOOLTEST tchar1.ddl "-r tchar.h5"
@@ -182,58 +183,6 @@ $
 $ ! Array indices print/not print
 $ CALL TOOLTEST tindicesyes.ddl "taindices.h5"
 $ CALL TOOLTEST tindicesno.ddl "-y taindices.h5"
-$
-$
-$ ! tests for filters
-$ ! SZIP
-$ !option="-H -p -d szip tfilters.h5"
-$ !if test $USE_FILTER_SZIP != "yes"; then
-$  !SKIP $option
-$ !else
-$  !CALL TOOLTEST tszip.ddl $option
-$ !fi
-$ !# deflate
-$ !option="-H -p -d deflate tfilters.h5"
-$ !if test $USE_FILTER_DEFLATE != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tdeflate.ddl $option
-$ !fi
-$ !# shuffle
-$ !option="-H -p -d shuffle tfilters.h5"
-$ !if test $USE_FILTER_SHUFFLE != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tshuffle.ddl $option
-$ !fi
-$ !# fletcher32
-$ !option="-H -p -d fletcher32  tfilters.h5"
-$ !if test $USE_FILTER_FLETCHER32 != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tfletcher32.ddl $option
-$ !fi
-$ !# nbit
-$ !option="-H -p -d nbit  tfilters.h5"
-$ !if test $USE_FILTER_NBIT != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tnbit.ddl $option
-$ !fi
-$ !# scaleoffset
-$ !option="-H -p -d scaleoffset  tfilters.h5"
-$ !if test $USE_FILTER_SCALEOFFSET != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tscaleoffset.ddl $option
-$ !fi
-$ !# all
-$ !option="-H -p -d all  tfilters.h5"
-$ !if test $USE_FILTER_FLETCHER32 != "yes" -o  $USE_FILTER_SZIP != "yes" -o  $USE_FILTER_DEFLATE != "yes" -o  $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o  $USE_FILTER_SCALEOFFSET != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tallfilters.ddl $option
-$ !fi
 $ ! User defined
 $ CALL TOOLTEST tuserfilter.ddl "-"""H"""  -p -d myfilter  tfilters.h5"
 $    
@@ -241,7 +190,7 @@ $ ! Test for displaying dataset and attribute of null space
 $ CALL TOOLTEST tnullspace.ddl "tnullspace.h5"
 $
 $ ! Test for displaying objects with very long names
-$ CALL TOOLTEST tlonglinks.ddl "tlonglinks.h5"
+$ !CALL TOOLTEST tlonglinks.ddl "tlonglinks.h5"
 $
 $ ! Test for long double (some systems do not have long double)
 $ ! CALL TOOLTEST tldouble.ddl "tldouble.h5"
@@ -250,19 +199,38 @@ $ ! Test for vms
 $ CALL TOOLTEST tvms.ddl "tvms.h5"
 $
 $ !test for binary output
-$ CALL TOOLTEST tbin.ddl "-d integer -b out.bin test1.h5"
+$ CALL TOOLTEST1 tbin1.ddl "-d integer -o out1.bin -b """LE""" tbinary.h5"
+$ CALL TOOLTEST1 tbin2.ddl "-d float   -o out2.bin -b """BE""" tbinary.h5"
+$ CALL TOOLTEST1 tbin4.ddl "-d double   -o out4.bin -b """FILE""" tbinary.h5"
+$
+$ ! Test for dataset region references
+$ CALL TOOLTEST tdatareg.ddl "tdatareg.h5"
+$
+$ ! tests for group creation order "1" tracked, "2" name, root tracked
+$ CALL TOOLTEST tordergr1.ddl "--group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5"
+$ CALL TOOLTEST tordergr2.ddl "--group=1 --sort_by=creation_order --sort_order=descending tordergr.h5"
+$ CALL TOOLTEST tordergr3.ddl "-g 2 -q name -z ascending tordergr.h5"
+$ CALL TOOLTEST tordergr4.ddl "-g 2 -q name -z descending tordergr.h5"
+$ CALL TOOLTEST tordergr5.ddl "-q creation_order tordergr.h5"
+$
+$ ! Tests for attribute order
+$ CALL TOOLTEST torderattr1.ddl "-"""H""" --sort_by=name --sort_order=ascending torderattr.h5"
+$ CALL TOOLTEST torderattr2.ddl "-"""H""" --sort_by=name --sort_order=descending torderattr.h5"
+$ CALL TOOLTEST torderattr3.ddl "-"""H""" --sort_by=creation_order --sort_order=ascending torderattr.h5"
+$ CALL TOOLTEST torderattr4.ddl "-"""H""" --sort_by=creation_order --sort_order=descending torderattr.h5"
 $ !
 $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-3,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5dumpout"
+$ actual_err = base + "h5dumperr"
 $
 $ begin = "Testing h5dump "
 $ !
 $ ! Run the test and save output in the 'actual' file
 $ !
+$ 
 $ define/nolog sys$output 'actual'
 $ define/nolog sys$error  'actual_err'
 $ write  sys$output "#############################"
@@ -276,7 +244,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -305,12 +273,81 @@ $  write sys$output line
 $ ! 
 $ ! Append the result to the log file 
 $ !
-$ append h5dump_temp.dif h5dump.log
+$ append/new_version h5dump_temp.dif h5dump.log
+$ append/new_version 'actual'        h5dump_output.txt
 $ !
 $ ! Delete temporary files
 $ !
-$! del *.out;*
-$! del *.dif;*
+$ if F$SEARCH(actual_err) .NES. ""
+$ then
+$  del *.h5dumperr;*
+$ endif
+$  del *.h5dumpout;*
+$  del h5dump_temp.dif;*
+$ !
+$ENDSUBROUTINE
+$
+$TOOLTEST1: SUBROUTINE
+$
+$ len =  F$LENGTH(P1)
+$ base = F$EXTRACT(0,len-3,P1)
+$ actual = base + "h5dumpout"
+$ actual_err = base + "h5dumperr"
+$
+$ begin = "Testing h5dump "
+$ !
+$ ! Run the test and save output in the 'actual' file
+$ !
+$ define/nolog sys$output 'actual'
+$ define/nolog sys$error  'actual_err'
+$ ON ERROR THEN CONTINUE
+$ h5dump 'P2
+$ deassign sys$output
+$ deassign sys$error
+$ if F$SEARCH(actual_err) .NES. ""
+$ then
+$ set message/notext/nofacility/noidentification/noseverity
+$    append 'actual_err' 'actual'
+$ set message/text/facility/identification/severity
+$ endif
+$ !
+$ ! Compare the results
+$ !
+$ diff/output=h5dump_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual' 'P1'
+$ open/read temp_out h5dump_temp.dif
+$ read temp_out record1
+$ close temp_out
+$ !
+$ ! Extract error code and format output line
+$ !
+$ len = F$LENGTH(record1)
+$ err_code = F$EXTRACT(len-1,1,record1)
+$ if err_code .eqs. "0" 
+$  then
+$    result = "PASSED"
+$    line = F$FAO("!15AS !50AS !70AS", begin, P2, result) 
+$  else
+$    result = "*FAILED*"
+$    line = F$FAO("!15AS !49AS !69AS", begin, P2, result) 
+$ endif
+$ !
+$ ! Print test result
+$ ! 
+$  write sys$output line
+$ ! 
+$ ! Append the result to the log file 
+$ !
+$ append/new_version h5dump_temp.dif h5dump.log
+$ append/new_version 'actual'        h5dump_output.txt
+$ !
+$ ! Delete temporary files
+$ !
+$ if F$SEARCH(actual_err) .NES. ""
+$ then
+$  del *.h5dumperr;*
+$ endif
+$  del *.h5dumpout;*
+$  del h5dump_temp.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 774902c..96ab968 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -26,17 +26,18 @@ $ cobj= "h5dump.c, h5dumpgentest.c "
 $                               
 $ ccc 'cobj 
 $ type sys$input
-       Creating h5dumpgentest
+       Creating h5dumpgentest ...
 $ link     h5dumpgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
- 	Created  h5dumpgentest
+ 	Finished  h5dumpgentest
+
 $
 $ type sys$input
-       Creating h5dump
+       Creating h5dump ...
 $ link     h5dump, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5dump
+	Finished  h5dump
 $!
 $ exit
diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com
index 0aac610..87c854e 100644
--- a/vms/tools/h5import/check_h5import.com
+++ b/vms/tools/h5import/check_h5import.com
@@ -17,8 +17,15 @@ $ ! This command file tests h5import utility. The command file has to
 $ ! run in the [hdf5-top.tools.h5import.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5import utiltity
+===================================
+
 $ ! Define symbols
 $ !
+$ 
 $ current_dir = F$DIRECTRY()
 $ len = F$LENGTH(current_dir)
 $ temp = F$EXTRACT(0, len-19, current_dir)
@@ -31,78 +38,96 @@ $ !
 $ ! Define output for diff command that compares expected and actual
 $ ! outputs of h5dump
 $ !
-$ create h5dump.log
+$ create h5import.log
 $ !
 $ ! h5import tests
 $ !
 $ ! Run h5importtest to create input files
 $ !
-$ h5importtest
-$ CALL TOOLTEST "ASCII I32 rank 3 - Output BE " -
-       "txtin32 -c textin32 -o" test1.h5
+$ run [.-]h5importtest
 $ !
-$ CALL TOOLTEST  "ASCII I16 rank 3 - Output LE - CHUNKED - extended" - 
-       "txtin16 -c textin16 -o" test2.h5
+$ type sys$input 
+                 Testing ASCII I32 rank 3 - Output BE 
+$ CALL TOOLTEST "txtin32. -c textin32. -o" test1.h5
 $ !
-$ CALL TOOLTEST - 
-       "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " -
-       "txtin16 -c textin8  -o" test3.h5
+$ type sys$input 
+                Testing ASCII I16 rank 3 - Output LE - CHUNKED - extended
+$ CALL TOOLTEST  "txtin16. -c textin16. -o" test2.h5
 $ !
-$ CALL TOOLTEST  "ASCII UI32 - rank 3 - Output BE " - 
-       "in1 -c textuin32 -o" test4.h5
+$ type sys$input 
+                Testing ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed 
+$ CALL TOOLTEST  "txtin16. -c textin8.  -o" test3.h5
 $ !
-$ CALL TOOLTEST  "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " -
-       "in1 -c textuin16 -o" test5.h5
+$ type sys$input 
+               Testing ASCII UI32 - rank 3 - Output BE 
+$ CALL TOOLTEST  "in1. -c textuin32. -o" test4.h5
 $ !
-$ CALL TOOLTEST  "ASCII F32 - rank 3 - Output LE " -
-       "fp1 -c textfp32 -o" test6.h5
+$ type sys$input 
+               Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed 
+$ CALL TOOLTEST  "in1. -c textuin16. -o" test5.h5
 $ !
-$ CALL TOOLTEST - 
-       "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " -
-       "fp2 -c textfp64 -o" test7.h5
+$ type sys$input 
+               Testing ASCII F32 - rank 3 - Output LE 
+$ CALL TOOLTEST  "fp1. -c textfp32. -o" test6.h5
 $ !
-$ CALL TOOLTEST - 
-       "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " -
-       "bfp64 -c conbfp64 -o" test8.h5
+$ type sys$input 
+               Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed 
+$ CALL TOOLTEST  "fp2. -c textfp64. -o" tes7.h5
 $ !
-$ CALL TOOLTEST  "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " -
-       "bin16 -c conbin16 -o" test9.h5
+$ type sys$input 
+               Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed 
+$ CALL TOOLTEST  "bfp64. -c conbfp64. -o" test8.h5
 $ !
-$ CALL TOOLTEST  -
-       "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " -
-       "bin8 -c conbin8  -o" test10.h5
+$ type sys$input 
+               Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended 
+$ CALL TOOLTEST  "bin16. -c conbin16. -o" test9.h5
 $ !
-$ CALL TOOLTEST  "BINARY I32 - rank 3 - Output BE + CHUNKED " -
-       "bin32 -c conbin32 -o" test11.h5
+$ type sys$input 
+               Testing BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed 
+$ CALL TOOLTEST  "bin8. -c conbin8.  -o" test10.h5
 $ !
-$ CALL TOOLTEST  "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " -
-       "buin16 -c conbuin16 -o" test12.h5
+$ type sys$input 
+           
+   Testing BINARY I32 - rank 3 - Output BE + CHUNKED 
+$ CALL TOOLTEST  "bin32. -c conbin32. -o" test11.h5
 $ !
-$ CALL TOOLTEST  "BINARY UI32 - rank 3 - Output LE + CHUNKED " -
-       "buin32 -c conbuin32 -o" test13.h5
+$ type sys$input 
+               Testing BINARY UI16 - rank 3 - Output byte BE + CHUNKED 
+$ CALL TOOLTEST  "buin16. -c conbuin16. -o" test12.h5
+$ !
+$ type sys$input 
+               Testing BINARY UI32 - rank 3 - Output LE + CHUNKED 
+$ CALL TOOLTEST  "buin32. -c conbuin32. -o" test13.h5
 $
 $
+$ ! Delete temporary files
+$ del *_out.h5;*
+$ del *.h5importtxt;*
+$ del b*.;*
+$ del txti*.;*
+$ del *.dif;*
+$ !
 $ 
 $TOOLTEST: SUBROUTINE
 $
-$ len =  F$LENGTH(P3)
-$ base = F$EXTRACT(0,len-3,P3)
-$ actual = base + "out.h5"
-$ actual_dump = base + "out.txt"
-$ actual_dump_err = base + "out.err"
-$ expected_dump = base + ".txt"
-$ expected_dump_err = base + ".err"
+$ len =  F$LENGTH(P2)
+$ base = F$EXTRACT(0,len-3,P2)
+$ actual = base + "_out.h5"
+$ actual_dump = base + "out.h5importtxt"
+$ actual_dump_err = base + "out.h5importerr"
+$ expected_dump = base + ".h5importtxt"
+$ expected_dump_err = base + ".h5importerr"
 $
 $ begin = "Testing"
 $ !
 $ ! Run h5import with output in the 'actual' file
 $ !
 $ ON ERROR THEN CONTINUE
-$ h5import 'P2 'actual'
+$ h5import 'P1 'actual'
 $ define/nolog sys$output 'actual_dump'
 $ define/nolog sys$error  'actual_dump_err'
 $ !
-$ ! Dump the actual and expected files
+$ ! Dump the atual and expected files
 $ !
 $ h5dump 'actual'
 $ deassign sys$output
@@ -111,16 +136,16 @@ $ if F$SEARCH(actual_dump_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_dump_err' 'actual_dump'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ define/nolog sys$output 'expected_dump'
 $ define/nolog sys$error  'expected_dump_err'
-$ h5dump 'P3
+$ h5dump 'P2
 $ deassign sys$output
 $ deassign sys$error
 $ if F$SEARCH(expected_dump_err) .NES. ""
 $ then
-$ set message/notext/nofacility/noidentification/noseverity
+$ set message/notex/nofacility/noidentification/noseverity
 $    append 'expected_dump_err' 'expected_dump'
 $ set message/ntext/facility/identification/severity
 $ endif
@@ -173,13 +198,18 @@ $  write sys$output line
 $ ! 
 $ ! Append the result to the log file 
 $ !
-$ append h5dump_temp.dif h5dump.log
+$ append h5dump_temp.dif h5import.log
 $ !
-$ ! Delete temporary files
-$ if F$SEARCH("*out.h5;*") then del *out.h5;*
-$ if F$SEARCH("*.dif;*")   then del *.dif;*
-$ if F$SEARCH("*.err;*")   then del *.err;*
 $ !
 $ !
+$ ! Delete temporary files
+$ !
+$ if F$SEARCH(actual_dump_err) .NES. ""
+$ then
+$  del *out.h5importerr;*
+$ endif
+$ if F$SEARCH(expected_dump_err) .NES. ""
+$ then
+$  del *.h5importerr;*
+$ endif
 $ENDSUBROUTINE
-
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 10a03c1..347c87c 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -20,25 +20,25 @@ $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
-	Creating  h5import
+       Creating  h5import ...
 $!
 $ cobj= "h5import, h5importtest "
 
 $!                               
 $ ccc 'cobj 
 $
-$ type sys$input
-       Creating h5import
 $ link     h5import,-
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5import
+       Finished  h5import
+
 $!
 $ type sys$input
-       Creating h5importtest
+       Creating h5importtest ...
 $ link     h5importtest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5importtest
+       Finished  h5importtest
+
 $!
 $ exit
diff --git a/vms/tools/h5ls/check_h5ls.com b/vms/tools/h5ls/check_h5ls.com
index f9865a9..daa601d 100644
--- a/vms/tools/h5ls/check_h5ls.com
+++ b/vms/tools/h5ls/check_h5ls.com
@@ -97,8 +97,8 @@ $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-2,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5lsout"
+$ actual_err = base + "h5lserr"
 $
 $ begin = "Testing h5ls "
 $ !
@@ -117,7 +117,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -150,8 +150,9 @@ $ append h5ls_temp.dif h5ls.log
 $ !
 $ ! Delete temporary files
 $ !
-$! del *.out;*
-$! del *.dif;*
+$ if F$SEARCH("*.h5lserr;*")   then del *.h5lserr;*
+$ if F$SEARCH("*.h5lsout;*")   then del *.h5lsout;*
+$ if F$SEARCH("*.dif;*")   then del *.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com
index 866c3ed..1dcbc78 100644
--- a/vms/tools/h5repack/check_h5repack.com
+++ b/vms/tools/h5repack/check_h5repack.com
@@ -18,6 +18,12 @@ $ ! This command file tests h5repack utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5repack utiltity
+===================================
+
 $ ! Define h5repack and h5diff symbols
 $ !
 $! set message/notext/nofacility/noidentification/noseverity
@@ -35,76 +41,78 @@ $ !
 $
 
 $!# copy files (these files have no filters) 
-$ CALL TOOLTEST h5repack_fill.h5
-$ CALL TOOLTEST h5repack_objs.h5
-$ CALL TOOLTEST h5repack_attr.h5
-$ CALL TOOLTEST h5repack_hlink.h5
-$ CALL TOOLTEST h5repack_layout.h5
-$ CALL TOOLTEST h5repack_early.h5
+$ CALL TOOLTEST "" h5repack_fill.h5
+$ CALL TOOLTEST "" h5repack_objs.h5
+$ CALL TOOLTEST "" h5repack_attr.h5
+$ CALL TOOLTEST "" h5repack_hlink.h5
+$ CALL TOOLTEST "" h5repack_layout.h5
+$ CALL TOOLTEST "" h5repack_early.h5
 $ 
 $! # use h5repack_layout.h5 to write some filters  (this file has  no filters)
 $ 
 $! # gzip with individual object
-$ CALL TOOLTEST h5repack_layout.h5 "-f dset1:""GZIP""=1  -l dset1:""CHUNK""=20x10"
+$ CALL TOOLTEST "-f dset1:"""GZIP"""=1  -l dset1:"""CHUNK"""=20x10" h5repack_layout.h5
 $!   
+$
 $! # gzip for all 
-$ CALL TOOLTEST h5repack_layout.h5 "-f ""GZIP""=1"
+$ CALL TOOLTEST "-f """GZIP"""=1" h5repack_layout.h5
 $! 
 $! # shuffle with individual object
-$ CALL TOOLTEST h5repack_layout.h5 "-f dset2:""SHUF""  -l dset2:""CHUNK""=20x10"
+$ CALL TOOLTEST "-f dset2:"""SHUF"""  -l dset2:"""CHUNK"""=20x10" h5repack_layout.h5
+$ 
 $!   
 $! 
 $! # shuffle for all
-$ CALL TOOLTEST h5repack_layout.h5 "-f ""SHUF"""
+$ CALL TOOLTEST "-f """SHUF"""" h5repack_layout.h5
 $!   
 $! # fletcher32  with individual object
-$ CALL TOOLTEST h5repack_layout.h5 "-f dset2:""FLET""  -l dset2:""CHUNK""=20x10"
+$ CALL TOOLTEST "-f dset2:"""FLET"""  -l dset2:"""CHUNK"""=20x10" h5repack_layout.h5
 $! 
 $! # fletcher32 for all
-$ CALL TOOLTEST h5repack_layout.h5 "-f ""FLET"""
+$ CALL TOOLTEST "-f """FLET"""" h5repack_layout.h5
 $ 
 $! ###########################################################
 $! # the following tests assume the input files have filters
 $! ###########################################################
 $! 
 $! # deflate copy
-$ CALL TOOLTEST h5repack_deflate.h5
+$ CALL TOOLTEST "" h5repack_deflate.h5
 $! 
 $! # deflate remove
-$ CALL TOOLTEST h5repack_deflate.h5 "-f dset_deflate:""NONE"""
+$ CALL TOOLTEST "-f dset_deflate:"""NONE"""" h5repack_deflate.h5
 $!     
 $! # shuffle copy
-$ CALL TOOLTEST h5repack_shuffle.h5
+$ CALL TOOLTEST "" h5repack_shuffle.h5
 $! 
 $! # shuffle remove
-$ CALL TOOLTEST h5repack_shuffle.h5 "-f dset_shuffle:""NONE"""
+$ CALL TOOLTEST "-f dset_shuffle:"""NONE"""" h5repack_shuffle.h5
 $! 
 $! # fletcher32 copy
-$ CALL TOOLTEST h5repack_fletcher.h5
+$ CALL TOOLTEST "" h5repack_fletcher.h5
 $! 
 $! # fletcher32 remove
-$ CALL TOOLTEST h5repack_fletcher.h5 "-f dset_fletcher32:""NONE"""
+$ CALL TOOLTEST "-f dset_fletcher32:"""NONE"""" h5repack_fletcher.h5
 $! 
 $! # nbit copy
-$ CALL TOOLTEST h5repack_nbit.h5
+$ CALL TOOLTEST "" h5repack_nbit.h5
 $! 
 $! # nbit remove
-$ CALL TOOLTEST h5repack_nbit.h5 "-f dset_nbit:""NONE"""
+$ CALL TOOLTEST "-f dset_nbit:"""NONE"""" h5repack_nbit.h5
 $! 
 $! # nbit add
-$ CALL TOOLTEST h5repack_nbit.h5 "-f dset_int31:""NBIT"""
+$ CALL TOOLTEST "-f dset_int31:"""NBIT"""" h5repack_nbit.h5
 $! 
 $! # scaleoffset add
-$! CALL TOOLTEST h5repack_scaleoffset.h5 "-f dset_none:""S+O""=31"
+$! CALL TOOLTEST "-f dset_none:"""S+O"""=31" h5repack_scaleoffset.h5
 $! 
 $! # scaleoffset copy
-$! CALL TOOLTEST h5repack_scaleoffset.h5
+$! CALL TOOLTEST "" h5repack_scaleoffset.h5
 $! 
 $! # scaleoffset remove
-$! CALL TOOLTEST h5repack_scaleoffset.h5 "-f dset_scaleoffset:""NONE"""
+$! CALL TOOLTEST "-f dset_scaleoffset:"""NONE"""" h5repack_scaleoffset.h5
 $! 
 $! #limit
-$ CALL TOOLTEST h5repack_layout.h5 "-f ""GZIP""=1 -m 1024"
+$ CALL TOOLTEST "-f """GZIP"""=1 -m 1024" h5repack_layout.h5
 $! 
 $! 
 $! 
@@ -112,58 +120,57 @@ $! #########################################################
 $! # layout options (these files have no filters)
 $! #########################################################
 $!
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset2:""CHUNK""=20x10"
-$ CALL TOOLTEST h5repack_layout.h5 "-l ""CHUNK""=20x10"
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset2:""CONTI"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l ""CONTI"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset2:""COMPA"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l ""COMPA"""
+$ CALL TOOLTEST "-l dset2:"""CHUNK"""=20x10" h5repack_layout.h5
+$ CALL TOOLTEST "-l """CHUNK"""=20x10" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset2:"""CONTI"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l """CONTI"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset2:"""COMPA"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l """COMPA"""" h5repack_layout.h5
 $! 
 $! 
 $! ################################################################
 $! # layout conversions (file has no filters)
 $! ###############################################################
 $! 
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_compact:""CONTI"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_compact:""CHUNK""=2x5" 
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_compact:""COMPA"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_contiguous:""COMPA"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_contiguous:""CHUNK""=3x6"
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_contiguous:""CONTI"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_chunk:""COMPA"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_chunk:""CONTI"""
-$ CALL TOOLTEST h5repack_layout.h5 "-l dset_chunk:""CHUNK""=18x13"
+$ CALL TOOLTEST "-l dset_compact:"""CONTI"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_compact:"""CHUNK"""=2x5" h5repack_layout.h5 
+$ CALL TOOLTEST "-l dset_compact:"""COMPA"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_contiguous:"""COMPA"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_contiguous:"""CHUNK"""=3x6" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_contiguous:"""CONTI"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_chunk:"""COMPA"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_chunk:"""CONTI"""" h5repack_layout.h5
+$ CALL TOOLTEST "-l dset_chunk:"""CHUNK"""=18x13" h5repack_layout.h5
+$!
 $!
 $!
-$! del *out.h5;*
-$! del *.out;*
-$! del *.err;*
 $TOOLTEST: SUBROUTINE
 
-$ len =  F$LENGTH(P1)
-$ base = F$EXTRACT(0,len-3,P1)
-$ output_file = base + "out.h5"
-$ output_err = base + ".err"
-$ output_out = base + ".out"
+$ len =  F$LENGTH(P2)
+$ base = F$EXTRACT(0,len-3,P2)
+$ output_file = base + "_out.h5"
+$ output_err = base + ".h5repackerr"
+$ output_out = base + ".h5repackout"
 $
 $ begin = "Testing h5repack"
 $ !
 $ ! Run the test and save output in the 'actual' file
 $ !
-$! define/nolog sys$error  'output_err'
-$! define/nolog sys$output 'output_out'
+$ define/nolog sys$error  'output_err'
+$ define/nolog sys$output 'output_out'
+$
 $ ON ERROR THEN CONTINUE
-$ h5repack -i 'P1 -o 'output_file' 'P2
-$ h5diff 'P1 'output_file'
+$ h5repack 'P1 'P2 'output_file'
+$ h5diff 'P2 'output_file'
 $ deassign sys$error
 $ deassign sys$output
 $ if F$SEARCH(output_err) .EQS. "" 
 $ then
 $    result = "PASSED"
-$    line = F$FAO("!16AS !20AS !43AS !70AS", begin, P1, P2, result) 
+$    line = F$FAO("!16AS !40AS !22AS !67AS", begin, P1, P2, result) 
 $  else
 $    result = "*FAILED*"
-$    line = F$FAO("!16AS !20AS !42AS !69AS", begin, P1, P2, result) 
+$    line = F$FAO("!16AS !40AS !22AS !66AS", begin, P1, P2, result) 
 $ endif
 
 $ !
@@ -172,5 +179,15 @@ $ !
 $  write sys$output line
 $ ! 
 $ !
+$ !
+$ ! Cleanup temporary files
+$ !
+$ if F$SEARCH(output_err) .NES. ""
+$ then 
+$  del *.h5repackerr;*
+$ endif 
+$  del *.h5repackout;*
+$  del  *_out.h5;*
 $ENDSUBROUTINE
 
+
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index 1db481c..f9a42c4 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -20,36 +20,35 @@ $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
-	Creating h5repack
+       Creating h5repack ...
 $!
-$ cobj= " h5repack_main, h5repack, h5repack_copy, h5repack_refs, h5repack_filters, " +-
-        "h5repack_list, h5repack_opttable, h5repack_parse, " +-
+$ cobj= " h5repack_main, h5repack, h5repack_copy, h5repack_refs," +-
+        "h5repack_filters, h5repack_opttable, h5repack_parse, " +-
         "h5repack_verify, h5repacktst"
 
 $!                               
 $ ccc 'cobj 
-$ type sys$input
-       Creating h5repack
 $ link/exe=h5repack.exe -
            h5repack_main, h5repack, h5repack_copy, h5repack_refs, h5repack_filters, -
-           h5repack_list, h5repack_opttable, h5repack_parse, -
+           h5repack_opttable, h5repack_parse, -
            h5repack_verify, -
            [-.lib]libh5tools.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
-	Created  h5repack
+       Finished  h5repack
+
 $
 $ type sys$input
-       Creating h5repacktst
+       Creating h5repacktst ...
 $ link/exe=h5repacktst.exe -
            h5repacktst,  -
            h5repack, h5repack_copy, h5repack_refs, h5repack_filters, -
-           h5repack_list, h5repack_opttable, h5repack_parse, -
+           h5repack_opttable, h5repack_parse, -
            h5repack_verify, -
            [-.lib]libh5tools.olb/lib,[-.-.test]libh5test.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $
 $ type sys$input
-	Created  h5repacktst
+       Finished  h5repacktst
 $!
 $ exit
diff --git a/vms/tools/testfiles/tattr-3.ddl b/vms/tools/testfiles/tattr-3.ddl
new file mode 100644
index 0000000..8907843
--- /dev/null
+++ b/vms/tools/testfiles/tattr-3.ddl
@@ -0,0 +1,13 @@
+
+#############################
+Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5'
+#############################
+HDF5 "tattr.h5" {
+ATTRIBUTE "/attr2" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+}
+ATTRIBUTE "/attr" {
+}
+}
+h5dump error: unable to open attribute "/"
diff --git a/vms/tools/testfiles/tdset-2.ddl b/vms/tools/testfiles/tdset-2.ddl
new file mode 100644
index 0000000..e6439ae
--- /dev/null
+++ b/vms/tools/testfiles/tdset-2.ddl
@@ -0,0 +1,17 @@
+
+#############################
+Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5'
+#############################
+HDF5 "tdset.h5" {
+DATASET "dset1" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) }
+}
+DATASET "/dset2" {
+   DATATYPE  H5T_IEEE_F64BE
+   DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
+}
+DATASET "dset3" {
+}
+}
+h5dump error: unable to open dataset "dset3"
diff --git a/vms/tools/testfiles/tgroup-2.ddl b/vms/tools/testfiles/tgroup-2.ddl
new file mode 100644
index 0000000..120ef2d
--- /dev/null
+++ b/vms/tools/testfiles/tgroup-2.ddl
@@ -0,0 +1,47 @@
+
+#############################
+Expected output for 'h5dump --group=/g2 --group / -g /y tgroup.h5'
+#############################
+HDF5 "tgroup.h5" {
+GROUP "/g2" {
+   GROUP "g2.1" {
+      GROUP "g2.1.1" {
+      }
+      GROUP "g2.1.2" {
+      }
+      GROUP "g2.1.3" {
+      }
+   }
+}
+GROUP "/" {
+   GROUP "g1" {
+      GROUP "g1.1" {
+      }
+      GROUP "g1.2" {
+      }
+   }
+   GROUP "g2" {
+      GROUP "g2.1" {
+         GROUP "g2.1.1" {
+         }
+         GROUP "g2.1.2" {
+         }
+         GROUP "g2.1.3" {
+         }
+      }
+   }
+   GROUP "g3" {
+      GROUP "g3.1" {
+      }
+      GROUP "g3.2" {
+      }
+      GROUP "g3.3" {
+      }
+      GROUP "g3.4" {
+      }
+   }
+}
+GROUP "/y" {
+}
+}
+h5dump error: unable to open group "/y"
diff --git a/vms/tools/testfiles/tperror.ddl b/vms/tools/testfiles/tperror.ddl
new file mode 100644
index 0000000..7275907
--- /dev/null
+++ b/vms/tools/testfiles/tperror.ddl
@@ -0,0 +1,9 @@
+
+#############################
+Expected output for 'h5dump -p -d bogus tfcontents1.h5'
+#############################
+HDF5 "tfcontents1.h5" {
+DATASET "bogus" {
+}
+}
+h5dump error: unable to open dataset "bogus"
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 8369fcf..71f079c 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -92,14 +92,12 @@ rem Setup our environment
     
     echo.Setting up environment
 
-    rem By default, use all.sln and typegen.sln, unless hdf5_enablefortran is set
+    rem By default, use all.sln, unless hdf5_enablefortran is set
     if defined hdf5_enablefortran (
         echo.Building Fortran projects enabled
         set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln"
-        set hdf5_tinit_sln="%CD%\windows\misc\typegen\typegen_fortran.sln"
     ) else (
         set hdf5_sln="%CD%\windows\proj\all\all.sln"
-        set hdf5_tinit_sln="%CD%\windows\misc\typegen\typegen.sln"
     )
     
     
@@ -147,21 +145,6 @@ rem Setup our environment
     exit /b 0
 
 
-rem Build H5tinit.exe and generate h4tinit.c
-:h5tinit
-
-    echo.Generating H5tint.c
-
-    echo.*****************************************************************************
-    echo.                        Build H5Tinit.exe
-    echo.*****************************************************************************
-    echo.
-    devenv %hdf5_tinit_sln% %ccflags% /rebuild Debug
-    if %errorlevel% neq 0 exit /b 1
-
-    exit /b
-
-
 rem Build the HDF5 libraries.  By default, C and C++ libraries are built.
 :all
 
@@ -226,12 +209,6 @@ rem This is where the magic happens
     echo.
 
 
-    call :h5tinit
-    if %errorlevel% neq 0 (
-        echo.Error building h5tinit!
-        goto error
-    )
-
     call :all
     if %errorlevel% neq 0 (
         echo.Error building HDF5 libraries!
diff --git a/windows/installhdf5lib.bat b/windows/installhdf5lib.bat
index 22e9cd9..d53258c 100755
--- a/windows/installhdf5lib.bat
+++ b/windows/installhdf5lib.bat
@@ -105,7 +105,7 @@ copy proj\hdf5_hl_fortrandll\debug\*.mod  hdf5lib\debug\modsdll
 copy proj\hdf5_hl\debug\hdf5_hld.lib hdf5lib\debug\lib
 copy proj\hdf5_hl_cpp\debug\hdf5_hl_cppd.lib hdf5lib\debug\lib
 copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.lib hdf5lib\debug\lib
-copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortran_libd.lib hdf5lib\debug\lib
+copy proj\hdf5_hl_f90cstub\debug\hdf5_hl_f90cstubd.lib hdf5lib\debug\lib
 
 
 copy proj\hdf5_hldll\debug\hdf5_hlddll.lib hdf5lib\debug\dll
@@ -128,7 +128,7 @@ copy proj\hdf5_hl_fortrandll\release\*.mod  hdf5lib\release\modsdll
 copy proj\hdf5_hl\release\hdf5_hl.lib hdf5lib\release\lib
 copy proj\hdf5_hl_cpp\release\hdf5_hl_cpp.lib hdf5lib\release\lib
 copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran.lib hdf5lib\release\lib
-copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran_lib.lib hdf5lib\release\lib
+copy proj\hdf5_hl_f90cstub\release\hdf5_hl_f90cstub.lib hdf5lib\release\lib
 
 copy proj\hdf5_hldll\release\hdf5_hldll.lib hdf5lib\release\dll
 copy proj\hdf5_hldll\release\hdf5_hldll.dll hdf5lib\release\dll
diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 4698bf0..732026b 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -2265,53 +2265,11 @@
 				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
 				
 			
 			
+			
+			
 			
diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index 357bca2..1816939 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -2363,55 +2363,11 @@
 				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
 				
 			
 			
+			
+			
 			
diff --git a/windows/test/testhdf5/testhdf5.vcproj b/windows/test/testhdf5/testhdf5.vcproj
index bf502eb..19e6912 100644
--- a/windows/test/testhdf5/testhdf5.vcproj
+++ b/windows/test/testhdf5/testhdf5.vcproj
@@ -565,6 +565,10 @@
 			
 		
 		
+		
+		
 			
 		
 		
+		
+		
 			%actual% 2>&1
+    ) >%actual% 2>%actual_err%
     
     set exitcode=%errorlevel%
-        
-    rem Windows doesn't have "sed" command, and parsing the files line-by-line
-    rem to emulate Unix takes a very long time.  Instead, we simply remove lines
-    rem with "Modified".  Do this for actual and expected otput.  If there is a 
-    rem better alternative in the future, we should use it instead. --SJW 8/22/07
-    for %%a in (expect actual) do (
-        findstr /v /c:"    Modified:" !%%a! > tmp.txt
-        move /y tmp.txt !%%a_parsed! > nul
-    )
-
-    if "%exitcode%" neq "0" (
+    type %actual_err% >> %actual%
+    if "%exitcode%" neq "%retvalexpect%" (
         call :testing *FAILED* %params%
         set /a nerrors=!nerrors!+1
         if "yes"=="%verbose%" (
@@ -110,11 +108,11 @@ rem %2 and on -- argument for the h5ls tool
             rem Count lines echo'ed, and break out after 20.  --SJW 8/28/07
             set line=0
             for /f "tokens=* delims=" %%a in (%actual%) do (
-                if !line! geq %nlines% goto break
+                if !line! geq %nlines% goto break2
                 echo.%%a
                 set /a line=!line!+1
             )
-            :break
+            :break2
             echo.***end of test output***
             echo.
         )
@@ -126,20 +124,20 @@ rem %2 and on -- argument for the h5ls tool
     rem     call :testing CREATED %params%
     rem     copy %actual% %expect% > nul
     ) else (
-        fc /w %expect_parsed% %actual_parsed% | find "FC: no diff" > nul
+        fc /w %expect% %actual% | find "FC: no diff" > nul
         if !errorlevel! equ 0 (
             call :testing PASSED %params%
         ) else (
             call :testing *FAILED* %params%
             echo.    Expected result differs from actual result
             set nerrors=!nerrors!+1
-            if "yes"=="%verbose%" fc %expect_parsed% %actual_parsed%
+            if "yes"=="%verbose%" fc %expect% %actual%
         )
     )
     
     rem Clean up output file
     if not defined hdf5_nocleanup (
-        del /f %actual% %actual_parsed% %expected_parsed%
+        del /f %actual% %actual_err%
     )
     
     exit /b
@@ -154,62 +152,63 @@ rem ############################################################################
     
     rem Toss in a bunch of tests.  Not sure if they are the right kinds.
     rem test the help syntax
-    call :tooltest help-1.ls -w80 -h
-    call :tooltest help-2.ls -w80 -help
-    call :tooltest help-3.ls -w80 -?
+    call :tooltest help-1.ls 0 -w80 -h
+    call :tooltest help-2.ls 0 -w80 -help
+    call :tooltest help-3.ls 0 -w80 -?
 
     rem test simple command
-    call :tooltest tall-1.ls -w80 tall.h5
-    call :tooltest tall-2.ls -w80 -r -d tall.h5
-    call :tooltest tgroup.ls -w80 tgroup.h5
+    call :tooltest tall-1.ls 0 -w80 tall.h5
+    call :tooltest tall-2.ls 0 -w80 -r -d tall.h5
+    call :tooltest tgroup.ls 0 -w80 tgroup.h5
 
     rem test for displaying groups
-    call :tooltest tgroup-1.ls -w80 -r -g tgroup.h5
+    call :tooltest tgroup-1.ls 1 -w80 -r -g tgroup.h5
+    call :tooltest tgroup-2.ls 0 -w80 -g tgroup.h5/g1
 
     rem test for displaying simple space datasets
-    call :tooltest tdset-1.ls -w80 -r -d tdset.h5
+    call :tooltest tdset-1.ls 0 -w80 -r -d tdset.h5
 
     rem test for displaying soft links
-    call :tooltest tslink-1.ls -w80 -r tslink.h5
+    call :tooltest tslink-1.ls 0 -w80 -r tslink.h5
 
     rem test for displaying external and user-defined links
-    call :tooltest textlink-1.ls -w80 -r textlink.h5
-    call :tooltest tudlink-1.ls -w80 -r tudlink.h5
+    call :tooltest textlink-1.ls 0 -w80 -r textlink.h5
+    call :tooltest tudlink-1.ls 0 -w80 -r tudlink.h5
 
     rem tests for hard links
-    call :tooltest thlink-1.ls -w80 thlink.h5
+    call :tooltest thlink-1.ls 0 -w80 thlink.h5
 
     rem tests for compound data types
-    call :tooltest tcomp-1.ls -w80 -r -d tcompound.h5
+    call :tooltest tcomp-1.ls 0 -w80 -r -d tcompound.h5
 
     rem test for the nested compound type
-    call :tooltest tnestcomp-1.ls -w80 -r -d tnestedcomp.h5
+    call :tooltest tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
 
     rem test for loop detection
-    call :tooltest tloop-1.ls -w80 -r -d tloop.h5
+    call :tooltest tloop-1.ls 0 -w80 -r -d tloop.h5
 
     rem test for string 
-    call :tooltest tstr-1.ls -w80 -r -d tstr.h5
+    call :tooltest tstr-1.ls 0 -w80 -r -d tstr.h5
 
     rem test test file created from lib SAF team
-    call :tooltest tsaf.ls -w80 -r -d tsaf.h5
+    call :tooltest tsaf.ls 0 -w80 -r -d tsaf.h5
 
     rem test for variable length data types
-    call :tooltest tvldtypes1.ls -w80 -r -d tvldtypes1.h5
+    call :tooltest tvldtypes1.ls 0 -w80 -r -d tvldtypes1.h5
 
     rem test for array data types
-    call :tooltest tarray1.ls -w80 -r -d tarray1.h5
+    call :tooltest tarray1.ls 0 -w80 -r -d tarray1.h5
 
     rem test for empty data
-    call :tooltest tempty.ls -w80 -d tempty.h5
+    call :tooltest tempty.ls 0 -w80 -d tempty.h5
 
     rem test for all dataset types written to attributes
     rem enable -S for avoiding printing NATIVE types
-    call :tooltest tattr2.ls -w80 -v -S tattr2.h5
+    call :tooltest tattr2.ls 0 -w80 -v -S tattr2.h5
 
     rem tests for error handling.
     rem test for non-existing file
-    call :tooltest nosuchfile.ls nosuchfile.h5
+    call :tooltest nosuchfile.ls 0 nosuchfile.h5
 
     if %nerrors% equ 0 (
         echo.All h5ls tests passed.
@@ -217,4 +216,4 @@ rem ############################################################################
     
     popd
     endlocal & exit /b %nerrors%
-    
\ No newline at end of file
+    
diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat
index ae97db4..d06f82c 100644
--- a/windows/tools/h5repack/h5repack.bat
+++ b/windows/tools/h5repack/h5repack.bat
@@ -312,7 +312,7 @@ rem
     )
       
     rem szip remove
-    set arg=%file7% -f dset_szip:NONE
+    set arg=%file7% --filter=dset_szip:NONE
     if not "%use_filter_szip_encoder%"=="yes" (
         call :skip %arg%
     ) else if not "%use_filter_szip%"=="yes" (
@@ -483,7 +483,7 @@ rem
     rem  layout options (these files have no filters)
     rem ########################################################
 
-    call :tooltest %file4% -l dset2:CHUNK=20x10
+    call :tooltest %file4% --layout=dset2:CHUNK=20x10
     call :tooltest %file4% -l CHUNK=20x10
     call :tooltest %file4% -l dset2:CONTI
     call :tooltest %file4% -l CONTI
@@ -514,10 +514,31 @@ rem
     call :tooltest %arg8%
     call :tooltest %arg9%
 
-    rem native option
+    rem Native option
     set arg=%file1% -n
     call :tooltest %arg%
 
+
+    rem long swtiches. use FILE4=h5repack_layout.h5 (no filters)
+
+    set arg=%file4% --layout CHUNK=20x10 --filter GZIP=1 --threshold=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]
+    if not "%use_filter_deflate%"=="yes" (
+       call :skip %arg%
+    ) else (
+       call :tooltest %arg%
+    )
+
+    rem several global filters
+
+    set arg=%file4% --filter GZIP=1 --filter SHUF
+    if not "%use_filter_deflate%"=="yes" (
+        call :skip %arg%
+    ) else if not "%use_filter_shuffle%"=="yes" (
+        call :skip %arg%
+    ) else (
+        call :tooltest %arg%
+    )
+
     
     if %nerrors% equ 0 (
         echo.All %h5repack% tests passed.
diff --git a/windows/tools/h5repack/h5repack.vcproj b/windows/tools/h5repack/h5repack.vcproj
index db3df24..9896209 100644
--- a/windows/tools/h5repack/h5repack.vcproj
+++ b/windows/tools/h5repack/h5repack.vcproj
@@ -543,54 +543,6 @@
 				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
-			
 				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
-			
 				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
-			
 				
 		
 		
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/chunkstest/chunkstest.vcproj b/windows_vnet/c++/examples/chunkstest/chunkstest.vcproj
new file mode 100644
index 0000000..cdaae91
--- /dev/null
+++ b/windows_vnet/c++/examples/chunkstest/chunkstest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj b/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj
new file mode 100644
index 0000000..8b651ce
--- /dev/null
+++ b/windows_vnet/c++/examples/chunkstestdll/chunkstestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj b/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj
new file mode 100644
index 0000000..5f46551
--- /dev/null
+++ b/windows_vnet/c++/examples/compoundtest/compoundtest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj b/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj
new file mode 100644
index 0000000..2649c74
--- /dev/null
+++ b/windows_vnet/c++/examples/compoundtestdll/compoundtestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/createtest/createtest.vcproj b/windows_vnet/c++/examples/createtest/createtest.vcproj
new file mode 100644
index 0000000..8832d78
--- /dev/null
+++ b/windows_vnet/c++/examples/createtest/createtest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj b/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj
new file mode 100644
index 0000000..ea5af0f
--- /dev/null
+++ b/windows_vnet/c++/examples/createtestdll/createtestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj b/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj
new file mode 100644
index 0000000..ecf1879
--- /dev/null
+++ b/windows_vnet/c++/examples/extend_dstest/extend_dstest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj b/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj
new file mode 100644
index 0000000..ab2f25d
--- /dev/null
+++ b/windows_vnet/c++/examples/extend_dstestdll/extend_dstestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj b/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj
new file mode 100644
index 0000000..af56199
--- /dev/null
+++ b/windows_vnet/c++/examples/h5grouptest/h5grouptest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj b/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj
new file mode 100644
index 0000000..c57026c
--- /dev/null
+++ b/windows_vnet/c++/examples/h5grouptestdll/h5grouptestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj b/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj
new file mode 100644
index 0000000..ce636e1
--- /dev/null
+++ b/windows_vnet/c++/examples/readdatatest/readdatatest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj b/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj
new file mode 100644
index 0000000..748d13b
--- /dev/null
+++ b/windows_vnet/c++/examples/readdatatestdll/readdatatestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj b/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj
new file mode 100644
index 0000000..f541b9a
--- /dev/null
+++ b/windows_vnet/c++/examples/writedatatest/writedatatest.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj b/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj
new file mode 100644
index 0000000..bbe0a66
--- /dev/null
+++ b/windows_vnet/c++/examples/writedatatestdll/writedatatestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj b/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj
new file mode 100644
index 0000000..588dbba
--- /dev/null
+++ b/windows_vnet/c++/test/dsets_cpp/dsets_cpp.vcproj
@@ -0,0 +1,213 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+		
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj b/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj
new file mode 100644
index 0000000..58c57bc
--- /dev/null
+++ b/windows_vnet/c++/test/dsets_cppdll/dsets_cppdll.vcproj
@@ -0,0 +1,213 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+		
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
new file mode 100644
index 0000000..0022809
--- /dev/null
+++ b/windows_vnet/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj
@@ -0,0 +1,381 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
new file mode 100644
index 0000000..8f2f74d
--- /dev/null
+++ b/windows_vnet/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj
@@ -0,0 +1,379 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/allexamples/allexamples.sln b/windows_vnet/examples/allexamples/allexamples.sln
new file mode 100644
index 0000000..89bed79
--- /dev/null
+++ b/windows_vnet/examples/allexamples/allexamples.sln
@@ -0,0 +1,185 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allexamples", "allexamples.vcproj", "{354D5860-5C11-4B71-979B-324AE22B119D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E90D9D35-0CB5-471A-BE70-552F3F006A55} = {E90D9D35-0CB5-471A-BE70-552F3F006A55}
+		{1E80D8B0-D24B-414D-8BCD-530130C89B31} = {1E80D8B0-D24B-414D-8BCD-530130C89B31}
+		{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28} = {014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}
+		{22E63662-E107-46A1-8B67-64DC6A79DBC5} = {22E63662-E107-46A1-8B67-64DC6A79DBC5}
+		{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62} = {8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}
+		{2685B122-0087-4666-A467-8874E7F8A28F} = {2685B122-0087-4666-A467-8874E7F8A28F}
+		{729A5137-1524-4A56-B113-D61F8D763DD4} = {729A5137-1524-4A56-B113-D61F8D763DD4}
+		{F6DD1ED2-DEF3-4724-BD57-30D6959936D6} = {F6DD1ED2-DEF3-4724-BD57-30D6959936D6}
+		{29D51487-ADE7-444C-A975-D854C94ECFF8} = {29D51487-ADE7-444C-A975-D854C94ECFF8}
+		{6B294AB6-671A-4744-A904-EA651F1E9418} = {6B294AB6-671A-4744-A904-EA651F1E9418}
+		{B6C75173-6C87-439D-9E16-DBE73C0B1C23} = {B6C75173-6C87-439D-9E16-DBE73C0B1C23}
+		{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0} = {C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}
+		{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8} = {B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}
+		{F9C0A0D4-17BA-4C54-B022-AEF83C563453} = {F9C0A0D4-17BA-4C54-B022-AEF83C563453}
+		{57D249B9-38DF-4414-8EB0-20D35E1B5A9D} = {57D249B9-38DF-4414-8EB0-20D35E1B5A9D}
+		{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645} = {B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}
+		{4AD2ED6D-903A-4193-B8F7-85E8B9710F26} = {4AD2ED6D-903A-4193-B8F7-85E8B9710F26}
+		{39309687-6D9A-44AE-B6E9-836BCB8B5753} = {39309687-6D9A-44AE-B6E9-836BCB8B5753}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributetest", "..\attributetest\attributetest.vcproj", "{39309687-6D9A-44AE-B6E9-836BCB8B5753}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributetestdll", "..\attributetestdll\attributetestdll.vcproj", "{6B294AB6-671A-4744-A904-EA651F1E9418}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkread", "..\chunkread\chunkread.vcproj", "{4AD2ED6D-903A-4193-B8F7-85E8B9710F26}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkreaddll", "..\chunkreaddll\chunkreaddll.vcproj", "{29D51487-ADE7-444C-A975-D854C94ECFF8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compoundtest", "..\compoundtest\compoundtest.vcproj", "{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compoundtestdll", "..\compoundtestdll\compoundtestdll.vcproj", "{F6DD1ED2-DEF3-4724-BD57-30D6959936D6}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extendwritetest", "..\extendwritetest\extendwritetest.vcproj", "{57D249B9-38DF-4414-8EB0-20D35E1B5A9D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extendwritetestdll", "..\extendwritetestdll\extendwritetestdll.vcproj", "{729A5137-1524-4A56-B113-D61F8D763DD4}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grouptest", "..\grouptest\grouptest.vcproj", "{F9C0A0D4-17BA-4C54-B022-AEF83C563453}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grouptestdll", "..\grouptestdll\grouptestdll.vcproj", "{2685B122-0087-4666-A467-8874E7F8A28F}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intermgrouptest", "..\intermgrouptest\intermgrouptest.vcproj", "{1E80D8B0-D24B-414D-8BCD-530130C89B31}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "intermgrouptestdll", "..\intermgrouptestdll\intermgrouptestdll.vcproj", "{E90D9D35-0CB5-471A-BE70-552F3F006A55}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readtest", "..\readtest\readtest.vcproj", "{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readtestdll", "..\readtestdll\readtestdll.vcproj", "{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selectest", "..\selectest\selectest.vcproj", "{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selectestdll", "..\selectestdll\selectestdll.vcproj", "{22E63662-E107-46A1-8B67-64DC6A79DBC5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writetest", "..\writetest\writetest.vcproj", "{B6C75173-6C87-439D-9E16-DBE73C0B1C23}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writetestdll", "..\writetestdll\writetestdll.vcproj", "{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{354D5860-5C11-4B71-979B-324AE22B119D}.Debug.ActiveCfg = Debug|Win32
+		{354D5860-5C11-4B71-979B-324AE22B119D}.Debug.Build.0 = Debug|Win32
+		{354D5860-5C11-4B71-979B-324AE22B119D}.Release.ActiveCfg = Release|Win32
+		{354D5860-5C11-4B71-979B-324AE22B119D}.Release.Build.0 = Release|Win32
+		{39309687-6D9A-44AE-B6E9-836BCB8B5753}.Debug.ActiveCfg = Debug|Win32
+		{39309687-6D9A-44AE-B6E9-836BCB8B5753}.Debug.Build.0 = Debug|Win32
+		{39309687-6D9A-44AE-B6E9-836BCB8B5753}.Release.ActiveCfg = Release|Win32
+		{39309687-6D9A-44AE-B6E9-836BCB8B5753}.Release.Build.0 = Release|Win32
+		{6B294AB6-671A-4744-A904-EA651F1E9418}.Debug.ActiveCfg = Debug|Win32
+		{6B294AB6-671A-4744-A904-EA651F1E9418}.Debug.Build.0 = Debug|Win32
+		{6B294AB6-671A-4744-A904-EA651F1E9418}.Release.ActiveCfg = Release|Win32
+		{6B294AB6-671A-4744-A904-EA651F1E9418}.Release.Build.0 = Release|Win32
+		{4AD2ED6D-903A-4193-B8F7-85E8B9710F26}.Debug.ActiveCfg = Debug|Win32
+		{4AD2ED6D-903A-4193-B8F7-85E8B9710F26}.Debug.Build.0 = Debug|Win32
+		{4AD2ED6D-903A-4193-B8F7-85E8B9710F26}.Release.ActiveCfg = Release|Win32
+		{4AD2ED6D-903A-4193-B8F7-85E8B9710F26}.Release.Build.0 = Release|Win32
+		{29D51487-ADE7-444C-A975-D854C94ECFF8}.Debug.ActiveCfg = Debug|Win32
+		{29D51487-ADE7-444C-A975-D854C94ECFF8}.Debug.Build.0 = Debug|Win32
+		{29D51487-ADE7-444C-A975-D854C94ECFF8}.Release.ActiveCfg = Release|Win32
+		{29D51487-ADE7-444C-A975-D854C94ECFF8}.Release.Build.0 = Release|Win32
+		{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}.Debug.ActiveCfg = Debug|Win32
+		{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}.Debug.Build.0 = Debug|Win32
+		{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}.Release.ActiveCfg = Release|Win32
+		{B9D04F9E-E174-45A0-8C0E-A5FC18EDE645}.Release.Build.0 = Release|Win32
+		{F6DD1ED2-DEF3-4724-BD57-30D6959936D6}.Debug.ActiveCfg = Debug|Win32
+		{F6DD1ED2-DEF3-4724-BD57-30D6959936D6}.Debug.Build.0 = Debug|Win32
+		{F6DD1ED2-DEF3-4724-BD57-30D6959936D6}.Release.ActiveCfg = Release|Win32
+		{F6DD1ED2-DEF3-4724-BD57-30D6959936D6}.Release.Build.0 = Release|Win32
+		{57D249B9-38DF-4414-8EB0-20D35E1B5A9D}.Debug.ActiveCfg = Debug|Win32
+		{57D249B9-38DF-4414-8EB0-20D35E1B5A9D}.Debug.Build.0 = Debug|Win32
+		{57D249B9-38DF-4414-8EB0-20D35E1B5A9D}.Release.ActiveCfg = Release|Win32
+		{57D249B9-38DF-4414-8EB0-20D35E1B5A9D}.Release.Build.0 = Release|Win32
+		{729A5137-1524-4A56-B113-D61F8D763DD4}.Debug.ActiveCfg = Debug|Win32
+		{729A5137-1524-4A56-B113-D61F8D763DD4}.Debug.Build.0 = Debug|Win32
+		{729A5137-1524-4A56-B113-D61F8D763DD4}.Release.ActiveCfg = Release|Win32
+		{729A5137-1524-4A56-B113-D61F8D763DD4}.Release.Build.0 = Release|Win32
+		{F9C0A0D4-17BA-4C54-B022-AEF83C563453}.Debug.ActiveCfg = Debug|Win32
+		{F9C0A0D4-17BA-4C54-B022-AEF83C563453}.Debug.Build.0 = Debug|Win32
+		{F9C0A0D4-17BA-4C54-B022-AEF83C563453}.Release.ActiveCfg = Release|Win32
+		{F9C0A0D4-17BA-4C54-B022-AEF83C563453}.Release.Build.0 = Release|Win32
+		{2685B122-0087-4666-A467-8874E7F8A28F}.Debug.ActiveCfg = Debug|Win32
+		{2685B122-0087-4666-A467-8874E7F8A28F}.Debug.Build.0 = Debug|Win32
+		{2685B122-0087-4666-A467-8874E7F8A28F}.Release.ActiveCfg = Release|Win32
+		{2685B122-0087-4666-A467-8874E7F8A28F}.Release.Build.0 = Release|Win32
+		{1E80D8B0-D24B-414D-8BCD-530130C89B31}.Debug.ActiveCfg = Debug|Win32
+		{1E80D8B0-D24B-414D-8BCD-530130C89B31}.Debug.Build.0 = Debug|Win32
+		{1E80D8B0-D24B-414D-8BCD-530130C89B31}.Release.ActiveCfg = Release|Win32
+		{1E80D8B0-D24B-414D-8BCD-530130C89B31}.Release.Build.0 = Release|Win32
+		{E90D9D35-0CB5-471A-BE70-552F3F006A55}.Debug.ActiveCfg = Debug|Win32
+		{E90D9D35-0CB5-471A-BE70-552F3F006A55}.Debug.Build.0 = Debug|Win32
+		{E90D9D35-0CB5-471A-BE70-552F3F006A55}.Release.ActiveCfg = Release|Win32
+		{E90D9D35-0CB5-471A-BE70-552F3F006A55}.Release.Build.0 = Release|Win32
+		{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}.Debug.ActiveCfg = Debug|Win32
+		{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}.Debug.Build.0 = Debug|Win32
+		{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}.Release.ActiveCfg = Release|Win32
+		{B1D9656E-100B-4B76-8AC2-9DDF9DCB8ED8}.Release.Build.0 = Release|Win32
+		{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}.Debug.ActiveCfg = Debug|Win32
+		{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}.Debug.Build.0 = Debug|Win32
+		{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}.Release.ActiveCfg = Release|Win32
+		{8E6A8A4A-2A39-47D7-88F6-9831F15AFB62}.Release.Build.0 = Release|Win32
+		{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}.Debug.ActiveCfg = Debug|Win32
+		{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}.Debug.Build.0 = Debug|Win32
+		{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}.Release.ActiveCfg = Release|Win32
+		{C6F2C1D9-D024-4CD4-8F8F-7A34A46AFAE0}.Release.Build.0 = Release|Win32
+		{22E63662-E107-46A1-8B67-64DC6A79DBC5}.Debug.ActiveCfg = Debug|Win32
+		{22E63662-E107-46A1-8B67-64DC6A79DBC5}.Debug.Build.0 = Debug|Win32
+		{22E63662-E107-46A1-8B67-64DC6A79DBC5}.Release.ActiveCfg = Release|Win32
+		{22E63662-E107-46A1-8B67-64DC6A79DBC5}.Release.Build.0 = Release|Win32
+		{B6C75173-6C87-439D-9E16-DBE73C0B1C23}.Debug.ActiveCfg = Debug|Win32
+		{B6C75173-6C87-439D-9E16-DBE73C0B1C23}.Debug.Build.0 = Debug|Win32
+		{B6C75173-6C87-439D-9E16-DBE73C0B1C23}.Release.ActiveCfg = Release|Win32
+		{B6C75173-6C87-439D-9E16-DBE73C0B1C23}.Release.Build.0 = Release|Win32
+		{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}.Debug.ActiveCfg = Debug|Win32
+		{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}.Debug.Build.0 = Debug|Win32
+		{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}.Release.ActiveCfg = Release|Win32
+		{014DC2D9-7F1B-4B81-A6D9-FAD2DD886B28}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/windows_vnet/examples/allexamples/allexamples.vcproj b/windows_vnet/examples/allexamples/allexamples.vcproj
new file mode 100644
index 0000000..ee96d68
--- /dev/null
+++ b/windows_vnet/examples/allexamples/allexamples.vcproj
@@ -0,0 +1,135 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/windows_vnet/examples/attributetest/attributetest.vcproj b/windows_vnet/examples/attributetest/attributetest.vcproj
new file mode 100644
index 0000000..86a8932
--- /dev/null
+++ b/windows_vnet/examples/attributetest/attributetest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/attributetestdll/attributetestdll.vcproj b/windows_vnet/examples/attributetestdll/attributetestdll.vcproj
new file mode 100644
index 0000000..474ece14
--- /dev/null
+++ b/windows_vnet/examples/attributetestdll/attributetestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/chunkread/chunkread.vcproj b/windows_vnet/examples/chunkread/chunkread.vcproj
new file mode 100644
index 0000000..4222314
--- /dev/null
+++ b/windows_vnet/examples/chunkread/chunkread.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj b/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj
new file mode 100644
index 0000000..e89dbd2
--- /dev/null
+++ b/windows_vnet/examples/chunkreaddll/chunkreaddll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/compoundtest/compoundtest.vcproj b/windows_vnet/examples/compoundtest/compoundtest.vcproj
new file mode 100644
index 0000000..3f026b1
--- /dev/null
+++ b/windows_vnet/examples/compoundtest/compoundtest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj b/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj
new file mode 100644
index 0000000..54d80db
--- /dev/null
+++ b/windows_vnet/examples/compoundtestdll/compoundtestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/extendwritetest/extendwritetest.vcproj b/windows_vnet/examples/extendwritetest/extendwritetest.vcproj
new file mode 100644
index 0000000..631b112
--- /dev/null
+++ b/windows_vnet/examples/extendwritetest/extendwritetest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj b/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj
new file mode 100644
index 0000000..f67962b
--- /dev/null
+++ b/windows_vnet/examples/extendwritetestdll/extendwritetestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/grouptest/grouptest.vcproj b/windows_vnet/examples/grouptest/grouptest.vcproj
new file mode 100644
index 0000000..5354d8b
--- /dev/null
+++ b/windows_vnet/examples/grouptest/grouptest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/grouptestdll/grouptestdll.vcproj b/windows_vnet/examples/grouptestdll/grouptestdll.vcproj
new file mode 100644
index 0000000..880d066
--- /dev/null
+++ b/windows_vnet/examples/grouptestdll/grouptestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj b/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj
new file mode 100644
index 0000000..d1585d9
--- /dev/null
+++ b/windows_vnet/examples/intermgrouptest/intermgrouptest.vcproj
@@ -0,0 +1,177 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj b/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj
new file mode 100644
index 0000000..e533fce
--- /dev/null
+++ b/windows_vnet/examples/intermgrouptestdll/intermgrouptestdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/readtest/readtest.vcproj b/windows_vnet/examples/readtest/readtest.vcproj
new file mode 100644
index 0000000..3416b50
--- /dev/null
+++ b/windows_vnet/examples/readtest/readtest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/readtestdll/readtestdll.vcproj b/windows_vnet/examples/readtestdll/readtestdll.vcproj
new file mode 100644
index 0000000..70c13d8
--- /dev/null
+++ b/windows_vnet/examples/readtestdll/readtestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/selectest/selectest.vcproj b/windows_vnet/examples/selectest/selectest.vcproj
new file mode 100644
index 0000000..da87dfb
--- /dev/null
+++ b/windows_vnet/examples/selectest/selectest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/selectestdll/selectestdll.vcproj b/windows_vnet/examples/selectestdll/selectestdll.vcproj
new file mode 100644
index 0000000..bdffdf6
--- /dev/null
+++ b/windows_vnet/examples/selectestdll/selectestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/writetest/writetest.vcproj b/windows_vnet/examples/writetest/writetest.vcproj
new file mode 100644
index 0000000..b1eda06
--- /dev/null
+++ b/windows_vnet/examples/writetest/writetest.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/examples/writetestdll/writetestdll.vcproj b/windows_vnet/examples/writetestdll/writetestdll.vcproj
new file mode 100644
index 0000000..6400177
--- /dev/null
+++ b/windows_vnet/examples/writetestdll/writetestdll.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj b/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
new file mode 100644
index 0000000..83fc731
--- /dev/null
+++ b/windows_vnet/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj b/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
new file mode 100644
index 0000000..6ee6633
--- /dev/null
+++ b/windows_vnet/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
new file mode 100644
index 0000000..4ed5225
--- /dev/null
+++ b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.sln
@@ -0,0 +1,113 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allhlcexamples", "allhlcexamples.vcproj", "{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50FEC639-EBCF-4F19-B535-ABECE5707A93} = {50FEC639-EBCF-4F19-B535-ABECE5707A93}
+		{133F4A96-DD6D-4B13-BADC-7587F845D253} = {133F4A96-DD6D-4B13-BADC-7587F845D253}
+		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0} = {C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}
+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C} = {99EDFA69-68D6-43F7-A4DB-1C2739D8364C}
+		{5526D330-EDC2-4620-8816-44D4196E2372} = {5526D330-EDC2-4620-8816-44D4196E2372}
+		{31018018-AC76-4F43-846C-F8B1DCE676FD} = {31018018-AC76-4F43-846C-F8B1DCE676FD}
+		{BA597B44-B102-4E95-98F4-03C9ABD02A62} = {BA597B44-B102-4E95-98F4-03C9ABD02A62}
+		{643A1F28-6553-43B9-9F26-DD5FE2448559} = {643A1F28-6553-43B9-9F26-DD5FE2448559}
+		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D} = {79DE1C67-FE07-41FE-A8C9-154CD2C0280D}
+		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA} = {154DCDF3-E08F-4881-B2D4-776B26C9D5DA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_ds", "..\ex_ds\ex_ds.vcproj", "{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_dsdll", "..\ex_dsdll\ex_dsdll.vcproj", "{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_images", "..\ex_images\ex_images.vcproj", "{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_imagesdll", "..\ex_imagesdll\ex_imagesdll.vcproj", "{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_lite", "..\ex_lite\ex_lite.vcproj", "{643A1F28-6553-43B9-9F26-DD5FE2448559}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_litedll", "..\ex_litedll\ex_litedll.vcproj", "{BA597B44-B102-4E95-98F4-03C9ABD02A62}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packet", "..\ex_packet\ex_packet.vcproj", "{133F4A96-DD6D-4B13-BADC-7587F845D253}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_packetdll", "..\ex_packetdll\ex_packetdll.vcproj", "{50FEC639-EBCF-4F19-B535-ABECE5707A93}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_table", "..\ex_table\ex_table.vcproj", "{31018018-AC76-4F43-846C-F8B1DCE676FD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_tabledll", "..\ex_tabledll\ex_tabledll.vcproj", "{5526D330-EDC2-4620-8816-44D4196E2372}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}.Debug.ActiveCfg = Debug|Win32
+		{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}.Debug.Build.0 = Debug|Win32
+		{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}.Release.ActiveCfg = Release|Win32
+		{6B659D89-A5D6-4DF4-B6AF-74BEBE5961E5}.Release.Build.0 = Release|Win32
+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}.Debug.ActiveCfg = Debug|Win32
+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}.Debug.Build.0 = Debug|Win32
+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}.Release.ActiveCfg = Release|Win32
+		{99EDFA69-68D6-43F7-A4DB-1C2739D8364C}.Release.Build.0 = Release|Win32
+		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}.Debug.ActiveCfg = Debug|Win32
+		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}.Debug.Build.0 = Debug|Win32
+		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}.Release.ActiveCfg = Release|Win32
+		{C6B12522-10FD-4E4A-AD4E-AD28A6011CF0}.Release.Build.0 = Release|Win32
+		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}.Debug.ActiveCfg = Debug|Win32
+		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}.Debug.Build.0 = Debug|Win32
+		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}.Release.ActiveCfg = Release|Win32
+		{154DCDF3-E08F-4881-B2D4-776B26C9D5DA}.Release.Build.0 = Release|Win32
+		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}.Debug.ActiveCfg = Debug|Win32
+		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}.Debug.Build.0 = Debug|Win32
+		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}.Release.ActiveCfg = Release|Win32
+		{79DE1C67-FE07-41FE-A8C9-154CD2C0280D}.Release.Build.0 = Release|Win32
+		{643A1F28-6553-43B9-9F26-DD5FE2448559}.Debug.ActiveCfg = Debug|Win32
+		{643A1F28-6553-43B9-9F26-DD5FE2448559}.Debug.Build.0 = Debug|Win32
+		{643A1F28-6553-43B9-9F26-DD5FE2448559}.Release.ActiveCfg = Release|Win32
+		{643A1F28-6553-43B9-9F26-DD5FE2448559}.Release.Build.0 = Release|Win32
+		{BA597B44-B102-4E95-98F4-03C9ABD02A62}.Debug.ActiveCfg = Debug|Win32
+		{BA597B44-B102-4E95-98F4-03C9ABD02A62}.Debug.Build.0 = Debug|Win32
+		{BA597B44-B102-4E95-98F4-03C9ABD02A62}.Release.ActiveCfg = Release|Win32
+		{BA597B44-B102-4E95-98F4-03C9ABD02A62}.Release.Build.0 = Release|Win32
+		{133F4A96-DD6D-4B13-BADC-7587F845D253}.Debug.ActiveCfg = Debug|Win32
+		{133F4A96-DD6D-4B13-BADC-7587F845D253}.Debug.Build.0 = Debug|Win32
+		{133F4A96-DD6D-4B13-BADC-7587F845D253}.Release.ActiveCfg = Release|Win32
+		{133F4A96-DD6D-4B13-BADC-7587F845D253}.Release.Build.0 = Release|Win32
+		{50FEC639-EBCF-4F19-B535-ABECE5707A93}.Debug.ActiveCfg = Debug|Win32
+		{50FEC639-EBCF-4F19-B535-ABECE5707A93}.Debug.Build.0 = Debug|Win32
+		{50FEC639-EBCF-4F19-B535-ABECE5707A93}.Release.ActiveCfg = Release|Win32
+		{50FEC639-EBCF-4F19-B535-ABECE5707A93}.Release.Build.0 = Release|Win32
+		{31018018-AC76-4F43-846C-F8B1DCE676FD}.Debug.ActiveCfg = Debug|Win32
+		{31018018-AC76-4F43-846C-F8B1DCE676FD}.Debug.Build.0 = Debug|Win32
+		{31018018-AC76-4F43-846C-F8B1DCE676FD}.Release.ActiveCfg = Release|Win32
+		{31018018-AC76-4F43-846C-F8B1DCE676FD}.Release.Build.0 = Release|Win32
+		{5526D330-EDC2-4620-8816-44D4196E2372}.Debug.ActiveCfg = Debug|Win32
+		{5526D330-EDC2-4620-8816-44D4196E2372}.Debug.Build.0 = Debug|Win32
+		{5526D330-EDC2-4620-8816-44D4196E2372}.Release.ActiveCfg = Release|Win32
+		{5526D330-EDC2-4620-8816-44D4196E2372}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj
new file mode 100644
index 0000000..0a3172c
--- /dev/null
+++ b/windows_vnet/hl/examples/allhlcexamples/allhlcexamples.vcproj
@@ -0,0 +1,57 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_ds/ex_ds.vcproj b/windows_vnet/hl/examples/ex_ds/ex_ds.vcproj
new file mode 100644
index 0000000..8cee5be
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_ds/ex_ds.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj b/windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj
new file mode 100644
index 0000000..7aef8e9
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_dsdll/ex_dsdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_images/ex_images.vcproj b/windows_vnet/hl/examples/ex_images/ex_images.vcproj
new file mode 100644
index 0000000..04bd96e
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_images/ex_images.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj b/windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
new file mode 100644
index 0000000..7ec9819
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_imagesdll/ex_imagesdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_lite/ex_lite.vcproj b/windows_vnet/hl/examples/ex_lite/ex_lite.vcproj
new file mode 100644
index 0000000..f35d8fc
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_lite/ex_lite.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj b/windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj
new file mode 100644
index 0000000..5eada93
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_litedll/ex_litedll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_packet/ex_packet.vcproj b/windows_vnet/hl/examples/ex_packet/ex_packet.vcproj
new file mode 100644
index 0000000..5653626
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_packet/ex_packet.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj b/windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj
new file mode 100644
index 0000000..33a9f34
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_packetdll/ex_packetdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_table/ex_table.vcproj b/windows_vnet/hl/examples/ex_table/ex_table.vcproj
new file mode 100644
index 0000000..2b5bf52
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_table/ex_table.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj b/windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj
new file mode 100644
index 0000000..ab7807b
--- /dev/null
+++ b/windows_vnet/hl/examples/ex_tabledll/ex_tabledll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj b/windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj
new file mode 100644
index 0000000..815622d
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_ds/hl_test_ds.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
new file mode 100644
index 0000000..c253a2f
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj b/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj
new file mode 100644
index 0000000..2c5992d
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_image/hl_test_image.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj b/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
new file mode 100644
index 0000000..16f0cf0
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_imagedll/hl_test_imagedll.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj b/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj
new file mode 100644
index 0000000..bf61de9
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_lite/hl_test_lite.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj b/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj
new file mode 100644
index 0000000..ccd3c2e
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_litedll/hl_test_litedll.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj b/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj
new file mode 100644
index 0000000..a1bdfe5
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_packet/hl_test_packet.vcproj
@@ -0,0 +1,177 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj b/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
new file mode 100644
index 0000000..9a4897d
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_packetdll/hl_test_packetdll.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj b/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj
new file mode 100644
index 0000000..309d7c9
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_table/hl_test_table.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj b/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
new file mode 100644
index 0000000..cb4b68e
--- /dev/null
+++ b/windows_vnet/hl/test/hl_test_tabledll/hl_test_tabledll.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/tools/gifconv/gif2h5.vcproj b/windows_vnet/hl/tools/gifconv/gif2h5.vcproj
new file mode 100644
index 0000000..f3d510d
--- /dev/null
+++ b/windows_vnet/hl/tools/gifconv/gif2h5.vcproj
@@ -0,0 +1,256 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/tools/gifconv/h52gif.vcproj b/windows_vnet/hl/tools/gifconv/h52gif.vcproj
new file mode 100644
index 0000000..96be977
--- /dev/null
+++ b/windows_vnet/hl/tools/gifconv/h52gif.vcproj
@@ -0,0 +1,196 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj b/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj
new file mode 100644
index 0000000..425f7e4
--- /dev/null
+++ b/windows_vnet/hl/tools/gifconvdll/gif2h5dll.vcproj
@@ -0,0 +1,252 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj b/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj
new file mode 100644
index 0000000..5f9a402
--- /dev/null
+++ b/windows_vnet/hl/tools/gifconvdll/h52gifdll.vcproj
@@ -0,0 +1,192 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
new file mode 100644
index 0000000..fbc7b52
--- /dev/null
+++ b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
@@ -0,0 +1,172 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln
new file mode 100644
index 0000000..5b28435
--- /dev/null
+++ b/windows_vnet/proj/all/all.sln
@@ -0,0 +1,2300 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE306-9D25-431E-A6FC-A96672B61BCC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{789D2100-56B6-49A3-99AF-445DA3F391D6} = {789D2100-56B6-49A3-99AF-445DA3F391D6}
+		{2C1DDF02-8172-4D46-819E-DE0183240534} = {2C1DDF02-8172-4D46-819E-DE0183240534}
+		{60073504-A294-4946-A2B1-AF878E2074FB} = {60073504-A294-4946-A2B1-AF878E2074FB}
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228} = {765D6604-5EE4-4CDE-8DAE-41DD1D593228}
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36} = {04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}
+		{95938A07-2DAF-47A1-A478-44A6E025BE35} = {95938A07-2DAF-47A1-A478-44A6E025BE35}
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B} = {CEA4820A-A065-4FBA-9E20-59346E25BE4B}
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212} = {FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D} = {4053D90B-2AAC-48B2-8B8F-5945B603770D}
+		{62911A0C-4458-4C38-B317-C637A06BB69A} = {62911A0C-4458-4C38-B317-C637A06BB69A}
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{6C02940C-6632-471A-B6AA-97689660E19F} = {6C02940C-6632-471A-B6AA-97689660E19F}
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176} = {4C61AF0C-E797-4998-95E9-8B1F01A70176}
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE} = {102AD40C-F194-45AE-BF39-D7DD249E9BEE}
+		{44908A0D-6D59-44EC-8E98-290367C74FA4} = {44908A0D-6D59-44EC-8E98-290367C74FA4}
+		{4DA38C0D-62F9-487F-B469-2C822A52D329} = {4DA38C0D-62F9-487F-B469-2C822A52D329}
+		{7F5E4B11-2464-4902-94B8-444B85200ED6} = {7F5E4B11-2464-4902-94B8-444B85200ED6}
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C} = {7A076512-49AF-475E-B4B3-FE5ECF08A51C}
+		{651D8414-0037-41E9-B5D9-C66199430492} = {651D8414-0037-41E9-B5D9-C66199430492}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{4D0DC814-059F-48AF-A344-769B8E477689} = {4D0DC814-059F-48AF-A344-769B8E477689}
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5} = {832B4B18-E0F1-48B7-861E-52856BDA71A5}
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277} = {BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA} = {4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1} = {AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}
+		{CC57681E-7B08-444B-B273-A62E8DF21F42} = {CC57681E-7B08-444B-B273-A62E8DF21F42}
+		{A962981F-AFA5-4643-95F3-791B1D6E831A} = {A962981F-AFA5-4643-95F3-791B1D6E831A}
+		{DFD3DC1F-F288-476D-989B-42190590B715} = {DFD3DC1F-F288-476D-989B-42190590B715}
+		{09172322-8009-4CBD-9888-155E3AE16577} = {09172322-8009-4CBD-9888-155E3AE16577}
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D} = {5C8DC828-95D8-4348-BF50-3BF793419F3D}
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740} = {60AEE12C-3DB3-4F29-83DD-0F81A99D8740}
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B} = {E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE} = {7B4BE637-ABD7-4275-ADC5-F07697D000CE}
+		{8A277C38-1695-423A-9615-88CB95C3F9BF} = {8A277C38-1695-423A-9615-88CB95C3F9BF}
+		{C91B0D39-8757-4F48-AF90-18905D903463} = {C91B0D39-8757-4F48-AF90-18905D903463}
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{8AD4723A-8234-49F8-A43C-01C708336B95} = {8AD4723A-8234-49F8-A43C-01C708336B95}
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15} = {D8936C3C-D850-4843-A2C8-D8FFC1697C15}
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D} = {CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}
+		{D175E848-405F-4481-B856-55E9D7ABE3D2} = {D175E848-405F-4481-B856-55E9D7ABE3D2}
+		{5756834C-FD2F-4944-BF4E-E835AC382E05} = {5756834C-FD2F-4944-BF4E-E835AC382E05}
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9} = {5332A54F-61FF-4CF1-8B23-37D308B237C9}
+		{D386B14F-C188-4E77-9479-10161A33B11A} = {D386B14F-C188-4E77-9479-10161A33B11A}
+		{C0373E50-F542-49DA-A69C-B0547AF7F260} = {C0373E50-F542-49DA-A69C-B0547AF7F260}
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A} = {DC308650-2C44-47EE-AABB-128D06F5DE1A}
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED} = {FCF1C855-2C53-4BB1-932C-A30BFF86ABED}
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138} = {BB1B2D58-D734-4E9C-86AC-00DF71D9D138}
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50} = {525EB35B-90F1-40A9-AAB5-8D34379F2F50}
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673} = {1DBF8E60-A92A-4DAE-9E55-94A167C9C673}
+		{C858A861-3751-40F4-9078-C345FFE7E06F} = {C858A861-3751-40F4-9078-C345FFE7E06F}
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A} = {2A17BE61-F7D3-4661-8E18-03FC32C6D69A}
+		{9CF8F063-D3D3-47D1-A405-096C618C595F} = {9CF8F063-D3D3-47D1-A405-096C618C595F}
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D} = {652D4166-51D6-4AD5-B552-2DE9D0D4696D}
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1} = {09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}
+		{05C2A569-518E-4981-8159-DEDCA98C18CE} = {05C2A569-518E-4981-8159-DEDCA98C18CE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD} = {9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE} = {31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A} = {0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF} = {E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}
+		{55007273-E8A2-46FA-88B1-DC46D482710D} = {55007273-E8A2-46FA-88B1-DC46D482710D}
+		{D0986B75-95F3-47F1-BC73-A6B499625C38} = {D0986B75-95F3-47F1-BC73-A6B499625C38}
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E} = {1AC44D77-3A06-4122-B6AF-0D070F33AE6E}
+		{B179117A-7A08-4133-994B-1BB504CB2E05} = {B179117A-7A08-4133-994B-1BB504CB2E05}
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7} = {3FD25C7C-271C-4448-9744-DF73D5F3BBA7}
+		{D415167E-3583-40B9-8A4C-E24A45648441} = {D415167E-3583-40B9-8A4C-E24A45648441}
+		{5812557E-5D82-446E-BE63-CDEDB420A401} = {5812557E-5D82-446E-BE63-CDEDB420A401}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87} = {4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4} = {71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}
+		{1CB57F87-1075-43CC-9693-ABFD5D296199} = {1CB57F87-1075-43CC-9693-ABFD5D296199}
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A} = {B7655E88-CF1C-41F9-882F-C332D5E27E7A}
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B} = {62A1D388-90C2-4832-81F5-AC94D5D6451B}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{971F8F8A-8A94-401B-8515-04A48685EC3E} = {971F8F8A-8A94-401B-8515-04A48685EC3E}
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4} = {5504BB8B-F0E6-4272-92AC-709ED552B4A4}
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73} = {014BBC8C-7A42-4982-B5D1-572F0C079B73}
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28} = {22ED6791-C270-4F6B-8FD1-113C80B5CA28}
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC} = {E7C23493-C290-4E3E-8F20-4ED68ABF74AC}
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402} = {F6B7BE94-238F-494F-920C-E3CD4AE6F402}
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A} = {E67F9896-6DFB-46EB-BD12-7D948676FF9A}
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157} = {CFCAEA96-B431-4EED-BE7B-C22FA99C6157}
+		{910F4097-5B06-4409-9891-533BE4D9DC7A} = {910F4097-5B06-4409-9891-533BE4D9DC7A}
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E} = {EC041F99-E3BB-476C-BCD0-AE829077EE2E}
+		{8F72DB99-A043-44B4-BDD4-C429E242F342} = {8F72DB99-A043-44B4-BDD4-C429E242F342}
+		{77CB039C-D187-47A7-8715-C122E5241498} = {77CB039C-D187-47A7-8715-C122E5241498}
+		{0B61179E-8C79-459A-8732-067B7FAB2882} = {0B61179E-8C79-459A-8732-067B7FAB2882}
+		{D5D8129F-F82B-42DC-A628-A91FD614C342} = {D5D8129F-F82B-42DC-A628-A91FD614C342}
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F} = {1E2488A0-939D-462B-AE7A-F46EAC09374F}
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB} = {86CA6AA1-8583-4070-A405-8192FB29ACBB}
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB} = {C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A} = {2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60} = {A5D361A5-FA11-468E-ABCA-EB2D73B70B60}
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F} = {7DB326A7-D06A-46F5-932A-6BA884648C9F}
+		{428766A7-CF22-4101-A1A4-CF87C912C719} = {428766A7-CF22-4101-A1A4-CF87C912C719}
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6} = {3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310} = {81F068A9-0C1C-4476-87FA-C7E99DF09310}
+		{56E089AC-CD97-457C-B11A-457B4C987C32} = {56E089AC-CD97-457C-B11A-457B4C987C32}
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792} = {3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57} = {F8AB92B1-77D4-49FA-AB4D-816511BBBF57}
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD} = {79318EB2-5E32-4B97-9C97-7F8522CCFAFD}
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF} = {ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}
+		{01E307B5-C861-467E-85FE-7B86611B720C} = {01E307B5-C861-467E-85FE-7B86611B720C}
+		{50D621B7-BC01-497D-8A49-1301D13C5700} = {50D621B7-BC01-497D-8A49-1301D13C5700}
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17} = {7D5888B8-DC7F-4BA3-A287-25833309FC17}
+		{69467AB9-2611-473E-86E0-B10685985201} = {69467AB9-2611-473E-86E0-B10685985201}
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444} = {A98C18BA-BF6A-4B2D-9555-1076B880F444}
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10} = {7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86} = {B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61} = {D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA} = {93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A} = {2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049} = {4EE5CBC0-4CAC-434D-A7ED-772506DCB049}
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA} = {7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA} = {44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73} = {232F93C6-1E7B-4484-A451-47DB4CB7BE73}
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70} = {EDC9E0C6-8E66-45F4-BACA-709B185BEF70}
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67} = {EDAE78C7-8D3F-49F2-85B8-F965EF843A67}
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0} = {1A754BC9-BFB4-49F1-8142-D66754C783D0}
+		{20276CCF-2478-4FAA-98A9-A485038E00F6} = {20276CCF-2478-4FAA-98A9-A485038E00F6}
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43} = {87670DD1-8236-4A2B-8A7D-3508E2726E43}
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852} = {847B1CD1-1D30-493B-88CC-AD93E76C9852}
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72} = {F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A} = {E938D2DA-8FD2-43A1-8DFB-A865650D486A}
+		{7087E8DA-E282-4828-9594-98D70CBB5390} = {7087E8DA-E282-4828-9594-98D70CBB5390}
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2} = {5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043} = {0E3651DE-4B16-4A67-9EC8-BABF66CE6043}
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4} = {313D79DE-3737-4650-AA60-FCDAD55BBEB4}
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E} = {A00725DF-46B3-47DE-B853-E6EB6D8E053E}
+		{15F365DF-269B-4BC7-9B86-0F9319351168} = {15F365DF-269B-4BC7-9B86-0F9319351168}
+		{FE8966DF-3DC6-421F-AE9C-41D771995560} = {FE8966DF-3DC6-421F-AE9C-41D771995560}
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB} = {CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424} = {4A7300E3-F827-40BB-80FD-BF84F3BE4424}
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA} = {33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D} = {32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18} = {8A4530EB-3E72-43B2-BFC6-88732886DB18}
+		{8F1988EE-613C-4E27-828C-334452EE462E} = {8F1988EE-613C-4E27-828C-334452EE462E}
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF} = {A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}
+		{469F4FF0-EB27-41F7-BC2B-82835815C480} = {469F4FF0-EB27-41F7-BC2B-82835815C480}
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3} = {EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9} = {71F860F2-92C2-4D36-9CD8-587315F36CF9}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88} = {BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7} = {8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}
+		{13E219F6-5806-4857-9932-F9489790B5A2} = {13E219F6-5806-4857-9932-F9489790B5A2}
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3} = {AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442} = {657211FB-1BF5-4DB6-BFEC-88714F0EB442}
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6} = {AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0} = {5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}
+		{D55366FE-FF48-4942-B148-9A5756072B4B} = {D55366FE-FF48-4942-B148-9A5756072B4B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "big", "..\..\test\big\big.vcproj", "{44908A0D-6D59-44EC-8E98-290367C74FA4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigdll", "..\..\test\bigdll\bigdll.vcproj", "{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binread", "..\..\tools\testfiles\binread\binread.vcproj", "{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bittests", "..\..\test\bittests\bittests.vcproj", "{C858A861-3751-40F4-9078-C345FFE7E06F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bittestsdll", "..\..\test\bittestsdll\bittestsdll.vcproj", "{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2", "..\..\test\btree2\btree2.vcproj", "{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btree2dll", "..\..\test\btree2dll\btree2dll.vcproj", "{DC308650-2C44-47EE-AABB-128D06F5DE1A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache", "..\..\TEST\cache\cache.vcproj", "{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_api", "..\..\TEST\cache_api\cache_api.vcproj", "{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cache_apidll", "..\..\TEST\cache_apidll\cache_apidll.vcproj", "{A962981F-AFA5-4643-95F3-791B1D6E831A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cachedll", "..\..\TEST\cachedll\cachedll.vcproj", "{F6B7BE94-238F-494F-920C-E3CD4AE6F402}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk", "..\..\test\chunk\chunk.vcproj", "{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunkdll", "..\..\test\chunkdll\chunkdll.vcproj", "{313D79DE-3737-4650-AA60-FCDAD55BBEB4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dset", "..\..\test\cmpd_dset\cmpd_dset.vcproj", "{62A1D388-90C2-4832-81F5-AC94D5D6451B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmpd_dsetdll", "..\..\test\cmpd_dsetdll\cmpd_dsetdll.vcproj", "{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_read", "..\..\TEST\cross_read\cross_read.vcproj", "{4053D90B-2AAC-48B2-8B8F-5945B603770D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_readdll", "..\..\TEST\cross_readdll\cross_readdll.vcproj", "{9CF8F063-D3D3-47D1-A405-096C618C595F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangle", "..\..\TEST\dangle\dangle.vcproj", "{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dangledll", "..\..\TEST\dangledll\dangledll.vcproj", "{60073504-A294-4946-A2B1-AF878E2074FB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets", "..\..\test\dsets\dsets.vcproj", "{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cpp", "..\..\c++\test\dsets_cpp\dsets_cpp.vcproj", "{22ED6791-C270-4F6B-8FD1-113C80B5CA28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+		{8F1988EE-613C-4E27-828C-334452EE462E} = {8F1988EE-613C-4E27-828C-334452EE462E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsets_cppdll", "..\..\c++\test\dsets_cppdll\dsets_cppdll.vcproj", "{832B4B18-E0F1-48B7-861E-52856BDA71A5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{56E089AC-CD97-457C-B11A-457B4C987C32} = {56E089AC-CD97-457C-B11A-457B4C987C32}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsetsdll", "..\..\test\dsetsdll\dsetsdll.vcproj", "{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arith", "..\..\test\dt_arith\dt_arith.vcproj", "{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt_arithdll", "..\..\test\dt_arithdll\dt_arithdll.vcproj", "{525EB35B-90F1-40A9-AAB5-8D34379F2F50}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransform", "..\..\TEST\dtransform\dtransform.vcproj", "{8F72DB99-A043-44B4-BDD4-C429E242F342}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtransformdll", "..\..\TEST\dtransformdll\dtransformdll.vcproj", "{DFD3DC1F-F288-476D-989B-42190590B715}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypes", "..\..\test\dtypes\dtypes.vcproj", "{8A277C38-1695-423A-9615-88CB95C3F9BF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtypesdll", "..\..\test\dtypesdll\dtypesdll.vcproj", "{7D5888B8-DC7F-4BA3-A287-25833309FC17}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum", "..\..\test\enum\enum.vcproj", "{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enumdll", "..\..\test\enumdll\enumdll.vcproj", "{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compat", "..\..\test\err_compat\err_compat.vcproj", "{8A4530EB-3E72-43B2-BFC6-88732886DB18}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "err_compatdll", "..\..\test\err_compatdll\err_compatdll.vcproj", "{651D8414-0037-41E9-B5D9-C66199430492}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_test", "..\..\test\error_test\error_test.vcproj", "{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "error_testdll", "..\..\test\error_testdll\error_testdll.vcproj", "{652D4166-51D6-4AD5-B552-2DE9D0D4696D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extend", "..\..\test\extend\extend.vcproj", "{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extenddll", "..\..\test\extenddll\extenddll.vcproj", "{7B4BE637-ABD7-4275-ADC5-F07697D000CE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\..\test\external\external.vcproj", "{D55366FE-FF48-4942-B148-9A5756072B4B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "externaldll", "..\..\test\externaldll\externaldll.vcproj", "{1CB57F87-1075-43CC-9693-ABFD5D296199}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheap", "..\..\test\fheap\fheap.vcproj", "{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fheapdll", "..\..\TEST\fheapdll\fheapdll.vcproj", "{1A754BC9-BFB4-49F1-8142-D66754C783D0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillval", "..\..\test\fillval\fillval.vcproj", "{A00725DF-46B3-47DE-B853-E6EB6D8E053E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fillvaldll", "..\..\test\fillvaldll\fillvaldll.vcproj", "{847B1CD1-1D30-493B-88CC-AD93E76C9852}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1", "..\..\test\flush1\flush1.vcproj", "{69467AB9-2611-473E-86E0-B10685985201}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush1dll", "..\..\test\flush1dll\flush1dll.vcproj", "{469F4FF0-EB27-41F7-BC2B-82835815C480}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2", "..\..\test\flush2\flush2.vcproj", "{D5D8129F-F82B-42DC-A628-A91FD614C342}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush2dll", "..\..\test\flush2dll\flush2dll.vcproj", "{62911A0C-4458-4C38-B317-C637A06BB69A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getname", "..\..\TEST\getname\getname.vcproj", "{55007273-E8A2-46FA-88B1-DC46D482710D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getnamedll", "..\..\test\getnamedll\getnamedll.vcproj", "{0B61179E-8C79-459A-8732-067B7FAB2882}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getub", "..\..\TEST\getub\getub.vcproj", "{09172322-8009-4CBD-9888-155E3AE16577}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheap", "..\..\test\gheap\gheap.vcproj", "{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gheapdll", "..\..\test\gheapdll\gheapdll.vcproj", "{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5", "..\..\hl\tools\gifconv\gif2h5.vcproj", "{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h5dll", "..\..\hl\tools\gifconvdll\gif2h5dll.vcproj", "{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gif", "..\..\hl\tools\gifconv\h52gif.vcproj", "{657211FB-1BF5-4DB6-BFEC-88714F0EB442}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h52gifdll", "..\..\hl\tools\gifconvdll\h52gifdll.vcproj", "{D8936C3C-D850-4843-A2C8-D8FFC1697C15}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5copy", "..\..\tools\h5copy\h5copy.vcproj", "{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debug", "..\..\tools\h5debug\h5debug.vcproj", "{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5debugdll", "..\..\tools\h5debugdll\h5debugdll.vcproj", "{7DB326A7-D06A-46F5-932A-6BA884648C9F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diff", "..\..\TOOLS\h5diff\h5diff.vcproj", "{5C8DC828-95D8-4348-BF50-3BF793419F3D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5diffdll", "..\..\TOOLS\h5diffdll\h5diffdll.vcproj", "{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5difftst", "..\..\TOOLS\TESTFILES\h5difftst\h5difftst.vcproj", "{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dump", "..\..\tools\h5dump\h5dump.vcproj", "{789D2100-56B6-49A3-99AF-445DA3F391D6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumpdll", "..\..\tools\h5dumpdll\h5dumpdll.vcproj", "{81F068A9-0C1C-4476-87FA-C7E99DF09310}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5dumptst", "..\..\tools\testfiles\h5dumptst\h5dumptst.vcproj", "{910F4097-5B06-4409-9891-533BE4D9DC7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5import", "..\..\tools\h5import\h5import.vcproj", "{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importdll", "..\..\tools\h5importdll\h5importdll.vcproj", "{4C61AF0C-E797-4998-95E9-8B1F01A70176}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5importtst", "..\..\TOOLS\TESTFILES\h5importtst\h5importtst.vcproj", "{E67F9896-6DFB-46EB-BD12-7D948676FF9A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jam", "..\..\TOOLS\h5jam\h5jam.vcproj", "{A98C18BA-BF6A-4B2D-9555-1076B880F444}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5jamtst", "..\..\TOOLS\TESTFILES\h5jamtst\h5jamtst.vcproj", "{1E2488A0-939D-462B-AE7A-F46EAC09374F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5ls", "..\..\tools\h5ls\h5ls.vcproj", "{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5lsdll", "..\..\tools\h5lsdll\h5lsdll.vcproj", "{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5mkgrp", "..\..\TOOLS\h5mkgrp\h5mkgrp.vcproj", "{B179117A-7A08-4133-994B-1BB504CB2E05}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repack", "..\..\tools\h5repack\h5repack.vcproj", "{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repackdll", "..\..\TOOLS\h5repackdll\h5repackdll.vcproj", "{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repacktst", "..\..\tools\testfiles\h5repacktst\h5repacktst.vcproj", "{D386B14F-C188-4E77-9479-10161A33B11A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repart", "..\..\tools\h5repart\h5repart.vcproj", "{428766A7-CF22-4101-A1A4-CF87C912C719}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repart_gentest", "..\..\TOOLS\TESTFILES\h5repart_gentest\h5repart_gentest.vcproj", "{87670DD1-8236-4A2B-8A7D-3508E2726E43}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5repartdll", "..\..\tools\h5repartdll\h5repartdll.vcproj", "{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5reparttst", "..\..\TOOLS\TESTFILES\h5reparttst\h5reparttst.vcproj", "{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5stat", "..\..\TOOLS\h5stat\h5stat.vcproj", "{E938D2DA-8FD2-43A1-8DFB-A865650D486A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5statdll", "..\..\TOOLS\h5statdll\h5statdll.vcproj", "{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5tinit", "..\..\misc\typegen\h5tinit\h5tinit.vcproj", "{9275256F-8ADC-47C4-A01D-92EA37AF673B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "h5unjam", "..\..\TOOLS\h5unjam\h5unjam.vcproj", "{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "..\hdf5\hdf5.vcproj", "{BB439F14-D29D-4A05-9AB0-0B08682721DE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B} = {9275256F-8ADC-47C4-A01D-92EA37AF673B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cpp", "..\hdf5_cpp\hdf5_cpp.vcproj", "{8F1988EE-613C-4E27-828C-334452EE462E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cppdll", "..\hdf5_cppdll\hdf5_cppdll.vcproj", "{56E089AC-CD97-457C-B11A-457B4C987C32}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl", "..\hdf5_hl\hdf5_hl.vcproj", "{4FC6670C-1339-4C34-9A5D-08D06A644256}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cpp", "..\hdf5_hl_cpp\hdf5_hl_cpp.vcproj", "{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{8F1988EE-613C-4E27-828C-334452EE462E} = {8F1988EE-613C-4E27-828C-334452EE462E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cppdll", "..\hdf5_hl_cppdll\hdf5_hl_cppdll.vcproj", "{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hldll", "..\hdf5_hldll\hdf5_hldll.vcproj", "{50924139-90F9-4913-8FE5-DCF9FA8A94F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5dll", "..\hdf5dll\hdf5dll.vcproj", "{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B} = {9275256F-8ADC-47C4-A01D-92EA37AF673B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_ds", "..\..\HL\TEST\hl_test_ds\hl_test_ds.vcproj", "{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_dsdll", "..\..\hl\test\hl_test_dsdll\hl_test_dsdll.vcproj", "{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_image", "..\..\HL\TEST\hl_test_image\hl_test_image.vcproj", "{C0373E50-F542-49DA-A69C-B0547AF7F260}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_imagedll", "..\..\hl\test\hl_test_imagedll\hl_test_imagedll.vcproj", "{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_lite", "..\..\HL\TEST\hl_test_lite\hl_test_lite.vcproj", "{5504BB8B-F0E6-4272-92AC-709ED552B4A4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_litedll", "..\..\hl\test\hl_test_litedll\hl_test_litedll.vcproj", "{4A7300E3-F827-40BB-80FD-BF84F3BE4424}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packet", "..\..\HL\TEST\hl_test_packet\hl_test_packet.vcproj", "{15F365DF-269B-4BC7-9B86-0F9319351168}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_packetdll", "..\..\hl\test\hl_test_packetdll\hl_test_packetdll.vcproj", "{4D0DC814-059F-48AF-A344-769B8E477689}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table", "..\..\HL\TEST\hl_test_table\hl_test_table.vcproj", "{014BBC8C-7A42-4982-B5D1-572F0C079B73}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4FC6670C-1339-4C34-9A5D-08D06A644256} = {4FC6670C-1339-4C34-9A5D-08D06A644256}
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cpp", "..\..\hl\c++\test\hl_test_table_cpp\hl_test_table_cpp.vcproj", "{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157} = {CFCAEA96-B431-4EED-BE7B-C22FA99C6157}
+		{8F1988EE-613C-4E27-828C-334452EE462E} = {8F1988EE-613C-4E27-828C-334452EE462E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_table_cppdll", "..\..\hl\c++\test\hl_test_table_cppdll\hl_test_table_cppdll.vcproj", "{CEA4820A-A065-4FBA-9E20-59346E25BE4B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED} = {FCF1C855-2C53-4BB1-932C-A30BFF86ABED}
+		{56E089AC-CD97-457C-B11A-457B4C987C32} = {56E089AC-CD97-457C-B11A-457B4C987C32}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hl_test_tabledll", "..\..\hl\test\hl_test_tabledll\hl_test_tabledll.vcproj", "{5812557E-5D82-446E-BE63-CDEDB420A401}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6} = {50924139-90F9-4913-8FE5-DCF9FA8A94F6}
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyperslab", "..\..\test\hyperslab\hyperslab.vcproj", "{86CA6AA1-8583-4070-A405-8192FB29ACBB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hyperslabdll", "..\..\test\hyperslabdll\hyperslabdll.vcproj", "{D415167E-3583-40B9-8A4C-E24A45648441}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iopipe", "..\..\test\iopipe\iopipe.vcproj", "{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iopipedll", "..\..\test\iopipedll\iopipedll.vcproj", "{8AD4723A-8234-49F8-A43C-01C708336B95}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istore", "..\..\test\istore\istore.vcproj", "{13E219F6-5806-4857-9932-F9489790B5A2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "istoredll", "..\..\test\istoredll\istoredll.vcproj", "{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheap", "..\..\test\lheap\lheap.vcproj", "{B7655E88-CF1C-41F9-882F-C332D5E27E7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lheapdll", "..\..\test\lheapdll\lheapdll.vcproj", "{77CB039C-D187-47A7-8715-C122E5241498}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest", "..\..\test\libtest\libtest.vcproj", "{76D3767E-4FB1-4348-B17E-3621DD5712EE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtestD", "..\..\test\libtestD\libtestD.vcproj", "{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "links", "..\..\test\links\links.vcproj", "{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linksdll", "..\..\test\linksdll\linksdll.vcproj", "{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mount", "..\..\test\mount\mount.vcproj", "{7A076512-49AF-475E-B4B3-FE5ECF08A51C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mountdll", "..\..\test\mountdll\mountdll.vcproj", "{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtime", "..\..\test\mtime\mtime.vcproj", "{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtimedll", "..\..\test\mtimedll\mtimedll.vcproj", "{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypes", "..\..\test\ntypes\ntypes.vcproj", "{95938A07-2DAF-47A1-A478-44A6E025BE35}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntypesdll", "..\..\test\ntypesdll\ntypesdll.vcproj", "{FE8966DF-3DC6-421F-AE9C-41D771995560}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopy", "..\..\TEST\objcopy\objcopy.vcproj", "{CC57681E-7B08-444B-B273-A62E8DF21F42}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objcopydll", "..\..\TEST\objcopydll\objcopydll.vcproj", "{C91B0D39-8757-4F48-AF90-18905D903463}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr", "..\..\test\ohdr\ohdr.vcproj", "{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr_gentst", "..\..\TEST\ohdr_gentst\ohdr_gentst.vcproj", "{7F5E4B11-2464-4902-94B8-444B85200ED6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdrdll", "..\..\test\ohdrdll\ohdrdll.vcproj", "{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overhead", "..\..\test\overhead\overhead.vcproj", "{7087E8DA-E282-4828-9594-98D70CBB5390}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "overheaddll", "..\..\test\overheaddll\overheaddll.vcproj", "{5756834C-FD2F-4944-BF4E-E835AC382E05}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pool", "..\..\TEST\pool\pool.vcproj", "{D0986B75-95F3-47F1-BC73-A6B499625C38}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pooldll", "..\..\TEST\pooldll\pooldll.vcproj", "{01E307B5-C861-467E-85FE-7B86611B720C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserved", "..\..\TEST\reserved\reserved.vcproj", "{2C1DDF02-8172-4D46-819E-DE0183240534}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reserveddll", "..\..\TEST\reserveddll\reserveddll.vcproj", "{50D621B7-BC01-497D-8A49-1301D13C5700}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extent", "..\..\TEST\set_extent\set_extent.vcproj", "{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "set_extentdll", "..\..\test\set_extentdll\set_extentdll.vcproj", "{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stab", "..\..\test\stab\stab.vcproj", "{971F8F8A-8A94-401B-8515-04A48685EC3E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stabdll", "..\..\test\stabdll\stabdll.vcproj", "{765D6604-5EE4-4CDE-8DAE-41DD1D593228}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "talign", "..\..\TOOLS\talign\talign.vcproj", "{D175E848-405F-4481-B856-55E9D7ABE3D2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taligndll", "..\..\TOOLS\taligndll\taligndll.vcproj", "{05C2A569-518E-4981-8159-DEDCA98C18CE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tellub", "..\..\TEST\tellub\tellub.vcproj", "{102AD40C-F194-45AE-BF39-D7DD249E9BEE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szip", "..\..\TOOLS\TESTFILES\testh5repack_detect_szip\testh5repack_detect_szip.vcproj", "{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{BC88C469-E7E8-4D02-A388-D378974DEDED} = {BC88C469-E7E8-4D02-A388-D378974DEDED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testh5repack_detect_szipdll", "..\..\TOOLS\TESTFILES\testh5repack_detect_szipdll\testh5repack_detect_szipdll.vcproj", "{EC041F99-E3BB-476C-BCD0-AE829077EE2E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94} = {99251C69-C5DD-4886-85F3-A33ACE4CDB94}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5", "..\..\test\testhdf5\testhdf5.vcproj", "{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cpp", "..\..\C++\TEST\testhdf5_cpp\testhdf5_cpp.vcproj", "{6C02940C-6632-471A-B6AA-97689660E19F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+		{8F1988EE-613C-4E27-828C-334452EE462E} = {8F1988EE-613C-4E27-828C-334452EE462E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5_cppdll", "..\..\c++\test\testhdf5_cppdll\testhdf5_cppdll.vcproj", "{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{56E089AC-CD97-457C-B11A-457B4C987C32} = {56E089AC-CD97-457C-B11A-457B4C987C32}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testhdf5dll", "..\..\test\testhdf5dll\testhdf5dll.vcproj", "{232F93C6-1E7B-4484-A451-47DB4CB7BE73}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslib", "..\..\tools\toolslib\toolslib.vcproj", "{BC88C469-E7E8-4D02-A388-D378974DEDED}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolslibD", "..\..\tools\toolslibD\toolslibD.vcproj", "{99251C69-C5DD-4886-85F3-A33ACE4CDB94}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttsafedll", "..\..\test\ttsafedll\ttsafedll.vcproj", "{159841AE-42DA-4931-B81F-BF9BD580DDF6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlink", "..\..\test\unlink\unlink.vcproj", "{20276CCF-2478-4FAA-98A9-A485038E00F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlinkdll", "..\..\test\unlinkdll\unlinkdll.vcproj", "{5332A54F-61FF-4CF1-8B23-37D308B237C9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfd", "..\..\TEST\vfd\vfd.vcproj", "{71F860F2-92C2-4D36-9CD8-587315F36CF9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfddll", "..\..\TEST\vfddll\vfddll.vcproj", "{4DA38C0D-62F9-487F-B469-2C822A52D329}"
+	ProjectSection(ProjectDependencies) = postProject
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		AlphaDbg = AlphaDbg
+		AlphaRel = AlphaRel
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.AlphaDbg.ActiveCfg = Release|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.AlphaDbg.Build.0 = Release|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.AlphaRel.ActiveCfg = Release|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.AlphaRel.Build.0 = Release|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.Debug.ActiveCfg = Debug|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.Debug.Build.0 = Debug|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.Release.ActiveCfg = Release|Win32
+		{BF2DE306-9D25-431E-A6FC-A96672B61BCC}.Release.Build.0 = Release|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.AlphaRel.Build.0 = AlphaRel|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.Debug.ActiveCfg = Debug|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.Debug.Build.0 = Debug|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.Release.ActiveCfg = Release|Win32
+		{44908A0D-6D59-44EC-8E98-290367C74FA4}.Release.Build.0 = Release|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.AlphaRel.Build.0 = AlphaRel|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.Debug.ActiveCfg = Debug|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.Debug.Build.0 = Debug|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.Release.ActiveCfg = Release|Win32
+		{32CBD1E4-93C9-4BD7-98DD-0CB67F1CFF1D}.Release.Build.0 = Release|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.AlphaDbg.ActiveCfg = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.AlphaDbg.Build.0 = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.AlphaRel.ActiveCfg = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.AlphaRel.Build.0 = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.Debug.ActiveCfg = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.Debug.Build.0 = Debug|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.Release.ActiveCfg = Release|Win32
+		{31C3706B-EDFA-4FE4-A6A5-89AA817ECDCE}.Release.Build.0 = Release|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.AlphaRel.Build.0 = AlphaRel|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.Debug.ActiveCfg = Debug|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.Debug.Build.0 = Debug|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.Release.ActiveCfg = Release|Win32
+		{C858A861-3751-40F4-9078-C345FFE7E06F}.Release.Build.0 = Release|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.AlphaRel.Build.0 = AlphaRel|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.Debug.ActiveCfg = Debug|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.Debug.Build.0 = Debug|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.Release.ActiveCfg = Release|Win32
+		{4DF56F1A-2F9F-4C99-8F0A-65D17D8683BA}.Release.Build.0 = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.AlphaDbg.ActiveCfg = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.AlphaDbg.Build.0 = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.AlphaRel.ActiveCfg = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.AlphaRel.Build.0 = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.Debug.ActiveCfg = Debug|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.Debug.Build.0 = Debug|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.Release.ActiveCfg = Release|Win32
+		{AB0A8DF6-87C0-414B-BDC6-F7CB124F5CF3}.Release.Build.0 = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.AlphaDbg.ActiveCfg = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.AlphaDbg.Build.0 = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.AlphaRel.ActiveCfg = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.AlphaRel.Build.0 = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.Debug.ActiveCfg = Debug|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.Debug.Build.0 = Debug|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.Release.ActiveCfg = Release|Win32
+		{DC308650-2C44-47EE-AABB-128D06F5DE1A}.Release.Build.0 = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.AlphaDbg.ActiveCfg = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.AlphaDbg.Build.0 = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.AlphaRel.ActiveCfg = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.AlphaRel.Build.0 = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.Debug.ActiveCfg = Debug|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.Debug.Build.0 = Debug|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.Release.ActiveCfg = Release|Win32
+		{ACD3E3B3-6C24-4BB0-A49A-B5FCE3F493CF}.Release.Build.0 = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.AlphaDbg.ActiveCfg = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.AlphaDbg.Build.0 = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.AlphaRel.ActiveCfg = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.AlphaRel.Build.0 = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.Debug.ActiveCfg = Debug|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.Debug.Build.0 = Debug|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.Release.ActiveCfg = Release|Win32
+		{C6BCF9A1-67BF-4046-B44A-13FCBB4BBDFB}.Release.Build.0 = Release|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.AlphaDbg.ActiveCfg = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.AlphaDbg.Build.0 = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.AlphaRel.ActiveCfg = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.AlphaRel.Build.0 = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.Debug.ActiveCfg = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.Debug.Build.0 = Debug|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.Release.ActiveCfg = Release|Win32
+		{A962981F-AFA5-4643-95F3-791B1D6E831A}.Release.Build.0 = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.AlphaDbg.ActiveCfg = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.AlphaDbg.Build.0 = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.AlphaRel.ActiveCfg = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.AlphaRel.Build.0 = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.Debug.ActiveCfg = Debug|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.Debug.Build.0 = Debug|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.Release.ActiveCfg = Release|Win32
+		{F6B7BE94-238F-494F-920C-E3CD4AE6F402}.Release.Build.0 = Release|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.AlphaRel.Build.0 = AlphaRel|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.Debug.ActiveCfg = Debug|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.Debug.Build.0 = Debug|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.Release.ActiveCfg = Release|Win32
+		{F45F6DD2-67D6-4F44-BE17-E98FBDBAAA72}.Release.Build.0 = Release|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.AlphaRel.Build.0 = AlphaRel|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.Debug.ActiveCfg = Debug|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.Debug.Build.0 = Debug|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.Release.ActiveCfg = Release|Win32
+		{313D79DE-3737-4650-AA60-FCDAD55BBEB4}.Release.Build.0 = Release|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.AlphaRel.Build.0 = AlphaRel|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.Debug.ActiveCfg = Debug|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.Debug.Build.0 = Debug|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.Release.ActiveCfg = Release|Win32
+		{62A1D388-90C2-4832-81F5-AC94D5D6451B}.Release.Build.0 = Release|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.AlphaRel.Build.0 = AlphaRel|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.Debug.ActiveCfg = Debug|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.Debug.Build.0 = Debug|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.Release.ActiveCfg = Release|Win32
+		{9E3AEF69-EC23-4B40-A013-8F2FE8E42DDD}.Release.Build.0 = Release|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.AlphaDbg.ActiveCfg = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.AlphaDbg.Build.0 = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.AlphaRel.ActiveCfg = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.AlphaRel.Build.0 = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.Debug.ActiveCfg = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.Debug.Build.0 = Debug|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.Release.ActiveCfg = Release|Win32
+		{4053D90B-2AAC-48B2-8B8F-5945B603770D}.Release.Build.0 = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.AlphaDbg.ActiveCfg = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.AlphaDbg.Build.0 = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.AlphaRel.ActiveCfg = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.AlphaRel.Build.0 = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.Debug.ActiveCfg = Debug|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.Debug.Build.0 = Debug|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.Release.ActiveCfg = Release|Win32
+		{9CF8F063-D3D3-47D1-A405-096C618C595F}.Release.Build.0 = Release|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.AlphaDbg.ActiveCfg = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.AlphaDbg.Build.0 = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.AlphaRel.ActiveCfg = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.AlphaRel.Build.0 = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.Debug.ActiveCfg = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.Debug.Build.0 = Debug|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.Release.ActiveCfg = Release|Win32
+		{D1C3E2BE-AC8D-4BEB-9564-970BDE748E61}.Release.Build.0 = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.AlphaDbg.ActiveCfg = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.AlphaDbg.Build.0 = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.AlphaRel.ActiveCfg = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.AlphaRel.Build.0 = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.Debug.ActiveCfg = Debug|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.Debug.Build.0 = Debug|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.Release.ActiveCfg = Release|Win32
+		{60073504-A294-4946-A2B1-AF878E2074FB}.Release.Build.0 = Release|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.AlphaRel.Build.0 = AlphaRel|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.Debug.ActiveCfg = Debug|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.Debug.Build.0 = Debug|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.Release.ActiveCfg = Release|Win32
+		{E7C23493-C290-4E3E-8F20-4ED68ABF74AC}.Release.Build.0 = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.AlphaDbg.ActiveCfg = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.AlphaDbg.Build.0 = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.AlphaRel.ActiveCfg = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.AlphaRel.Build.0 = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.Debug.ActiveCfg = Debug|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.Debug.Build.0 = Debug|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.Release.ActiveCfg = Release|Win32
+		{22ED6791-C270-4F6B-8FD1-113C80B5CA28}.Release.Build.0 = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.AlphaDbg.ActiveCfg = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.AlphaDbg.Build.0 = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.AlphaRel.ActiveCfg = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.AlphaRel.Build.0 = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.Debug.ActiveCfg = Debug|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.Debug.Build.0 = Debug|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.Release.ActiveCfg = Release|Win32
+		{832B4B18-E0F1-48B7-861E-52856BDA71A5}.Release.Build.0 = Release|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.AlphaRel.Build.0 = AlphaRel|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.Debug.ActiveCfg = Debug|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.Debug.Build.0 = Debug|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.Release.ActiveCfg = Release|Win32
+		{BA3A7019-F5E7-48B1-BC35-4D68C2ABC277}.Release.Build.0 = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.AlphaDbg.ActiveCfg = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.AlphaDbg.Build.0 = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.AlphaRel.ActiveCfg = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.AlphaRel.Build.0 = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.Debug.ActiveCfg = Debug|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.Debug.Build.0 = Debug|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.Release.ActiveCfg = Release|Win32
+		{E372E92F-C0B9-4A29-BF4D-9F54737B8A1B}.Release.Build.0 = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.AlphaDbg.ActiveCfg = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.AlphaDbg.Build.0 = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.AlphaRel.ActiveCfg = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.AlphaRel.Build.0 = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.Debug.ActiveCfg = Debug|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.Debug.Build.0 = Debug|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.Release.ActiveCfg = Release|Win32
+		{525EB35B-90F1-40A9-AAB5-8D34379F2F50}.Release.Build.0 = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.AlphaDbg.ActiveCfg = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.AlphaDbg.Build.0 = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.AlphaRel.ActiveCfg = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.AlphaRel.Build.0 = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.Debug.ActiveCfg = Debug|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.Debug.Build.0 = Debug|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.Release.ActiveCfg = Release|Win32
+		{8F72DB99-A043-44B4-BDD4-C429E242F342}.Release.Build.0 = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.AlphaDbg.ActiveCfg = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.AlphaDbg.Build.0 = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.AlphaRel.ActiveCfg = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.AlphaRel.Build.0 = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.Debug.ActiveCfg = Debug|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.Debug.Build.0 = Debug|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.Release.ActiveCfg = Release|Win32
+		{DFD3DC1F-F288-476D-989B-42190590B715}.Release.Build.0 = Release|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.AlphaRel.Build.0 = AlphaRel|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.Debug.ActiveCfg = Debug|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.Debug.Build.0 = Debug|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.Release.ActiveCfg = Release|Win32
+		{8A277C38-1695-423A-9615-88CB95C3F9BF}.Release.Build.0 = Release|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.Debug.ActiveCfg = Debug|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.Debug.Build.0 = Debug|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.Release.ActiveCfg = Release|Win32
+		{7D5888B8-DC7F-4BA3-A287-25833309FC17}.Release.Build.0 = Release|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.AlphaRel.Build.0 = AlphaRel|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.Debug.ActiveCfg = Debug|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.Debug.Build.0 = Debug|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.Release.ActiveCfg = Release|Win32
+		{BB1B2D58-D734-4E9C-86AC-00DF71D9D138}.Release.Build.0 = Release|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.AlphaRel.Build.0 = AlphaRel|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.Debug.ActiveCfg = Debug|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.Debug.Build.0 = Debug|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.Release.ActiveCfg = Release|Win32
+		{CC121DE2-B7FA-423D-9C02-2DBBCF0AA6AB}.Release.Build.0 = Release|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.AlphaDbg.ActiveCfg = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.AlphaDbg.Build.0 = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.AlphaRel.ActiveCfg = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.AlphaRel.Build.0 = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.Debug.ActiveCfg = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.Debug.Build.0 = Debug|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.Release.ActiveCfg = Release|Win32
+		{8A4530EB-3E72-43B2-BFC6-88732886DB18}.Release.Build.0 = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.AlphaDbg.ActiveCfg = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.AlphaDbg.Build.0 = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.AlphaRel.ActiveCfg = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.AlphaRel.Build.0 = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.Debug.ActiveCfg = Debug|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.Debug.Build.0 = Debug|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.Release.ActiveCfg = Release|Win32
+		{651D8414-0037-41E9-B5D9-C66199430492}.Release.Build.0 = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.AlphaDbg.ActiveCfg = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.AlphaDbg.Build.0 = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.AlphaRel.ActiveCfg = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.AlphaRel.Build.0 = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.Debug.ActiveCfg = Debug|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.Debug.Build.0 = Debug|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.Release.ActiveCfg = Release|Win32
+		{8FAC04F5-D97B-4AAD-A79F-B2FD822E84C7}.Release.Build.0 = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.AlphaDbg.ActiveCfg = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.AlphaDbg.Build.0 = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.AlphaRel.ActiveCfg = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.AlphaRel.Build.0 = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.Debug.ActiveCfg = Debug|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.Debug.Build.0 = Debug|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.Release.ActiveCfg = Release|Win32
+		{652D4166-51D6-4AD5-B552-2DE9D0D4696D}.Release.Build.0 = Release|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.AlphaRel.Build.0 = AlphaRel|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.Debug.ActiveCfg = Debug|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.Debug.Build.0 = Debug|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.Release.ActiveCfg = Release|Win32
+		{93D7D0BF-CC78-42FC-9876-F6D4B05F8EFA}.Release.Build.0 = Release|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.Debug.ActiveCfg = Debug|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.Debug.Build.0 = Debug|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.Release.ActiveCfg = Release|Win32
+		{7B4BE637-ABD7-4275-ADC5-F07697D000CE}.Release.Build.0 = Release|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.AlphaRel.Build.0 = AlphaRel|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.Debug.ActiveCfg = Debug|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.Debug.Build.0 = Debug|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.Release.ActiveCfg = Release|Win32
+		{D55366FE-FF48-4942-B148-9A5756072B4B}.Release.Build.0 = Release|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.AlphaRel.Build.0 = AlphaRel|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.Debug.ActiveCfg = Debug|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.Debug.Build.0 = Debug|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.Release.ActiveCfg = Release|Win32
+		{1CB57F87-1075-43CC-9693-ABFD5D296199}.Release.Build.0 = Release|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.AlphaDbg.ActiveCfg = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.AlphaDbg.Build.0 = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.AlphaRel.ActiveCfg = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.AlphaRel.Build.0 = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.Debug.ActiveCfg = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.Debug.Build.0 = Debug|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.Release.ActiveCfg = Release|Win32
+		{2A17BE61-F7D3-4661-8E18-03FC32C6D69A}.Release.Build.0 = Release|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.AlphaDbg.ActiveCfg = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.AlphaDbg.Build.0 = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.AlphaRel.ActiveCfg = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.AlphaRel.Build.0 = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.Debug.ActiveCfg = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.Debug.Build.0 = Debug|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.Release.ActiveCfg = Release|Win32
+		{1A754BC9-BFB4-49F1-8142-D66754C783D0}.Release.Build.0 = Release|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.AlphaRel.Build.0 = AlphaRel|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.Debug.ActiveCfg = Debug|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.Debug.Build.0 = Debug|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.Release.ActiveCfg = Release|Win32
+		{A00725DF-46B3-47DE-B853-E6EB6D8E053E}.Release.Build.0 = Release|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.AlphaRel.Build.0 = AlphaRel|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.Debug.ActiveCfg = Debug|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.Debug.Build.0 = Debug|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.Release.ActiveCfg = Release|Win32
+		{847B1CD1-1D30-493B-88CC-AD93E76C9852}.Release.Build.0 = Release|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.AlphaRel.Build.0 = AlphaRel|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.Debug.ActiveCfg = Debug|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.Debug.Build.0 = Debug|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.Release.ActiveCfg = Release|Win32
+		{69467AB9-2611-473E-86E0-B10685985201}.Release.Build.0 = Release|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.AlphaRel.Build.0 = AlphaRel|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.Debug.ActiveCfg = Debug|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.Debug.Build.0 = Debug|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.Release.ActiveCfg = Release|Win32
+		{469F4FF0-EB27-41F7-BC2B-82835815C480}.Release.Build.0 = Release|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.AlphaRel.Build.0 = AlphaRel|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.Debug.ActiveCfg = Debug|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.Debug.Build.0 = Debug|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.Release.ActiveCfg = Release|Win32
+		{D5D8129F-F82B-42DC-A628-A91FD614C342}.Release.Build.0 = Release|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.AlphaRel.Build.0 = AlphaRel|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.Debug.ActiveCfg = Debug|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.Debug.Build.0 = Debug|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.Release.ActiveCfg = Release|Win32
+		{62911A0C-4458-4C38-B317-C637A06BB69A}.Release.Build.0 = Release|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.AlphaDbg.ActiveCfg = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.AlphaDbg.Build.0 = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.AlphaRel.ActiveCfg = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.AlphaRel.Build.0 = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.Debug.ActiveCfg = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.Debug.Build.0 = Debug|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.Release.ActiveCfg = Release|Win32
+		{55007273-E8A2-46FA-88B1-DC46D482710D}.Release.Build.0 = Release|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.AlphaDbg.ActiveCfg = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.AlphaDbg.Build.0 = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.AlphaRel.ActiveCfg = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.AlphaRel.Build.0 = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.Debug.ActiveCfg = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.Debug.Build.0 = Debug|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.Release.ActiveCfg = Release|Win32
+		{0B61179E-8C79-459A-8732-067B7FAB2882}.Release.Build.0 = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.AlphaDbg.ActiveCfg = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.AlphaDbg.Build.0 = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.AlphaRel.ActiveCfg = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.AlphaRel.Build.0 = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.Debug.ActiveCfg = Debug|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.Debug.Build.0 = Debug|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.Release.ActiveCfg = Release|Win32
+		{09172322-8009-4CBD-9888-155E3AE16577}.Release.Build.0 = Release|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.AlphaRel.Build.0 = AlphaRel|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.Debug.ActiveCfg = Debug|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.Debug.Build.0 = Debug|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.Release.ActiveCfg = Release|Win32
+		{3FD25C7C-271C-4448-9744-DF73D5F3BBA7}.Release.Build.0 = Release|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.Debug.ActiveCfg = Debug|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.Debug.Build.0 = Debug|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.Release.ActiveCfg = Release|Win32
+		{7705E4C3-8A6F-45A7-8BF4-E93C6C8A8EAA}.Release.Build.0 = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.AlphaDbg.ActiveCfg = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.AlphaDbg.Build.0 = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.AlphaRel.ActiveCfg = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.AlphaRel.Build.0 = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.Debug.ActiveCfg = Debug|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.Debug.Build.0 = Debug|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.Release.ActiveCfg = Release|Win32
+		{44DD1BC5-F610-4B2B-BB6E-7A9E3F2BBADA}.Release.Build.0 = Release|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.AlphaDbg.ActiveCfg = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.AlphaDbg.Build.0 = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.AlphaRel.ActiveCfg = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.AlphaRel.Build.0 = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.Debug.ActiveCfg = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.Debug.Build.0 = Debug|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.Release.ActiveCfg = Release|Win32
+		{3CADCEA7-3095-4FC1-B2F1-1A15E2952DC6}.Release.Build.0 = Release|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.AlphaDbg.ActiveCfg = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.AlphaDbg.Build.0 = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.AlphaRel.ActiveCfg = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.AlphaRel.Build.0 = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.Debug.ActiveCfg = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.Debug.Build.0 = Debug|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.Release.ActiveCfg = Release|Win32
+		{657211FB-1BF5-4DB6-BFEC-88714F0EB442}.Release.Build.0 = Release|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.AlphaDbg.ActiveCfg = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.AlphaDbg.Build.0 = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.AlphaRel.ActiveCfg = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.AlphaRel.Build.0 = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.Debug.ActiveCfg = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.Debug.Build.0 = Debug|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.Release.ActiveCfg = Release|Win32
+		{D8936C3C-D850-4843-A2C8-D8FFC1697C15}.Release.Build.0 = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.AlphaDbg.ActiveCfg = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.AlphaDbg.Build.0 = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.AlphaRel.ActiveCfg = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.AlphaRel.Build.0 = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.Debug.ActiveCfg = Debug|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.Debug.Build.0 = Debug|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.Release.ActiveCfg = Release|Win32
+		{EDAE78C7-8D3F-49F2-85B8-F965EF843A67}.Release.Build.0 = Release|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.AlphaRel.Build.0 = AlphaRel|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.Debug.ActiveCfg = Debug|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.Debug.Build.0 = Debug|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.Release.ActiveCfg = Release|Win32
+		{E6C93E73-F2C1-4C7B-BE6D-51AD365A35BF}.Release.Build.0 = Release|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.Debug.ActiveCfg = Debug|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.Debug.Build.0 = Debug|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.Release.ActiveCfg = Release|Win32
+		{7DB326A7-D06A-46F5-932A-6BA884648C9F}.Release.Build.0 = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.AlphaDbg.ActiveCfg = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.AlphaDbg.Build.0 = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.AlphaRel.ActiveCfg = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.AlphaRel.Build.0 = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.Debug.ActiveCfg = Debug|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.Debug.Build.0 = Debug|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.Release.ActiveCfg = Release|Win32
+		{5C8DC828-95D8-4348-BF50-3BF793419F3D}.Release.Build.0 = Release|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.AlphaDbg.ActiveCfg = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.AlphaDbg.Build.0 = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.AlphaRel.ActiveCfg = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.AlphaRel.Build.0 = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.Debug.ActiveCfg = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.Debug.Build.0 = Debug|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.Release.ActiveCfg = Release|Win32
+		{7A2F1FBB-23BC-466F-94E5-808D7C4B2A10}.Release.Build.0 = Release|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.AlphaDbg.ActiveCfg = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.AlphaDbg.Build.0 = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.AlphaRel.ActiveCfg = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.AlphaRel.Build.0 = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.Debug.ActiveCfg = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.Debug.Build.0 = Debug|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.Release.ActiveCfg = Release|Win32
+		{1DBF8E60-A92A-4DAE-9E55-94A167C9C673}.Release.Build.0 = Release|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.AlphaRel.Build.0 = AlphaRel|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.Debug.ActiveCfg = Debug|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.Debug.Build.0 = Debug|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.Release.ActiveCfg = Release|Win32
+		{789D2100-56B6-49A3-99AF-445DA3F391D6}.Release.Build.0 = Release|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.AlphaRel.Build.0 = AlphaRel|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.Debug.ActiveCfg = Debug|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.Debug.Build.0 = Debug|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.Release.ActiveCfg = Release|Win32
+		{81F068A9-0C1C-4476-87FA-C7E99DF09310}.Release.Build.0 = Release|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.AlphaRel.Build.0 = AlphaRel|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.Debug.ActiveCfg = Debug|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.Debug.Build.0 = Debug|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.Release.ActiveCfg = Release|Win32
+		{910F4097-5B06-4409-9891-533BE4D9DC7A}.Release.Build.0 = Release|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.AlphaRel.Build.0 = AlphaRel|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.Debug.ActiveCfg = Debug|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.Debug.Build.0 = Debug|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.Release.ActiveCfg = Release|Win32
+		{79318EB2-5E32-4B97-9C97-7F8522CCFAFD}.Release.Build.0 = Release|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.AlphaRel.Build.0 = AlphaRel|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.Debug.ActiveCfg = Debug|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.Debug.Build.0 = Debug|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.Release.ActiveCfg = Release|Win32
+		{4C61AF0C-E797-4998-95E9-8B1F01A70176}.Release.Build.0 = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.AlphaDbg.ActiveCfg = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.AlphaDbg.Build.0 = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.AlphaRel.ActiveCfg = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.AlphaRel.Build.0 = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.Debug.ActiveCfg = Debug|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.Debug.Build.0 = Debug|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.Release.ActiveCfg = Release|Win32
+		{E67F9896-6DFB-46EB-BD12-7D948676FF9A}.Release.Build.0 = Release|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.AlphaDbg.ActiveCfg = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.AlphaDbg.Build.0 = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.AlphaRel.ActiveCfg = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.AlphaRel.Build.0 = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.Debug.ActiveCfg = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.Debug.Build.0 = Debug|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.Release.ActiveCfg = Release|Win32
+		{A98C18BA-BF6A-4B2D-9555-1076B880F444}.Release.Build.0 = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.AlphaDbg.ActiveCfg = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.AlphaDbg.Build.0 = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.AlphaRel.ActiveCfg = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.AlphaRel.Build.0 = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.Debug.ActiveCfg = Debug|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.Debug.Build.0 = Debug|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.Release.ActiveCfg = Release|Win32
+		{1E2488A0-939D-462B-AE7A-F46EAC09374F}.Release.Build.0 = Release|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.AlphaRel.Build.0 = AlphaRel|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.Debug.ActiveCfg = Debug|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.Debug.Build.0 = Debug|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.Release.ActiveCfg = Release|Win32
+		{0E3651DE-4B16-4A67-9EC8-BABF66CE6043}.Release.Build.0 = Release|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.AlphaRel.Build.0 = AlphaRel|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.Debug.ActiveCfg = Debug|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.Debug.Build.0 = Debug|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.Release.ActiveCfg = Release|Win32
+		{BA7C2CF4-B2FA-4775-B9EC-7CB1161DCD88}.Release.Build.0 = Release|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.AlphaDbg.ActiveCfg = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.AlphaDbg.Build.0 = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.AlphaRel.ActiveCfg = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.AlphaRel.Build.0 = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.Debug.ActiveCfg = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.Debug.Build.0 = Debug|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.Release.ActiveCfg = Release|Win32
+		{B179117A-7A08-4133-994B-1BB504CB2E05}.Release.Build.0 = Release|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.AlphaDbg.ActiveCfg = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.AlphaDbg.Build.0 = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.AlphaRel.ActiveCfg = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.AlphaRel.Build.0 = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.Debug.ActiveCfg = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.Debug.Build.0 = Debug|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.Release.ActiveCfg = Release|Win32
+		{4EE5CBC0-4CAC-434D-A7ED-772506DCB049}.Release.Build.0 = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.AlphaDbg.ActiveCfg = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.AlphaDbg.Build.0 = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.AlphaRel.ActiveCfg = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.AlphaRel.Build.0 = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.Debug.ActiveCfg = Debug|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.Debug.Build.0 = Debug|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.Release.ActiveCfg = Release|Win32
+		{A12E0FEF-4F7C-4F9B-BD5C-A95C5B8A24DF}.Release.Build.0 = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.AlphaDbg.ActiveCfg = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.AlphaDbg.Build.0 = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.AlphaRel.ActiveCfg = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.AlphaRel.Build.0 = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.Debug.ActiveCfg = Debug|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.Debug.Build.0 = Debug|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.Release.ActiveCfg = Release|Win32
+		{D386B14F-C188-4E77-9479-10161A33B11A}.Release.Build.0 = Release|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.AlphaRel.Build.0 = AlphaRel|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.Debug.ActiveCfg = Debug|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.Debug.Build.0 = Debug|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.Release.ActiveCfg = Release|Win32
+		{428766A7-CF22-4101-A1A4-CF87C912C719}.Release.Build.0 = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.AlphaDbg.ActiveCfg = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.AlphaDbg.Build.0 = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.AlphaRel.ActiveCfg = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.AlphaRel.Build.0 = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.Debug.ActiveCfg = Debug|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.Debug.Build.0 = Debug|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.Release.ActiveCfg = Release|Win32
+		{87670DD1-8236-4A2B-8A7D-3508E2726E43}.Release.Build.0 = Release|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.AlphaRel.Build.0 = AlphaRel|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.Debug.ActiveCfg = Debug|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.Debug.Build.0 = Debug|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.Release.ActiveCfg = Release|Win32
+		{B6C13DBE-1213-4245-A1D7-BD2EBB8A1A86}.Release.Build.0 = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.AlphaDbg.ActiveCfg = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.AlphaDbg.Build.0 = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.AlphaRel.ActiveCfg = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.AlphaRel.Build.0 = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.Debug.ActiveCfg = Debug|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.Debug.Build.0 = Debug|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.Release.ActiveCfg = Release|Win32
+		{EC5CD9F1-5264-4C88-AF9C-DFC3E970F2A3}.Release.Build.0 = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.AlphaDbg.ActiveCfg = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.AlphaDbg.Build.0 = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.AlphaRel.ActiveCfg = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.AlphaRel.Build.0 = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.Debug.ActiveCfg = Debug|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.Debug.Build.0 = Debug|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.Release.ActiveCfg = Release|Win32
+		{E938D2DA-8FD2-43A1-8DFB-A865650D486A}.Release.Build.0 = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.AlphaDbg.ActiveCfg = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.AlphaDbg.Build.0 = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.AlphaRel.ActiveCfg = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.AlphaRel.Build.0 = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.Debug.ActiveCfg = Debug|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.Debug.Build.0 = Debug|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.Release.ActiveCfg = Release|Win32
+		{2FC756A4-BDC7-4DA3-A1AC-8E879FE34E8A}.Release.Build.0 = Release|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.AlphaDbg.ActiveCfg = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.AlphaDbg.Build.0 = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.AlphaRel.ActiveCfg = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.AlphaRel.Build.0 = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.Debug.ActiveCfg = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.Debug.Build.0 = Debug|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.Release.ActiveCfg = Release|Win32
+		{9275256F-8ADC-47C4-A01D-92EA37AF673B}.Release.Build.0 = Release|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.AlphaDbg.ActiveCfg = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.AlphaDbg.Build.0 = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.AlphaRel.ActiveCfg = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.AlphaRel.Build.0 = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.Debug.ActiveCfg = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.Debug.Build.0 = Debug|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.Release.ActiveCfg = Release|Win32
+		{F8AB92B1-77D4-49FA-AB4D-816511BBBF57}.Release.Build.0 = Release|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.AlphaRel.Build.0 = AlphaRel|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.Debug.ActiveCfg = Debug|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.Debug.Build.0 = Debug|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.Release.ActiveCfg = Release|Win32
+		{BB439F14-D29D-4A05-9AB0-0B08682721DE}.Release.Build.0 = Release|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.AlphaDbg.ActiveCfg = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.AlphaDbg.Build.0 = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.AlphaRel.ActiveCfg = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.AlphaRel.Build.0 = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.Debug.ActiveCfg = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.Debug.Build.0 = Debug|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.Release.ActiveCfg = Release|Win32
+		{8F1988EE-613C-4E27-828C-334452EE462E}.Release.Build.0 = Release|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.AlphaDbg.ActiveCfg = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.AlphaDbg.Build.0 = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.AlphaRel.ActiveCfg = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.AlphaRel.Build.0 = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.Debug.ActiveCfg = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.Debug.Build.0 = Debug|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.Release.ActiveCfg = Release|Win32
+		{56E089AC-CD97-457C-B11A-457B4C987C32}.Release.Build.0 = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.AlphaDbg.ActiveCfg = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.AlphaDbg.Build.0 = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.AlphaRel.ActiveCfg = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.AlphaRel.Build.0 = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.Debug.ActiveCfg = Debug|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.Debug.Build.0 = Debug|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.Release.ActiveCfg = Release|Win32
+		{4FC6670C-1339-4C34-9A5D-08D06A644256}.Release.Build.0 = Release|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.AlphaDbg.ActiveCfg = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.AlphaDbg.Build.0 = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.AlphaRel.ActiveCfg = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.AlphaRel.Build.0 = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.Debug.ActiveCfg = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.Debug.Build.0 = Debug|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.Release.ActiveCfg = Release|Win32
+		{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}.Release.Build.0 = Release|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.AlphaDbg.ActiveCfg = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.AlphaDbg.Build.0 = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.AlphaRel.ActiveCfg = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.AlphaRel.Build.0 = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.Debug.ActiveCfg = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.Debug.Build.0 = Debug|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.Release.ActiveCfg = Release|Win32
+		{FCF1C855-2C53-4BB1-932C-A30BFF86ABED}.Release.Build.0 = Release|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.AlphaDbg.ActiveCfg = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.AlphaDbg.Build.0 = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.AlphaRel.ActiveCfg = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.AlphaRel.Build.0 = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.Debug.ActiveCfg = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.Debug.Build.0 = Debug|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.Release.ActiveCfg = Release|Win32
+		{50924139-90F9-4913-8FE5-DCF9FA8A94F6}.Release.Build.0 = Release|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.AlphaRel.Build.0 = AlphaRel|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.Debug.ActiveCfg = Debug|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.Debug.Build.0 = Debug|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.Release.ActiveCfg = Release|Win32
+		{B5D88BF3-5F9B-49CC-A677-BF4D364F1163}.Release.Build.0 = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.AlphaDbg.ActiveCfg = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.AlphaDbg.Build.0 = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.AlphaRel.ActiveCfg = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.AlphaRel.Build.0 = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.Debug.ActiveCfg = Debug|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.Debug.Build.0 = Debug|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.Release.ActiveCfg = Release|Win32
+		{0BAA276C-ADA3-4DA6-BF3A-4A95097B8F3A}.Release.Build.0 = Release|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.AlphaDbg.ActiveCfg = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.AlphaDbg.Build.0 = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.AlphaRel.ActiveCfg = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.AlphaRel.Build.0 = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.Debug.ActiveCfg = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.Debug.Build.0 = Debug|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.Release.ActiveCfg = Release|Win32
+		{09EB7369-E430-40A0-9C1F-E7C2D30F7CB1}.Release.Build.0 = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.AlphaDbg.ActiveCfg = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.AlphaDbg.Build.0 = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.AlphaRel.ActiveCfg = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.AlphaRel.Build.0 = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.Debug.ActiveCfg = Debug|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.Debug.Build.0 = Debug|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.Release.ActiveCfg = Release|Win32
+		{C0373E50-F542-49DA-A69C-B0547AF7F260}.Release.Build.0 = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.AlphaDbg.ActiveCfg = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.AlphaDbg.Build.0 = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.AlphaRel.ActiveCfg = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.AlphaRel.Build.0 = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.Debug.ActiveCfg = Debug|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.Debug.Build.0 = Debug|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.Release.ActiveCfg = Release|Win32
+		{60AEE12C-3DB3-4F29-83DD-0F81A99D8740}.Release.Build.0 = Release|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.AlphaDbg.ActiveCfg = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.AlphaDbg.Build.0 = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.AlphaRel.ActiveCfg = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.AlphaRel.Build.0 = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.Debug.ActiveCfg = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.Debug.Build.0 = Debug|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.Release.ActiveCfg = Release|Win32
+		{5504BB8B-F0E6-4272-92AC-709ED552B4A4}.Release.Build.0 = Release|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.AlphaDbg.ActiveCfg = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.AlphaDbg.Build.0 = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.AlphaRel.ActiveCfg = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.AlphaRel.Build.0 = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.Debug.ActiveCfg = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.Debug.Build.0 = Debug|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.Release.ActiveCfg = Release|Win32
+		{4A7300E3-F827-40BB-80FD-BF84F3BE4424}.Release.Build.0 = Release|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.AlphaDbg.ActiveCfg = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.AlphaDbg.Build.0 = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.AlphaRel.ActiveCfg = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.AlphaRel.Build.0 = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.Debug.ActiveCfg = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.Debug.Build.0 = Debug|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.Release.ActiveCfg = Release|Win32
+		{15F365DF-269B-4BC7-9B86-0F9319351168}.Release.Build.0 = Release|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.AlphaDbg.ActiveCfg = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.AlphaDbg.Build.0 = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.AlphaRel.ActiveCfg = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.AlphaRel.Build.0 = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.Debug.ActiveCfg = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.Debug.Build.0 = Debug|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.Release.ActiveCfg = Release|Win32
+		{4D0DC814-059F-48AF-A344-769B8E477689}.Release.Build.0 = Release|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.AlphaDbg.ActiveCfg = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.AlphaDbg.Build.0 = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.AlphaRel.ActiveCfg = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.AlphaRel.Build.0 = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.Debug.ActiveCfg = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.Debug.Build.0 = Debug|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.Release.ActiveCfg = Release|Win32
+		{014BBC8C-7A42-4982-B5D1-572F0C079B73}.Release.Build.0 = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.AlphaDbg.ActiveCfg = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.AlphaDbg.Build.0 = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.AlphaRel.ActiveCfg = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.AlphaRel.Build.0 = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.Debug.ActiveCfg = Debug|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.Debug.Build.0 = Debug|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.Release.ActiveCfg = Release|Win32
+		{FD25A10B-6F50-4BDF-92A8-6B05C0D4F212}.Release.Build.0 = Release|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.AlphaDbg.ActiveCfg = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.AlphaDbg.Build.0 = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.AlphaRel.ActiveCfg = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.AlphaRel.Build.0 = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.Debug.ActiveCfg = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.Debug.Build.0 = Debug|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.Release.ActiveCfg = Release|Win32
+		{CEA4820A-A065-4FBA-9E20-59346E25BE4B}.Release.Build.0 = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.AlphaDbg.ActiveCfg = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.AlphaDbg.Build.0 = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.AlphaRel.ActiveCfg = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.AlphaRel.Build.0 = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.Debug.ActiveCfg = Debug|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.Debug.Build.0 = Debug|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.Release.ActiveCfg = Release|Win32
+		{5812557E-5D82-446E-BE63-CDEDB420A401}.Release.Build.0 = Release|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.AlphaRel.Build.0 = AlphaRel|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.Debug.ActiveCfg = Debug|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.Debug.Build.0 = Debug|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.Release.ActiveCfg = Release|Win32
+		{86CA6AA1-8583-4070-A405-8192FB29ACBB}.Release.Build.0 = Release|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.AlphaRel.Build.0 = AlphaRel|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.Debug.ActiveCfg = Debug|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.Debug.Build.0 = Debug|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.Release.ActiveCfg = Release|Win32
+		{D415167E-3583-40B9-8A4C-E24A45648441}.Release.Build.0 = Release|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.AlphaRel.Build.0 = AlphaRel|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.Debug.ActiveCfg = Debug|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.Debug.Build.0 = Debug|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.Release.ActiveCfg = Release|Win32
+		{5C773CFE-DAA8-4BC7-AAF0-383E8413BDE0}.Release.Build.0 = Release|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.AlphaRel.Build.0 = AlphaRel|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.Debug.ActiveCfg = Debug|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.Debug.Build.0 = Debug|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.Release.ActiveCfg = Release|Win32
+		{8AD4723A-8234-49F8-A43C-01C708336B95}.Release.Build.0 = Release|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.AlphaRel.Build.0 = AlphaRel|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.Debug.ActiveCfg = Debug|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.Debug.Build.0 = Debug|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.Release.ActiveCfg = Release|Win32
+		{13E219F6-5806-4857-9932-F9489790B5A2}.Release.Build.0 = Release|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.AlphaRel.Build.0 = AlphaRel|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.Debug.ActiveCfg = Debug|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.Debug.Build.0 = Debug|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.Release.ActiveCfg = Release|Win32
+		{33DCA7E4-673A-4425-A2BF-072E8CFCF7EA}.Release.Build.0 = Release|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.AlphaRel.Build.0 = AlphaRel|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.Debug.ActiveCfg = Debug|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.Debug.Build.0 = Debug|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.Release.ActiveCfg = Release|Win32
+		{B7655E88-CF1C-41F9-882F-C332D5E27E7A}.Release.Build.0 = Release|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.AlphaRel.Build.0 = AlphaRel|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.Debug.ActiveCfg = Debug|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.Debug.Build.0 = Debug|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.Release.ActiveCfg = Release|Win32
+		{77CB039C-D187-47A7-8715-C122E5241498}.Release.Build.0 = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.AlphaDbg.ActiveCfg = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.AlphaDbg.Build.0 = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.AlphaRel.ActiveCfg = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.AlphaRel.Build.0 = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.Debug.ActiveCfg = Debug|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.Debug.Build.0 = Debug|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.Release.ActiveCfg = Release|Win32
+		{76D3767E-4FB1-4348-B17E-3621DD5712EE}.Release.Build.0 = Release|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.AlphaDbg.ActiveCfg = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.AlphaDbg.Build.0 = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.AlphaRel.ActiveCfg = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.AlphaRel.Build.0 = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.Debug.ActiveCfg = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.Debug.Build.0 = Debug|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.Release.ActiveCfg = Release|Win32
+		{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}.Release.Build.0 = Release|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.AlphaRel.Build.0 = AlphaRel|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.Debug.ActiveCfg = Debug|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.Debug.Build.0 = Debug|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.Release.ActiveCfg = Release|Win32
+		{4FBFA37E-A0AB-41CA-BE62-3F6B0E4FEB87}.Release.Build.0 = Release|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.AlphaRel.Build.0 = AlphaRel|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.Debug.ActiveCfg = Debug|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.Debug.Build.0 = Debug|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.Release.ActiveCfg = Release|Win32
+		{5FFF80DB-8D7C-4970-A1E1-062B2B40DCA2}.Release.Build.0 = Release|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.Debug.ActiveCfg = Debug|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.Debug.Build.0 = Debug|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.Release.ActiveCfg = Release|Win32
+		{7A076512-49AF-475E-B4B3-FE5ECF08A51C}.Release.Build.0 = Release|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.AlphaRel.Build.0 = AlphaRel|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.Debug.ActiveCfg = Debug|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.Debug.Build.0 = Debug|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.Release.ActiveCfg = Release|Win32
+		{71B1B881-97E0-4F57-81C4-C7D8BA5BD9D4}.Release.Build.0 = Release|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.AlphaRel.Build.0 = AlphaRel|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.Debug.ActiveCfg = Debug|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.Debug.Build.0 = Debug|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.Release.ActiveCfg = Release|Win32
+		{A5D361A5-FA11-468E-ABCA-EB2D73B70B60}.Release.Build.0 = Release|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.AlphaRel.Build.0 = AlphaRel|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.Debug.ActiveCfg = Debug|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.Debug.Build.0 = Debug|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.Release.ActiveCfg = Release|Win32
+		{AA07D7FC-80C7-4CC2-A313-D5F497D0ABF6}.Release.Build.0 = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.AlphaDbg.ActiveCfg = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.AlphaDbg.Build.0 = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.AlphaRel.ActiveCfg = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.AlphaRel.Build.0 = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.Debug.ActiveCfg = Debug|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.Debug.Build.0 = Debug|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.Release.ActiveCfg = Release|Win32
+		{95938A07-2DAF-47A1-A478-44A6E025BE35}.Release.Build.0 = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.AlphaDbg.ActiveCfg = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.AlphaDbg.Build.0 = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.AlphaRel.ActiveCfg = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.AlphaRel.Build.0 = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.Debug.ActiveCfg = Debug|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.Debug.Build.0 = Debug|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.Release.ActiveCfg = Release|Win32
+		{FE8966DF-3DC6-421F-AE9C-41D771995560}.Release.Build.0 = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.AlphaDbg.ActiveCfg = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.AlphaDbg.Build.0 = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.AlphaRel.ActiveCfg = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.AlphaRel.Build.0 = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.Debug.ActiveCfg = Debug|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.Debug.Build.0 = Debug|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.Release.ActiveCfg = Release|Win32
+		{CC57681E-7B08-444B-B273-A62E8DF21F42}.Release.Build.0 = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.AlphaDbg.ActiveCfg = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.AlphaDbg.Build.0 = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.AlphaRel.ActiveCfg = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.AlphaRel.Build.0 = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.Debug.ActiveCfg = Debug|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.Debug.Build.0 = Debug|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.Release.ActiveCfg = Release|Win32
+		{C91B0D39-8757-4F48-AF90-18905D903463}.Release.Build.0 = Release|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.AlphaRel.Build.0 = AlphaRel|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Debug.ActiveCfg = Debug|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Debug.Build.0 = Debug|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.ActiveCfg = Release|Win32
+		{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.Build.0 = Release|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.ActiveCfg = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.Build.0 = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.ActiveCfg = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.Build.0 = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.ActiveCfg = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.Build.0 = Debug|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.ActiveCfg = Release|Win32
+		{7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.Build.0 = Release|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaRel.Build.0 = AlphaRel|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.Debug.ActiveCfg = Debug|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.Debug.Build.0 = Debug|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.Release.ActiveCfg = Release|Win32
+		{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.Release.Build.0 = Release|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.AlphaRel.Build.0 = AlphaRel|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.Debug.ActiveCfg = Debug|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.Debug.Build.0 = Debug|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.Release.ActiveCfg = Release|Win32
+		{7087E8DA-E282-4828-9594-98D70CBB5390}.Release.Build.0 = Release|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.AlphaRel.Build.0 = AlphaRel|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.Debug.ActiveCfg = Debug|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.Debug.Build.0 = Debug|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.Release.ActiveCfg = Release|Win32
+		{5756834C-FD2F-4944-BF4E-E835AC382E05}.Release.Build.0 = Release|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.AlphaDbg.ActiveCfg = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.AlphaDbg.Build.0 = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.AlphaRel.ActiveCfg = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.AlphaRel.Build.0 = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.Debug.ActiveCfg = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.Debug.Build.0 = Debug|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.Release.ActiveCfg = Release|Win32
+		{D0986B75-95F3-47F1-BC73-A6B499625C38}.Release.Build.0 = Release|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.AlphaDbg.ActiveCfg = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.AlphaDbg.Build.0 = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.AlphaRel.ActiveCfg = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.AlphaRel.Build.0 = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.Debug.ActiveCfg = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.Debug.Build.0 = Debug|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.Release.ActiveCfg = Release|Win32
+		{01E307B5-C861-467E-85FE-7B86611B720C}.Release.Build.0 = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.AlphaDbg.ActiveCfg = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.AlphaDbg.Build.0 = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.AlphaRel.ActiveCfg = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.AlphaRel.Build.0 = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.Debug.ActiveCfg = Debug|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.Debug.Build.0 = Debug|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.Release.ActiveCfg = Release|Win32
+		{2C1DDF02-8172-4D46-819E-DE0183240534}.Release.Build.0 = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.AlphaDbg.ActiveCfg = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.AlphaDbg.Build.0 = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.AlphaRel.ActiveCfg = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.AlphaRel.Build.0 = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.Debug.ActiveCfg = Debug|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.Debug.Build.0 = Debug|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.Release.ActiveCfg = Release|Win32
+		{50D621B7-BC01-497D-8A49-1301D13C5700}.Release.Build.0 = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.AlphaDbg.ActiveCfg = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.AlphaDbg.Build.0 = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.AlphaRel.ActiveCfg = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.AlphaRel.Build.0 = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.Debug.ActiveCfg = Debug|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.Debug.Build.0 = Debug|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.Release.ActiveCfg = Release|Win32
+		{3FBF2FAE-6316-4CEE-99D2-2EEEC6E48792}.Release.Build.0 = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.AlphaDbg.ActiveCfg = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.AlphaDbg.Build.0 = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.AlphaRel.ActiveCfg = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.AlphaRel.Build.0 = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.Debug.ActiveCfg = Debug|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.Debug.Build.0 = Debug|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.Release.ActiveCfg = Release|Win32
+		{EDC9E0C6-8E66-45F4-BACA-709B185BEF70}.Release.Build.0 = Release|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.AlphaRel.Build.0 = AlphaRel|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.Debug.ActiveCfg = Debug|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.Debug.Build.0 = Debug|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.Release.ActiveCfg = Release|Win32
+		{971F8F8A-8A94-401B-8515-04A48685EC3E}.Release.Build.0 = Release|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.AlphaRel.Build.0 = AlphaRel|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.Debug.ActiveCfg = Debug|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.Debug.Build.0 = Debug|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.Release.ActiveCfg = Release|Win32
+		{765D6604-5EE4-4CDE-8DAE-41DD1D593228}.Release.Build.0 = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.AlphaDbg.ActiveCfg = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.AlphaDbg.Build.0 = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.AlphaRel.ActiveCfg = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.AlphaRel.Build.0 = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.Debug.ActiveCfg = Debug|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.Debug.Build.0 = Debug|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.Release.ActiveCfg = Release|Win32
+		{D175E848-405F-4481-B856-55E9D7ABE3D2}.Release.Build.0 = Release|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.AlphaDbg.ActiveCfg = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.AlphaDbg.Build.0 = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.AlphaRel.ActiveCfg = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.AlphaRel.Build.0 = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.Debug.ActiveCfg = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.Debug.Build.0 = Debug|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.Release.ActiveCfg = Release|Win32
+		{05C2A569-518E-4981-8159-DEDCA98C18CE}.Release.Build.0 = Release|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.AlphaDbg.ActiveCfg = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.AlphaDbg.Build.0 = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.AlphaRel.ActiveCfg = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.AlphaRel.Build.0 = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.Debug.ActiveCfg = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.Debug.Build.0 = Debug|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.Release.ActiveCfg = Release|Win32
+		{102AD40C-F194-45AE-BF39-D7DD249E9BEE}.Release.Build.0 = Release|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.AlphaDbg.ActiveCfg = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.AlphaDbg.Build.0 = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.AlphaRel.ActiveCfg = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.AlphaRel.Build.0 = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.Debug.ActiveCfg = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.Debug.Build.0 = Debug|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.Release.ActiveCfg = Release|Win32
+		{AA3BA41C-927B-43CC-A540-A6DB4C8AB8A1}.Release.Build.0 = Release|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.AlphaDbg.ActiveCfg = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.AlphaDbg.Build.0 = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.AlphaRel.ActiveCfg = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.AlphaRel.Build.0 = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.Debug.ActiveCfg = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.Debug.Build.0 = Debug|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.Release.ActiveCfg = Release|Win32
+		{EC041F99-E3BB-476C-BCD0-AE829077EE2E}.Release.Build.0 = Release|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.AlphaRel.Build.0 = AlphaRel|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.Debug.ActiveCfg = Debug|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.Debug.Build.0 = Debug|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.Release.ActiveCfg = Release|Win32
+		{CE1B5F48-6816-4AF5-963E-6AFB4960DB2D}.Release.Build.0 = Release|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.AlphaDbg.ActiveCfg = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.AlphaDbg.Build.0 = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.AlphaRel.ActiveCfg = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.AlphaRel.Build.0 = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.Debug.ActiveCfg = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.Debug.Build.0 = Debug|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.Release.ActiveCfg = Release|Win32
+		{6C02940C-6632-471A-B6AA-97689660E19F}.Release.Build.0 = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.AlphaDbg.ActiveCfg = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.AlphaDbg.Build.0 = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.AlphaRel.ActiveCfg = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.AlphaRel.Build.0 = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.Debug.ActiveCfg = Debug|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.Debug.Build.0 = Debug|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.Release.ActiveCfg = Release|Win32
+		{2ADDB0C0-EF4E-4D6F-A6DC-9AE3F2C4C95A}.Release.Build.0 = Release|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.AlphaRel.Build.0 = AlphaRel|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.Debug.ActiveCfg = Debug|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.Debug.Build.0 = Debug|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.Release.ActiveCfg = Release|Win32
+		{232F93C6-1E7B-4484-A451-47DB4CB7BE73}.Release.Build.0 = Release|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.AlphaDbg.ActiveCfg = Alphadbg|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.AlphaDbg.Build.0 = Alphadbg|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.AlphaRel.Build.0 = AlphaRel|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.Debug.ActiveCfg = Debug|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.Debug.Build.0 = Debug|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.Release.ActiveCfg = Release|Win32
+		{BC88C469-E7E8-4D02-A388-D378974DEDED}.Release.Build.0 = Release|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.AlphaRel.Build.0 = AlphaRel|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.Debug.ActiveCfg = Debug|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.Debug.Build.0 = Debug|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.Release.ActiveCfg = Release|Win32
+		{99251C69-C5DD-4886-85F3-A33ACE4CDB94}.Release.Build.0 = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaDbg.ActiveCfg = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaDbg.Build.0 = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaRel.ActiveCfg = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.AlphaRel.Build.0 = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.Debug.ActiveCfg = Debug|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.Debug.Build.0 = Debug|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.Release.ActiveCfg = Release|Win32
+		{159841AE-42DA-4931-B81F-BF9BD580DDF6}.Release.Build.0 = Release|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.AlphaRel.Build.0 = AlphaRel|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.Debug.ActiveCfg = Debug|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.Debug.Build.0 = Debug|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.Release.ActiveCfg = Release|Win32
+		{20276CCF-2478-4FAA-98A9-A485038E00F6}.Release.Build.0 = Release|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.AlphaDbg.Build.0 = AlphaDbg|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.AlphaRel.ActiveCfg = AlphaRel|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.AlphaRel.Build.0 = AlphaRel|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.Debug.ActiveCfg = Debug|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.Debug.Build.0 = Debug|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.Release.ActiveCfg = Release|Win32
+		{5332A54F-61FF-4CF1-8B23-37D308B237C9}.Release.Build.0 = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.AlphaDbg.ActiveCfg = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.AlphaDbg.Build.0 = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.AlphaRel.ActiveCfg = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.AlphaRel.Build.0 = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.Debug.ActiveCfg = Debug|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.Debug.Build.0 = Debug|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.Release.ActiveCfg = Release|Win32
+		{71F860F2-92C2-4D36-9CD8-587315F36CF9}.Release.Build.0 = Release|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.AlphaDbg.ActiveCfg = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.AlphaDbg.Build.0 = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.AlphaRel.ActiveCfg = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.AlphaRel.Build.0 = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Debug.ActiveCfg = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Debug.Build.0 = Debug|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.ActiveCfg = Release|Win32
+		{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/windows_vnet/proj/all/all.vcproj b/windows_vnet/proj/all/all.vcproj
new file mode 100644
index 0000000..73cf7f8
--- /dev/null
+++ b/windows_vnet/proj/all/all.vcproj
@@ -0,0 +1,57 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5/hdf5.vcproj b/windows_vnet/proj/hdf5/hdf5.vcproj
new file mode 100644
index 0000000..ac8581d
--- /dev/null
+++ b/windows_vnet/proj/hdf5/hdf5.vcproj
@@ -0,0 +1,7876 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj b/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj
new file mode 100644
index 0000000..bbb2fb4
--- /dev/null
+++ b/windows_vnet/proj/hdf5_cpp/hdf5_cpp.vcproj
@@ -0,0 +1,741 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj b/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj
new file mode 100644
index 0000000..56a8017
--- /dev/null
+++ b/windows_vnet/proj/hdf5_cppdll/hdf5_cppdll.vcproj
@@ -0,0 +1,770 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj b/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj
new file mode 100644
index 0000000..d56b9aa
--- /dev/null
+++ b/windows_vnet/proj/hdf5_hl/hdf5_hl.vcproj
@@ -0,0 +1,271 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
new file mode 100644
index 0000000..605cc94
--- /dev/null
+++ b/windows_vnet/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
@@ -0,0 +1,151 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
new file mode 100644
index 0000000..fa9925a
--- /dev/null
+++ b/windows_vnet/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
@@ -0,0 +1,181 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj
new file mode 100644
index 0000000..6445d92
--- /dev/null
+++ b/windows_vnet/proj/hdf5_hldll/hdf5_hldll.vcproj
@@ -0,0 +1,302 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
new file mode 100644
index 0000000..f4d83a9
--- /dev/null
+++ b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj
@@ -0,0 +1,7923 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/big/big.vcproj b/windows_vnet/test/big/big.vcproj
new file mode 100644
index 0000000..a6e1343
--- /dev/null
+++ b/windows_vnet/test/big/big.vcproj
@@ -0,0 +1,303 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/bigdll/bigdll.vcproj b/windows_vnet/test/bigdll/bigdll.vcproj
new file mode 100644
index 0000000..04ff08b
--- /dev/null
+++ b/windows_vnet/test/bigdll/bigdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/bittests/bittests.vcproj b/windows_vnet/test/bittests/bittests.vcproj
new file mode 100644
index 0000000..a526a9e
--- /dev/null
+++ b/windows_vnet/test/bittests/bittests.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/bittestsdll/bittestsdll.vcproj b/windows_vnet/test/bittestsdll/bittestsdll.vcproj
new file mode 100644
index 0000000..3329eaf
--- /dev/null
+++ b/windows_vnet/test/bittestsdll/bittestsdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/btree2/btree2.vcproj b/windows_vnet/test/btree2/btree2.vcproj
new file mode 100644
index 0000000..953f739
--- /dev/null
+++ b/windows_vnet/test/btree2/btree2.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/btree2dll/btree2dll.vcproj b/windows_vnet/test/btree2dll/btree2dll.vcproj
new file mode 100644
index 0000000..78c296a
--- /dev/null
+++ b/windows_vnet/test/btree2dll/btree2dll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cache/cache.vcproj b/windows_vnet/test/cache/cache.vcproj
new file mode 100644
index 0000000..c46ff24
--- /dev/null
+++ b/windows_vnet/test/cache/cache.vcproj
@@ -0,0 +1,184 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cache_api/cache_api.vcproj b/windows_vnet/test/cache_api/cache_api.vcproj
new file mode 100644
index 0000000..568c009
--- /dev/null
+++ b/windows_vnet/test/cache_api/cache_api.vcproj
@@ -0,0 +1,196 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cache_apidll/cache_apidll.vcproj b/windows_vnet/test/cache_apidll/cache_apidll.vcproj
new file mode 100644
index 0000000..3add955
--- /dev/null
+++ b/windows_vnet/test/cache_apidll/cache_apidll.vcproj
@@ -0,0 +1,194 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cachedll/cachedll.vcproj b/windows_vnet/test/cachedll/cachedll.vcproj
new file mode 100644
index 0000000..b4e206f
--- /dev/null
+++ b/windows_vnet/test/cachedll/cachedll.vcproj
@@ -0,0 +1,182 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/chunk/chunk.vcproj b/windows_vnet/test/chunk/chunk.vcproj
new file mode 100644
index 0000000..b67f7ee
--- /dev/null
+++ b/windows_vnet/test/chunk/chunk.vcproj
@@ -0,0 +1,299 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/chunkdll/chunkdll.vcproj b/windows_vnet/test/chunkdll/chunkdll.vcproj
new file mode 100644
index 0000000..7e52743
--- /dev/null
+++ b/windows_vnet/test/chunkdll/chunkdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj b/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj
new file mode 100644
index 0000000..f006e59
--- /dev/null
+++ b/windows_vnet/test/cmpd_dset/cmpd_dset.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj b/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
new file mode 100644
index 0000000..a9fc91c
--- /dev/null
+++ b/windows_vnet/test/cmpd_dsetdll/cmpd_dsetdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cross_read/cross_read.vcproj b/windows_vnet/test/cross_read/cross_read.vcproj
new file mode 100644
index 0000000..e46fb5f
--- /dev/null
+++ b/windows_vnet/test/cross_read/cross_read.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/cross_readdll/cross_readdll.vcproj b/windows_vnet/test/cross_readdll/cross_readdll.vcproj
new file mode 100644
index 0000000..62208cc
--- /dev/null
+++ b/windows_vnet/test/cross_readdll/cross_readdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dangle/dangle.vcproj b/windows_vnet/test/dangle/dangle.vcproj
new file mode 100644
index 0000000..a963d9f
--- /dev/null
+++ b/windows_vnet/test/dangle/dangle.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dangledll/dangledll.vcproj b/windows_vnet/test/dangledll/dangledll.vcproj
new file mode 100644
index 0000000..050a65b
--- /dev/null
+++ b/windows_vnet/test/dangledll/dangledll.vcproj
@@ -0,0 +1,160 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dsets/dsets.vcproj b/windows_vnet/test/dsets/dsets.vcproj
new file mode 100644
index 0000000..a21173b
--- /dev/null
+++ b/windows_vnet/test/dsets/dsets.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dsetsdll/dsetsdll.vcproj b/windows_vnet/test/dsetsdll/dsetsdll.vcproj
new file mode 100644
index 0000000..87e283d
--- /dev/null
+++ b/windows_vnet/test/dsetsdll/dsetsdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dt_arith/dt_arith.vcproj b/windows_vnet/test/dt_arith/dt_arith.vcproj
new file mode 100644
index 0000000..676afe5
--- /dev/null
+++ b/windows_vnet/test/dt_arith/dt_arith.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj b/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj
new file mode 100644
index 0000000..4c3da12
--- /dev/null
+++ b/windows_vnet/test/dt_arithdll/dt_arithdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dtransform/dtransform.vcproj b/windows_vnet/test/dtransform/dtransform.vcproj
new file mode 100644
index 0000000..7db8d33
--- /dev/null
+++ b/windows_vnet/test/dtransform/dtransform.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dtransformdll/dtransformdll.vcproj b/windows_vnet/test/dtransformdll/dtransformdll.vcproj
new file mode 100644
index 0000000..6e46ca8
--- /dev/null
+++ b/windows_vnet/test/dtransformdll/dtransformdll.vcproj
@@ -0,0 +1,160 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dtypes/dtypes.vcproj b/windows_vnet/test/dtypes/dtypes.vcproj
new file mode 100644
index 0000000..9e2cfc8
--- /dev/null
+++ b/windows_vnet/test/dtypes/dtypes.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/dtypesdll/dtypesdll.vcproj b/windows_vnet/test/dtypesdll/dtypesdll.vcproj
new file mode 100644
index 0000000..8cdd3a9
--- /dev/null
+++ b/windows_vnet/test/dtypesdll/dtypesdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/enum/enum.vcproj b/windows_vnet/test/enum/enum.vcproj
new file mode 100644
index 0000000..dff35ff
--- /dev/null
+++ b/windows_vnet/test/enum/enum.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/enumdll/enumdll.vcproj b/windows_vnet/test/enumdll/enumdll.vcproj
new file mode 100644
index 0000000..fb64385
--- /dev/null
+++ b/windows_vnet/test/enumdll/enumdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/err_compat/err_compat.vcproj b/windows_vnet/test/err_compat/err_compat.vcproj
new file mode 100644
index 0000000..4b0b6f4
--- /dev/null
+++ b/windows_vnet/test/err_compat/err_compat.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/err_compatdll/err_compatdll.vcproj b/windows_vnet/test/err_compatdll/err_compatdll.vcproj
new file mode 100644
index 0000000..8db7a4a
--- /dev/null
+++ b/windows_vnet/test/err_compatdll/err_compatdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/error_test/error_test.vcproj b/windows_vnet/test/error_test/error_test.vcproj
new file mode 100644
index 0000000..a00c973
--- /dev/null
+++ b/windows_vnet/test/error_test/error_test.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/error_testdll/error_testdll.vcproj b/windows_vnet/test/error_testdll/error_testdll.vcproj
new file mode 100644
index 0000000..0b7c4db
--- /dev/null
+++ b/windows_vnet/test/error_testdll/error_testdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/extend/extend.vcproj b/windows_vnet/test/extend/extend.vcproj
new file mode 100644
index 0000000..1d0848f
--- /dev/null
+++ b/windows_vnet/test/extend/extend.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/extenddll/extenddll.vcproj b/windows_vnet/test/extenddll/extenddll.vcproj
new file mode 100644
index 0000000..54a6b1e
--- /dev/null
+++ b/windows_vnet/test/extenddll/extenddll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/external/external.vcproj b/windows_vnet/test/external/external.vcproj
new file mode 100644
index 0000000..f17da03
--- /dev/null
+++ b/windows_vnet/test/external/external.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/externaldll/externaldll.vcproj b/windows_vnet/test/externaldll/externaldll.vcproj
new file mode 100644
index 0000000..1250252
--- /dev/null
+++ b/windows_vnet/test/externaldll/externaldll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/fheap/fheap.vcproj b/windows_vnet/test/fheap/fheap.vcproj
new file mode 100644
index 0000000..15f2259
--- /dev/null
+++ b/windows_vnet/test/fheap/fheap.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/fheapdll/fheapdll.vcproj b/windows_vnet/test/fheapdll/fheapdll.vcproj
new file mode 100644
index 0000000..8bf831d
--- /dev/null
+++ b/windows_vnet/test/fheapdll/fheapdll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/fillval/fillval.vcproj b/windows_vnet/test/fillval/fillval.vcproj
new file mode 100644
index 0000000..6b8e321
--- /dev/null
+++ b/windows_vnet/test/fillval/fillval.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/fillvaldll/fillvaldll.vcproj b/windows_vnet/test/fillvaldll/fillvaldll.vcproj
new file mode 100644
index 0000000..7a41d29
--- /dev/null
+++ b/windows_vnet/test/fillvaldll/fillvaldll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/flush1/flush1.vcproj b/windows_vnet/test/flush1/flush1.vcproj
new file mode 100644
index 0000000..885526b
--- /dev/null
+++ b/windows_vnet/test/flush1/flush1.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/flush1dll/flush1dll.vcproj b/windows_vnet/test/flush1dll/flush1dll.vcproj
new file mode 100644
index 0000000..8eb34a9
--- /dev/null
+++ b/windows_vnet/test/flush1dll/flush1dll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/flush2/flush2.vcproj b/windows_vnet/test/flush2/flush2.vcproj
new file mode 100644
index 0000000..c2370bb
--- /dev/null
+++ b/windows_vnet/test/flush2/flush2.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/flush2dll/flush2dll.vcproj b/windows_vnet/test/flush2dll/flush2dll.vcproj
new file mode 100644
index 0000000..36ca1a5
--- /dev/null
+++ b/windows_vnet/test/flush2dll/flush2dll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/getname/getname.vcproj b/windows_vnet/test/getname/getname.vcproj
new file mode 100644
index 0000000..7027db9
--- /dev/null
+++ b/windows_vnet/test/getname/getname.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/getnamedll/getnamedll.vcproj b/windows_vnet/test/getnamedll/getnamedll.vcproj
new file mode 100644
index 0000000..1ce7406
--- /dev/null
+++ b/windows_vnet/test/getnamedll/getnamedll.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/getub/getub.vcproj b/windows_vnet/test/getub/getub.vcproj
new file mode 100644
index 0000000..a5d36ee
--- /dev/null
+++ b/windows_vnet/test/getub/getub.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/gheap/gheap.vcproj b/windows_vnet/test/gheap/gheap.vcproj
new file mode 100644
index 0000000..b05c39e
--- /dev/null
+++ b/windows_vnet/test/gheap/gheap.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/gheapdll/gheapdll.vcproj b/windows_vnet/test/gheapdll/gheapdll.vcproj
new file mode 100644
index 0000000..932dc38
--- /dev/null
+++ b/windows_vnet/test/gheapdll/gheapdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/hyperslab/hyperslab.vcproj b/windows_vnet/test/hyperslab/hyperslab.vcproj
new file mode 100644
index 0000000..2d2ba00
--- /dev/null
+++ b/windows_vnet/test/hyperslab/hyperslab.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj b/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj
new file mode 100644
index 0000000..7555e28
--- /dev/null
+++ b/windows_vnet/test/hyperslabdll/hyperslabdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/iopipe/iopipe.vcproj b/windows_vnet/test/iopipe/iopipe.vcproj
new file mode 100644
index 0000000..2263925
--- /dev/null
+++ b/windows_vnet/test/iopipe/iopipe.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/iopipedll/iopipedll.vcproj b/windows_vnet/test/iopipedll/iopipedll.vcproj
new file mode 100644
index 0000000..97fe1bb
--- /dev/null
+++ b/windows_vnet/test/iopipedll/iopipedll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/istore/istore.vcproj b/windows_vnet/test/istore/istore.vcproj
new file mode 100644
index 0000000..d5a228b
--- /dev/null
+++ b/windows_vnet/test/istore/istore.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/istoredll/istoredll.vcproj b/windows_vnet/test/istoredll/istoredll.vcproj
new file mode 100644
index 0000000..811a374
--- /dev/null
+++ b/windows_vnet/test/istoredll/istoredll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/lheap/lheap.vcproj b/windows_vnet/test/lheap/lheap.vcproj
new file mode 100644
index 0000000..06b3585
--- /dev/null
+++ b/windows_vnet/test/lheap/lheap.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/lheapdll/lheapdll.vcproj b/windows_vnet/test/lheapdll/lheapdll.vcproj
new file mode 100644
index 0000000..c295892
--- /dev/null
+++ b/windows_vnet/test/lheapdll/lheapdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/libtest/libtest.vcproj b/windows_vnet/test/libtest/libtest.vcproj
new file mode 100644
index 0000000..85041bb
--- /dev/null
+++ b/windows_vnet/test/libtest/libtest.vcproj
@@ -0,0 +1,179 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/libtestD/libtestD.vcproj b/windows_vnet/test/libtestD/libtestD.vcproj
new file mode 100644
index 0000000..c8421da
--- /dev/null
+++ b/windows_vnet/test/libtestD/libtestD.vcproj
@@ -0,0 +1,202 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/links/links.vcproj b/windows_vnet/test/links/links.vcproj
new file mode 100644
index 0000000..37bb9f2
--- /dev/null
+++ b/windows_vnet/test/links/links.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/linksdll/linksdll.vcproj b/windows_vnet/test/linksdll/linksdll.vcproj
new file mode 100644
index 0000000..779c35a
--- /dev/null
+++ b/windows_vnet/test/linksdll/linksdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/mount/mount.vcproj b/windows_vnet/test/mount/mount.vcproj
new file mode 100644
index 0000000..2d6fb2a
--- /dev/null
+++ b/windows_vnet/test/mount/mount.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/mountdll/mountdll.vcproj b/windows_vnet/test/mountdll/mountdll.vcproj
new file mode 100644
index 0000000..c095c1b
--- /dev/null
+++ b/windows_vnet/test/mountdll/mountdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/mtime/mtime.vcproj b/windows_vnet/test/mtime/mtime.vcproj
new file mode 100644
index 0000000..e758c2f
--- /dev/null
+++ b/windows_vnet/test/mtime/mtime.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/mtimedll/mtimedll.vcproj b/windows_vnet/test/mtimedll/mtimedll.vcproj
new file mode 100644
index 0000000..5f85975
--- /dev/null
+++ b/windows_vnet/test/mtimedll/mtimedll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ntypes/ntypes.vcproj b/windows_vnet/test/ntypes/ntypes.vcproj
new file mode 100644
index 0000000..93acb17
--- /dev/null
+++ b/windows_vnet/test/ntypes/ntypes.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ntypesdll/ntypesdll.vcproj b/windows_vnet/test/ntypesdll/ntypesdll.vcproj
new file mode 100644
index 0000000..3b1bbed
--- /dev/null
+++ b/windows_vnet/test/ntypesdll/ntypesdll.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/objcopy/objcopy.vcproj b/windows_vnet/test/objcopy/objcopy.vcproj
new file mode 100644
index 0000000..e5dfcc1
--- /dev/null
+++ b/windows_vnet/test/objcopy/objcopy.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/objcopydll/objcopydll.vcproj b/windows_vnet/test/objcopydll/objcopydll.vcproj
new file mode 100644
index 0000000..ed29e0f
--- /dev/null
+++ b/windows_vnet/test/objcopydll/objcopydll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ohdr/ohdr.vcproj b/windows_vnet/test/ohdr/ohdr.vcproj
new file mode 100644
index 0000000..a241522
--- /dev/null
+++ b/windows_vnet/test/ohdr/ohdr.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj b/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj
new file mode 100644
index 0000000..c2359f4
--- /dev/null
+++ b/windows_vnet/test/ohdr_gentst/ohdr_gentst.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ohdrdll/ohdrdll.vcproj b/windows_vnet/test/ohdrdll/ohdrdll.vcproj
new file mode 100644
index 0000000..6893bf6
--- /dev/null
+++ b/windows_vnet/test/ohdrdll/ohdrdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/overhead/overhead.vcproj b/windows_vnet/test/overhead/overhead.vcproj
new file mode 100644
index 0000000..d223a5b
--- /dev/null
+++ b/windows_vnet/test/overhead/overhead.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/overheaddll/overheaddll.vcproj b/windows_vnet/test/overheaddll/overheaddll.vcproj
new file mode 100644
index 0000000..58a95b6
--- /dev/null
+++ b/windows_vnet/test/overheaddll/overheaddll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/pool/pool.vcproj b/windows_vnet/test/pool/pool.vcproj
new file mode 100644
index 0000000..301d16d
--- /dev/null
+++ b/windows_vnet/test/pool/pool.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/pooldll/pooldll.vcproj b/windows_vnet/test/pooldll/pooldll.vcproj
new file mode 100644
index 0000000..27118b9
--- /dev/null
+++ b/windows_vnet/test/pooldll/pooldll.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/reserved/reserved.vcproj b/windows_vnet/test/reserved/reserved.vcproj
new file mode 100644
index 0000000..d2cd2e7
--- /dev/null
+++ b/windows_vnet/test/reserved/reserved.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/reserveddll/reserveddll.vcproj b/windows_vnet/test/reserveddll/reserveddll.vcproj
new file mode 100644
index 0000000..79d4884
--- /dev/null
+++ b/windows_vnet/test/reserveddll/reserveddll.vcproj
@@ -0,0 +1,162 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/set_extent/set_extent.vcproj b/windows_vnet/test/set_extent/set_extent.vcproj
new file mode 100644
index 0000000..b78a75d
--- /dev/null
+++ b/windows_vnet/test/set_extent/set_extent.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/set_extentdll/set_extentdll.vcproj b/windows_vnet/test/set_extentdll/set_extentdll.vcproj
new file mode 100644
index 0000000..0005821
--- /dev/null
+++ b/windows_vnet/test/set_extentdll/set_extentdll.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/stab/stab.vcproj b/windows_vnet/test/stab/stab.vcproj
new file mode 100644
index 0000000..bc94d40
--- /dev/null
+++ b/windows_vnet/test/stab/stab.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/stabdll/stabdll.vcproj b/windows_vnet/test/stabdll/stabdll.vcproj
new file mode 100644
index 0000000..9f8d905
--- /dev/null
+++ b/windows_vnet/test/stabdll/stabdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/tellub/tellub.vcproj b/windows_vnet/test/tellub/tellub.vcproj
new file mode 100644
index 0000000..f8369a4
--- /dev/null
+++ b/windows_vnet/test/tellub/tellub.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/testhdf5/testhdf5.vcproj b/windows_vnet/test/testhdf5/testhdf5.vcproj
new file mode 100644
index 0000000..b9e521b
--- /dev/null
+++ b/windows_vnet/test/testhdf5/testhdf5.vcproj
@@ -0,0 +1,1172 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj b/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj
new file mode 100644
index 0000000..a15e773
--- /dev/null
+++ b/windows_vnet/test/testhdf5dll/testhdf5dll.vcproj
@@ -0,0 +1,1131 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/ttsafedll/ttsafedll.vcproj b/windows_vnet/test/ttsafedll/ttsafedll.vcproj
new file mode 100644
index 0000000..d04378e
--- /dev/null
+++ b/windows_vnet/test/ttsafedll/ttsafedll.vcproj
@@ -0,0 +1,254 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/unlink/unlink.vcproj b/windows_vnet/test/unlink/unlink.vcproj
new file mode 100644
index 0000000..4459ae3
--- /dev/null
+++ b/windows_vnet/test/unlink/unlink.vcproj
@@ -0,0 +1,297 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/unlinkdll/unlinkdll.vcproj b/windows_vnet/test/unlinkdll/unlinkdll.vcproj
new file mode 100644
index 0000000..b993529
--- /dev/null
+++ b/windows_vnet/test/unlinkdll/unlinkdll.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/vfd/vfd.vcproj b/windows_vnet/test/vfd/vfd.vcproj
new file mode 100644
index 0000000..8ed82a8
--- /dev/null
+++ b/windows_vnet/test/vfd/vfd.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/test/vfddll/vfddll.vcproj b/windows_vnet/test/vfddll/vfddll.vcproj
new file mode 100644
index 0000000..2ce9831
--- /dev/null
+++ b/windows_vnet/test/vfddll/vfddll.vcproj
@@ -0,0 +1,178 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5copy/h5copy.vcproj b/windows_vnet/tools/h5copy/h5copy.vcproj
new file mode 100644
index 0000000..1493f62
--- /dev/null
+++ b/windows_vnet/tools/h5copy/h5copy.vcproj
@@ -0,0 +1,176 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5debug/h5debug.vcproj b/windows_vnet/tools/h5debug/h5debug.vcproj
new file mode 100644
index 0000000..5f6d5a1
--- /dev/null
+++ b/windows_vnet/tools/h5debug/h5debug.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5debugdll/h5debugdll.vcproj b/windows_vnet/tools/h5debugdll/h5debugdll.vcproj
new file mode 100644
index 0000000..faf5db7
--- /dev/null
+++ b/windows_vnet/tools/h5debugdll/h5debugdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5diff/h5diff.vcproj b/windows_vnet/tools/h5diff/h5diff.vcproj
new file mode 100644
index 0000000..47c04d0
--- /dev/null
+++ b/windows_vnet/tools/h5diff/h5diff.vcproj
@@ -0,0 +1,187 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5diffdll/h5diffdll.vcproj b/windows_vnet/tools/h5diffdll/h5diffdll.vcproj
new file mode 100644
index 0000000..e314e9e
--- /dev/null
+++ b/windows_vnet/tools/h5diffdll/h5diffdll.vcproj
@@ -0,0 +1,180 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5dump/h5dump.vcproj b/windows_vnet/tools/h5dump/h5dump.vcproj
new file mode 100644
index 0000000..4efdf07
--- /dev/null
+++ b/windows_vnet/tools/h5dump/h5dump.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj b/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj
new file mode 100644
index 0000000..337b1fe
--- /dev/null
+++ b/windows_vnet/tools/h5dumpdll/h5dumpdll.vcproj
@@ -0,0 +1,293 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5import/h5import.vcproj b/windows_vnet/tools/h5import/h5import.vcproj
new file mode 100644
index 0000000..6e0bfbf
--- /dev/null
+++ b/windows_vnet/tools/h5import/h5import.vcproj
@@ -0,0 +1,292 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5importdll/h5importdll.vcproj b/windows_vnet/tools/h5importdll/h5importdll.vcproj
new file mode 100644
index 0000000..759c965
--- /dev/null
+++ b/windows_vnet/tools/h5importdll/h5importdll.vcproj
@@ -0,0 +1,288 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5jam/h5jam.vcproj b/windows_vnet/tools/h5jam/h5jam.vcproj
new file mode 100644
index 0000000..c871c84
--- /dev/null
+++ b/windows_vnet/tools/h5jam/h5jam.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5ls/h5ls.vcproj b/windows_vnet/tools/h5ls/h5ls.vcproj
new file mode 100644
index 0000000..efae8be
--- /dev/null
+++ b/windows_vnet/tools/h5ls/h5ls.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5lsdll/h5lsdll.vcproj b/windows_vnet/tools/h5lsdll/h5lsdll.vcproj
new file mode 100644
index 0000000..8763ab8
--- /dev/null
+++ b/windows_vnet/tools/h5lsdll/h5lsdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj b/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj
new file mode 100644
index 0000000..de42ccc
--- /dev/null
+++ b/windows_vnet/tools/h5mkgrp/h5mkgrp.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5repack/h5repack.vcproj b/windows_vnet/tools/h5repack/h5repack.vcproj
new file mode 100644
index 0000000..12522bb
--- /dev/null
+++ b/windows_vnet/tools/h5repack/h5repack.vcproj
@@ -0,0 +1,329 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5repackdll/h5repackdll.vcproj b/windows_vnet/tools/h5repackdll/h5repackdll.vcproj
new file mode 100644
index 0000000..ec71424
--- /dev/null
+++ b/windows_vnet/tools/h5repackdll/h5repackdll.vcproj
@@ -0,0 +1,315 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5repart/h5repart.vcproj b/windows_vnet/tools/h5repart/h5repart.vcproj
new file mode 100644
index 0000000..c3782e5
--- /dev/null
+++ b/windows_vnet/tools/h5repart/h5repart.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5repartdll/h5repartdll.vcproj b/windows_vnet/tools/h5repartdll/h5repartdll.vcproj
new file mode 100644
index 0000000..61e63e5
--- /dev/null
+++ b/windows_vnet/tools/h5repartdll/h5repartdll.vcproj
@@ -0,0 +1,291 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5stat/h5stat.vcproj b/windows_vnet/tools/h5stat/h5stat.vcproj
new file mode 100644
index 0000000..5d7deb1
--- /dev/null
+++ b/windows_vnet/tools/h5stat/h5stat.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5statdll/h5statdll.vcproj b/windows_vnet/tools/h5statdll/h5statdll.vcproj
new file mode 100644
index 0000000..6150228
--- /dev/null
+++ b/windows_vnet/tools/h5statdll/h5statdll.vcproj
@@ -0,0 +1,173 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/h5unjam/h5unjam.vcproj b/windows_vnet/tools/h5unjam/h5unjam.vcproj
new file mode 100644
index 0000000..9af9423
--- /dev/null
+++ b/windows_vnet/tools/h5unjam/h5unjam.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/talign/talign.vcproj b/windows_vnet/tools/talign/talign.vcproj
new file mode 100644
index 0000000..95c42b6
--- /dev/null
+++ b/windows_vnet/tools/talign/talign.vcproj
@@ -0,0 +1,164 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/taligndll/taligndll.vcproj b/windows_vnet/tools/taligndll/taligndll.vcproj
new file mode 100644
index 0000000..cb54694
--- /dev/null
+++ b/windows_vnet/tools/taligndll/taligndll.vcproj
@@ -0,0 +1,162 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/binread/binread.vcproj b/windows_vnet/tools/testfiles/binread/binread.vcproj
new file mode 100644
index 0000000..8ee31a0
--- /dev/null
+++ b/windows_vnet/tools/testfiles/binread/binread.vcproj
@@ -0,0 +1,166 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5difftst/h5difftst.vcproj b/windows_vnet/tools/testfiles/h5difftst/h5difftst.vcproj
new file mode 100644
index 0000000..c4be8a6
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5difftst/h5difftst.vcproj
@@ -0,0 +1,179 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj b/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj
new file mode 100644
index 0000000..7ea2947
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5dumptst/h5dumptst.vcproj
@@ -0,0 +1,295 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj b/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj
new file mode 100644
index 0000000..e476e57
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5importtst/h5importtst.vcproj
@@ -0,0 +1,160 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj b/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj
new file mode 100644
index 0000000..bac1195
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5jamtst/h5jamtst.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj b/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj
new file mode 100644
index 0000000..c73cbfd
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5repacktst/h5repacktst.vcproj
@@ -0,0 +1,329 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj b/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
new file mode 100644
index 0000000..afc7bfc
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj b/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj
new file mode 100644
index 0000000..6684fef
--- /dev/null
+++ b/windows_vnet/tools/testfiles/h5reparttst/h5reparttst.vcproj
@@ -0,0 +1,174 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+			
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj b/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
new file mode 100644
index 0000000..1b3a1f1
--- /dev/null
+++ b/windows_vnet/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj b/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
new file mode 100644
index 0000000..8ab4913
--- /dev/null
+++ b/windows_vnet/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
@@ -0,0 +1,160 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/toolslib/toolslib.vcproj b/windows_vnet/tools/toolslib/toolslib.vcproj
new file mode 100644
index 0000000..25fb423
--- /dev/null
+++ b/windows_vnet/tools/toolslib/toolslib.vcproj
@@ -0,0 +1,660 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/windows_vnet/tools/toolslibD/toolslibD.vcproj b/windows_vnet/tools/toolslibD/toolslibD.vcproj
new file mode 100644
index 0000000..7cd8024
--- /dev/null
+++ b/windows_vnet/tools/toolslibD/toolslibD.vcproj
@@ -0,0 +1,660 @@
+
+
+	
+		
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/windows_vs6/COPYING b/windows_vs6/COPYING
deleted file mode 100755
index ef0cbaf..0000000
--- a/windows_vs6/COPYING
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Copyright by  The HDF Group (THG) and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are 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://www.hdfgroup.org/HDF5/doc/Copyright.html.  If you do not 
-  have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsp b/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsp
deleted file mode 100755
index b709c4c..0000000
--- a/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="allcppexamples" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=allcppexamples - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "allcppexamples.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "allcppexamples.mak" CFG="allcppexamples - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "allcppexamples - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "allcppexamples - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "allcppexamples - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "allcppexamples - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "allcppexamples - Win32 Release"
-# Name "allcppexamples - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsw b/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsw
deleted file mode 100755
index 689a61d..0000000
--- a/windows_vs6/c++/examples/allcppexamples/allcppexamples.dsw
+++ /dev/null
@@ -1,239 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "allcppexamples"=".\allcppexamples.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name compoundtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name createtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extend_dstest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5grouptest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name readdatatest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name writedatatest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunkstest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunkstestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name compoundtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name createtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extend_dstestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5grouptestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name readdatatestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name writedatatestdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "chunkstest"="..\chunkstest\chunkstest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "chunkstestdll"="..\chunkstestdll\chunkstestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtest"="..\compoundtest\compoundtest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtestdll"="..\compoundtestdll\compoundtestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "createtest"="..\createtest\createtest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "createtestdll"="..\createtestdll\createtestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "extend_dstest"="..\extend_dstest\extend_dstest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "extend_dstestdll"="..\extend_dstestdll\extend_dstestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "h5grouptest"="..\h5grouptest\h5grouptest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "h5grouptestdll"="..\h5grouptestdll\h5grouptestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "readdatatest"="..\readdatatest\readdatatest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "readdatatestdll"="..\readdatatestdll\readdatatestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "writedatatest"="..\writedatatest\writedatatest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "writedatatestdll"="..\writedatatestdll\writedatatestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/c++/examples/chunkstest/chunkstest.dsp b/windows_vs6/c++/examples/chunkstest/chunkstest.dsp
deleted file mode 100755
index 7c73160..0000000
--- a/windows_vs6/c++/examples/chunkstest/chunkstest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunkstest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=chunkstest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkstest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkstest.mak" CFG="chunkstest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunkstest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkstest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "chunkstest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/chunkstest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/chunkstest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "chunkstest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/chunkstest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/chunkstest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunkstest - Win32 Release"
-# Name "chunkstest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\chunks.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/chunkstestdll/chunkstestdll.dsp b/windows_vs6/c++/examples/chunkstestdll/chunkstestdll.dsp
deleted file mode 100755
index ff96467..0000000
--- a/windows_vs6/c++/examples/chunkstestdll/chunkstestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunkstestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=chunkstestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkstestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkstestdll.mak" CFG="chunkstestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunkstestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkstestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "chunkstestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/chunkstestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/chunkstestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "chunkstestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/chunkstestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/chunkstestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunkstestdll - Win32 Release"
-# Name "chunkstestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\chunks.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/compoundtest/compoundtest.dsp b/windows_vs6/c++/examples/compoundtest/compoundtest.dsp
deleted file mode 100755
index 51cae62..0000000
--- a/windows_vs6/c++/examples/compoundtest/compoundtest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak" CFG="compoundtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/compoundtest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/compoundtest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "compoundtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/compoundtest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/compoundtest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtest - Win32 Release"
-# Name "compoundtest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\compound.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/compoundtestdll/compoundtestdll.dsp b/windows_vs6/c++/examples/compoundtestdll/compoundtestdll.dsp
deleted file mode 100755
index 2b075be..0000000
--- a/windows_vs6/c++/examples/compoundtestdll/compoundtestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak" CFG="compoundtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/compoundtestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/compoundtestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "compoundtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/compoundtestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/compoundtestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtestdll - Win32 Release"
-# Name "compoundtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\compound.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/createtest/createtest.dsp b/windows_vs6/c++/examples/createtest/createtest.dsp
deleted file mode 100755
index 9411b0c..0000000
--- a/windows_vs6/c++/examples/createtest/createtest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="createtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=createtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "createtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "createtest.mak" CFG="createtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "createtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "createtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "createtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/createtest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/createtest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "createtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/createtest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/createtest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "createtest - Win32 Release"
-# Name "createtest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\create.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/createtestdll/createtestdll.dsp b/windows_vs6/c++/examples/createtestdll/createtestdll.dsp
deleted file mode 100755
index 1064046..0000000
--- a/windows_vs6/c++/examples/createtestdll/createtestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="createtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=createtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "createtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "createtestdll.mak" CFG="createtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "createtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "createtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "createtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/createtestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/createtestdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "createtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/createtestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/createtestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "createtestdll - Win32 Release"
-# Name "createtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\create.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/extend_dstest/extend_dstest.dsp b/windows_vs6/c++/examples/extend_dstest/extend_dstest.dsp
deleted file mode 100755
index 11aa58b..0000000
--- a/windows_vs6/c++/examples/extend_dstest/extend_dstest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extend_dstest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=extend_dstest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extend_dstest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extend_dstest.mak" CFG="extend_dstest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extend_dstest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extend_dstest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "extend_dstest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/extend_dstest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/extend_dstest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "extend_dstest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/extend_dstest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/extend_dstest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extend_dstest - Win32 Release"
-# Name "extend_dstest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\extend_ds.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/extend_dstestdll/extend_dstestdll.dsp b/windows_vs6/c++/examples/extend_dstestdll/extend_dstestdll.dsp
deleted file mode 100755
index 2d42a13..0000000
--- a/windows_vs6/c++/examples/extend_dstestdll/extend_dstestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extend_dstestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=extend_dstestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extend_dstestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extend_dstestdll.mak" CFG="extend_dstestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extend_dstestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extend_dstestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "extend_dstestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/extend_dstestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/extend_dstestdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "extend_dstestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/extend_dstestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/extend_dstestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extend_dstestdll - Win32 Release"
-# Name "extend_dstestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\extend_ds.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/h5grouptest/h5grouptest.dsp b/windows_vs6/c++/examples/h5grouptest/h5grouptest.dsp
deleted file mode 100755
index a4ce591..0000000
--- a/windows_vs6/c++/examples/h5grouptest/h5grouptest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5grouptest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5grouptest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5grouptest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5grouptest.mak" CFG="h5grouptest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5grouptest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5grouptest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5grouptest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/h5grouptest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/h5grouptest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "h5grouptest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/h5grouptest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/h5grouptest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5grouptest - Win32 Release"
-# Name "h5grouptest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\h5group.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/h5grouptestdll/h5grouptestdll.dsp b/windows_vs6/c++/examples/h5grouptestdll/h5grouptestdll.dsp
deleted file mode 100755
index d56e31c..0000000
--- a/windows_vs6/c++/examples/h5grouptestdll/h5grouptestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5grouptestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5grouptestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5grouptestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5grouptestdll.mak" CFG="h5grouptestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5grouptestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5grouptestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5grouptestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/h5grouptestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/h5grouptestdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "h5grouptestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/h5grouptestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/h5grouptestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5grouptestdll - Win32 Release"
-# Name "h5grouptestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\h5group.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/readdatatest/readdatatest.dsp b/windows_vs6/c++/examples/readdatatest/readdatatest.dsp
deleted file mode 100755
index 04506c5..0000000
--- a/windows_vs6/c++/examples/readdatatest/readdatatest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="readdatatest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=readdatatest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "readdatatest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "readdatatest.mak" CFG="readdatatest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "readdatatest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "readdatatest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "readdatatest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/readdatatest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/readdatatest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "readdatatest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/readdatatest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/readdatatest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "readdatatest - Win32 Release"
-# Name "readdatatest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\readdata.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/readdatatestdll/readdatatestdll.dsp b/windows_vs6/c++/examples/readdatatestdll/readdatatestdll.dsp
deleted file mode 100755
index fc6ed7d..0000000
--- a/windows_vs6/c++/examples/readdatatestdll/readdatatestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="readdatatestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=readdatatestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "readdatatestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "readdatatestdll.mak" CFG="readdatatestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "readdatatestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "readdatatestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "readdatatestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/readdatatestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/readdatatestdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "readdatatestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/readdatatestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/readdatatestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "readdatatestdll - Win32 Release"
-# Name "readdatatestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\readdata.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/writedatatest/writedatatest.dsp b/windows_vs6/c++/examples/writedatatest/writedatatest.dsp
deleted file mode 100755
index 59a5dda..0000000
--- a/windows_vs6/c++/examples/writedatatest/writedatatest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="writedatatest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=writedatatest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "writedatatest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "writedatatest.mak" CFG="writedatatest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "writedatatest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "writedatatest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "writedatatest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/writedatatest/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/writedatatest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cpp.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcpp.lib" /libpath:"..\..\..\..\proj\hdf5_cpp\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "writedatatest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/writedatatest/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/writedatatest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_cppd.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_cpp\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "writedatatest - Win32 Release"
-# Name "writedatatest - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\writedata.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/examples/writedatatestdll/writedatatestdll.dsp b/windows_vs6/c++/examples/writedatatestdll/writedatatestdll.dsp
deleted file mode 100755
index ef92b29..0000000
--- a/windows_vs6/c++/examples/writedatatestdll/writedatatestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="writedatatestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=writedatatestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "writedatatestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "writedatatestdll.mak" CFG="writedatatestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "writedatatestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "writedatatestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "writedatatestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/examples/writedatatestdll/Release"
-# PROP Intermediate_Dir "../../../../c++/examples/writedatatestdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_cppdll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_cppdll\release" /libpath:"..\..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "writedatatestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/examples/writedatatestdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/examples/writedatatestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\c++\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5CPP_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_cppddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_cppdll\debug" /libpath:"..\..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "writedatatestdll - Win32 Release"
-# Name "writedatatestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\examples\writedata.cpp"
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp b/windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp
deleted file mode 100755
index e1166de..0000000
--- a/windows_vs6/c++/test/dsets_cpp/dsets_cpp.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsets_cpp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dsets_cpp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets_cpp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets_cpp.mak" CFG="dsets_cpp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsets_cpp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsets_cpp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dsets_cpp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../test/dsets_cpp/Release"
-# PROP Intermediate_Dir "../../../../test/dsets_cpp/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8" /out:"../../../../c++/test/dsets_cpp/Release/dsets_cpp.exe"
-
-!ELSEIF  "$(CFG)" == "dsets_cpp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../test/dsets_cpp/Debug"
-# PROP Intermediate_Dir "../../../../test/dsets_cpp/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /out:"../../../../c++/test/dsets_cpp/Debug/dsets_cpp.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsets_cpp - Win32 Release"
-# Name "dsets_cpp - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\dsets.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\test\h5test.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp b/windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp
deleted file mode 100755
index 70cec74..0000000
--- a/windows_vs6/c++/test/dsets_cppdll/dsets_cppdll.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsets_cppdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dsets_cppdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets_cppdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets_cppdll.mak" CFG="dsets_cppdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsets_cppdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsets_cppdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dsets_cppdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../test/dsets_cppdll/Release"
-# PROP Intermediate_Dir "../../../../test/dsets_cppdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "_HDF5USEDLL_" /D "HDF5CPP_USEDLL" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 hdf5dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8" /out:"../../../../c++/test/dsets_cppdll/Release/dsets_cppdll.exe" /libpath:"..\..\..\..\proj\hdf5dll\Release"
-
-!ELSEIF  "$(CFG)" == "dsets_cppdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../test/dsets_cppdll/Debug"
-# PROP Intermediate_Dir "../../../../test/dsets_cppdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "_HDF5USEDLL_" /D "HDF5CPP_USEDLL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 hdf5ddll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /out:"../../../../c++/test/dsets_cppdll/Debug/dsets_cppdll.exe" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsets_cppdll - Win32 Release"
-# Name "dsets_cppdll - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\dsets.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\test\h5test.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp b/windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp
deleted file mode 100755
index fd1a449..0000000
--- a/windows_vs6/c++/test/testhdf5_cpp/testhdf5_cpp.dsp
+++ /dev/null
@@ -1,152 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5_cpp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testhdf5_cpp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_cpp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_cpp.mak" CFG="testhdf5_cpp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5_cpp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5_cpp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testhdf5_cpp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/test/testhdf5_cpp/Release"
-# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cpp/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "testhdf5_cpp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/test/testhdf5_cpp/Debug"
-# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cpp/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5_cpp - Win32 Release"
-# Name "testhdf5_cpp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tattr.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tcompound.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\test\testframe.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\testhdf5.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tfile.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tfilter.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\th5s.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\trefer.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\ttypes.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tvlstr.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.h"
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp b/windows_vs6/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp
deleted file mode 100755
index e7326b8..0000000
--- a/windows_vs6/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5_cppdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testhdf5_cppdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_cppdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_cppdll.mak" CFG="testhdf5_cppdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5_cppdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5_cppdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testhdf5_cppdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../c++/test/testhdf5_cppdll/Release"
-# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cppdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "HDF5CPP_USEDLL" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 hdf5dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5_cppdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../c++/test/testhdf5_cppdll/Debug"
-# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cppdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "HDF5CPP_USEDLL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 hdf5ddll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5_cppdll - Win32 Release"
-# Name "testhdf5_cppdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\h5cpputil.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tattr.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tcompound.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\test\testframe.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\testhdf5.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tfile.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tfilter.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\th5s.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\trefer.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\ttypes.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\c++\test\tvlstr.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\h5cpputil.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/examples/allexamples/allexamples.dsp b/windows_vs6/examples/allexamples/allexamples.dsp
deleted file mode 100755
index f52a9f6..0000000
--- a/windows_vs6/examples/allexamples/allexamples.dsp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="allexamples" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=allexamples - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "allexamples.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "allexamples.mak" CFG="allexamples - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "allexamples - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "allexamples - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "allexamples - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "allexamples - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "allexamples - Win32 Release"
-# Name "allexamples - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/examples/allexamples/allexamples.dsw b/windows_vs6/examples/allexamples/allexamples.dsw
deleted file mode 100755
index ba26198..0000000
--- a/windows_vs6/examples/allexamples/allexamples.dsw
+++ /dev/null
@@ -1,299 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "allexamples"=".\allexamples.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name attributetest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunkread
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name compoundtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extendwritetest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grouptest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name readtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name selectest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name writetest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name attributetestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunkreaddll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name compoundtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extendwritetestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grouptestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name readtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name selectestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name writetestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name intermgrouptest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name intermgrouptestdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "attributetest"="..\attributetest\attributetest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "attributetestdll"="..\attributetestdll\attributetestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "chunkread"="..\chunkread\chunkread.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "chunkreaddll"="..\chunkreaddll\chunkreaddll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtest"="..\compoundtest\compoundtest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtestdll"="..\compoundtestdll\compoundtestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "extendwritetest"="..\extendwritetest\extendwritetest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "extendwritetestdll"="..\extendwritetestdll\extendwritetestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grouptest"="..\grouptest\grouptest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grouptestdll"="..\grouptestdll\grouptestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "intermgrouptest"="..\intermgrouptest\intermgrouptest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "intermgrouptestdll"="..\intermgrouptestdll\intermgrouptestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "readtest"="..\readtest\readtest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "readtestdll"="..\readtestdll\readtestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "selectest"="..\selectest\selectest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "selectestdll"="..\selectestdll\selectestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "writetest"="..\writetest\writetest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "writetestdll"="..\writetestdll\writetestdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/examples/attributetest/attributetest.dsp b/windows_vs6/examples/attributetest/attributetest.dsp
deleted file mode 100755
index 05e336a..0000000
--- a/windows_vs6/examples/attributetest/attributetest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="attributetest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=attributetest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "attributetest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "attributetest.mak" CFG="attributetest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "attributetest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "attributetest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "attributetest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/attributetest/Release"
-# PROP Intermediate_Dir "../../../examples/attributetest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "attributetest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/attributest/Debug"
-# PROP Intermediate_Dir "../../../examples/attributest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"../../../examples/attributetest/Debug/attributetest.exe" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "attributetest - Win32 Release"
-# Name "attributetest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_attribute.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/attributetestdll/attributetestdll.dsp b/windows_vs6/examples/attributetestdll/attributetestdll.dsp
deleted file mode 100755
index f71523b..0000000
--- a/windows_vs6/examples/attributetestdll/attributetestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="attributetestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=attributetestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "attributetestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "attributetestdll.mak" CFG="attributetestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "attributetestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "attributetestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "attributetestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/attributetestdll/Release"
-# PROP Intermediate_Dir "../../../examples/attributetestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "attributetestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/attributetestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/attributetestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "attributetestdll - Win32 Release"
-# Name "attributetestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_attribute.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/chunkread/chunkread.dsp b/windows_vs6/examples/chunkread/chunkread.dsp
deleted file mode 100755
index 99a995e..0000000
--- a/windows_vs6/examples/chunkread/chunkread.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunkread" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=chunkread - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkread.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkread.mak" CFG="chunkread - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunkread - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkread - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "chunkread - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/chunkread/Release"
-# PROP Intermediate_Dir "../../../examples/chunkread/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "chunkread - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/chunkread/Debug"
-# PROP Intermediate_Dir "../../../examples/chunkread/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunkread - Win32 Release"
-# Name "chunkread - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_chunk_read.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/chunkreaddll/chunkreaddll.dsp b/windows_vs6/examples/chunkreaddll/chunkreaddll.dsp
deleted file mode 100755
index 61e4f9c..0000000
--- a/windows_vs6/examples/chunkreaddll/chunkreaddll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunkreaddll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=chunkreaddll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkreaddll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkreaddll.mak" CFG="chunkreaddll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunkreaddll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkreaddll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "chunkreaddll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/chunkreaddll/Release"
-# PROP Intermediate_Dir "../../../examples/chunkreaddll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "chunkreaddll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/chunkreaddll/Debug"
-# PROP Intermediate_Dir "../../../examples/chunkreaddll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunkreaddll - Win32 Release"
-# Name "chunkreaddll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_chunk_read.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/compoundtest/compoundtest.dsp b/windows_vs6/examples/compoundtest/compoundtest.dsp
deleted file mode 100755
index 845f090..0000000
--- a/windows_vs6/examples/compoundtest/compoundtest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak" CFG="compoundtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/compoundtest/Release"
-# PROP Intermediate_Dir "../../../examples/compoundtest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "compoundtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/compoundtest/Debug"
-# PROP Intermediate_Dir "../../../examples/compoundtest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtest - Win32 Release"
-# Name "compoundtest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_compound.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/compoundtestdll/compoundtestdll.dsp b/windows_vs6/examples/compoundtestdll/compoundtestdll.dsp
deleted file mode 100755
index fc3937d..0000000
--- a/windows_vs6/examples/compoundtestdll/compoundtestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak" CFG="compoundtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/compoundtestdll/Release"
-# PROP Intermediate_Dir "../../../examples/compoundtestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "compoundtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/compoundtestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/compoundtestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtestdll - Win32 Release"
-# Name "compoundtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_compound.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/extendwritetest/extendwritetest.dsp b/windows_vs6/examples/extendwritetest/extendwritetest.dsp
deleted file mode 100755
index 9086b17..0000000
--- a/windows_vs6/examples/extendwritetest/extendwritetest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extendwritetest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=extendwritetest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extendwritetest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extendwritetest.mak" CFG="extendwritetest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extendwritetest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extendwritetest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "extendwritetest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/extendwritetest/Release"
-# PROP Intermediate_Dir "../../../examples/extendwritetest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "extendwritetest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/extendwritetest/Debug"
-# PROP Intermediate_Dir "../../../examples/extendwritetest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extendwritetest - Win32 Release"
-# Name "extendwritetest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_extend_write.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/extendwritetestdll/extendwritetestdll.dsp b/windows_vs6/examples/extendwritetestdll/extendwritetestdll.dsp
deleted file mode 100755
index 81ff3ce..0000000
--- a/windows_vs6/examples/extendwritetestdll/extendwritetestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extendwritetestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=extendwritetestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extendwritetestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extendwritetestdll.mak" CFG="extendwritetestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extendwritetestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extendwritetestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "extendwritetestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/extendwritetestdll/Release"
-# PROP Intermediate_Dir "../../../examples/extendwritetestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "extendwritetestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/extendwritetestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/extendwritetestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extendwritetestdll - Win32 Release"
-# Name "extendwritetestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_extend_write.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/grouptest/grouptest.dsp b/windows_vs6/examples/grouptest/grouptest.dsp
deleted file mode 100755
index f2334cc..0000000
--- a/windows_vs6/examples/grouptest/grouptest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grouptest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grouptest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grouptest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grouptest.mak" CFG="grouptest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grouptest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grouptest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grouptest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/grouptest/Release"
-# PROP Intermediate_Dir "../../../examples/grouptest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "grouptest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/grouptest/Debug"
-# PROP Intermediate_Dir "../../../examples/grouptest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grouptest - Win32 Release"
-# Name "grouptest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_group.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/grouptestdll/grouptestdll.dsp b/windows_vs6/examples/grouptestdll/grouptestdll.dsp
deleted file mode 100755
index 5e31e29..0000000
--- a/windows_vs6/examples/grouptestdll/grouptestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grouptestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grouptestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grouptestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grouptestdll.mak" CFG="grouptestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grouptestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grouptestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grouptestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/grouptestdll/Release"
-# PROP Intermediate_Dir "../../../examples/grouptestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "grouptestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/grouptestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/grouptestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grouptestdll - Win32 Release"
-# Name "grouptestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_group.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/intermgrouptest/intermgrouptest.dsp b/windows_vs6/examples/intermgrouptest/intermgrouptest.dsp
deleted file mode 100644
index cb083f8..0000000
--- a/windows_vs6/examples/intermgrouptest/intermgrouptest.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="intermgrouptest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=intermgrouptest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "intermgrouptest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "intermgrouptest.mak" CFG="intermgrouptest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "intermgrouptest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "intermgrouptest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "intermgrouptest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/intermgrouptest/Release"
-# PROP Intermediate_Dir "../../../examples/intermgrouptest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "intermgrouptest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/intermgrouptest/Debug"
-# PROP Intermediate_Dir "../../../examples/intermgrouptest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "intermgrouptest - Win32 Release"
-# Name "intermgrouptest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_interm_group.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/examples/intermgrouptestdll/intermgrouptestdll.dsp b/windows_vs6/examples/intermgrouptestdll/intermgrouptestdll.dsp
deleted file mode 100644
index 2edc910..0000000
--- a/windows_vs6/examples/intermgrouptestdll/intermgrouptestdll.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="intermgrouptestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=intermgrouptestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "intermgrouptestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "intermgrouptestdll.mak" CFG="intermgrouptestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "intermgrouptestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "intermgrouptestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "intermgrouptestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/intermgrouptestdll/Release"
-# PROP Intermediate_Dir "../../../examples/intermgrouptestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "intermgrouptestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/intermgrouptestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/intermgrouptestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "intermgrouptestdll - Win32 Release"
-# Name "intermgrouptestdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_interm_group.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/examples/readtest/readtest.dsp b/windows_vs6/examples/readtest/readtest.dsp
deleted file mode 100755
index f87f527..0000000
--- a/windows_vs6/examples/readtest/readtest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="readtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=readtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "readtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "readtest.mak" CFG="readtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "readtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "readtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "readtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/readtest/Release"
-# PROP Intermediate_Dir "../../../examples/readtest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "readtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/readtest/Debug"
-# PROP Intermediate_Dir "../../../examples/readtest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "readtest - Win32 Release"
-# Name "readtest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_read.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/readtestdll/readtestdll.dsp b/windows_vs6/examples/readtestdll/readtestdll.dsp
deleted file mode 100755
index cb1d2ea..0000000
--- a/windows_vs6/examples/readtestdll/readtestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="readtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=readtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "readtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "readtestdll.mak" CFG="readtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "readtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "readtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "readtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/readtestdll/Release"
-# PROP Intermediate_Dir "../../../examples/readtestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "readtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/readtestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/readtestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "readtestdll - Win32 Release"
-# Name "readtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_read.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/selectest/selectest.dsp b/windows_vs6/examples/selectest/selectest.dsp
deleted file mode 100755
index 8e12198..0000000
--- a/windows_vs6/examples/selectest/selectest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="selectest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=selectest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "selectest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "selectest.mak" CFG="selectest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "selectest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "selectest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "selectest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/selectest/Release"
-# PROP Intermediate_Dir "../../../examples/selectest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "selectest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/selectest/Debug"
-# PROP Intermediate_Dir "../../../examples/selectest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "selectest - Win32 Release"
-# Name "selectest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_select.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/selectestdll/selectestdll.dsp b/windows_vs6/examples/selectestdll/selectestdll.dsp
deleted file mode 100755
index bd4ef11..0000000
--- a/windows_vs6/examples/selectestdll/selectestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="selectestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=selectestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "selectestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "selectestdll.mak" CFG="selectestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "selectestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "selectestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "selectestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/selectestdll/Release"
-# PROP Intermediate_Dir "../../../examples/selectestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "selectestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/selectestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/selectestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "selectestdll - Win32 Release"
-# Name "selectestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_select.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/writetest/writetest.dsp b/windows_vs6/examples/writetest/writetest.dsp
deleted file mode 100755
index 2b46494..0000000
--- a/windows_vs6/examples/writetest/writetest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="writetest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=writetest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "writetest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "writetest.mak" CFG="writetest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "writetest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "writetest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "writetest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/writetest/Release"
-# PROP Intermediate_Dir "../../../examples/writetest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "writetest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/writetest/Debug"
-# PROP Intermediate_Dir "../../../examples/writetest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "writetest - Win32 Release"
-# Name "writetest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_write.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/examples/writetestdll/writetestdll.dsp b/windows_vs6/examples/writetestdll/writetestdll.dsp
deleted file mode 100755
index a507b8c..0000000
--- a/windows_vs6/examples/writetestdll/writetestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="writetestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=writetestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "writetestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "writetestdll.mak" CFG="writetestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "writetestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "writetestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "writetestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../examples/writetestdll/Release"
-# PROP Intermediate_Dir "../../../examples/writetestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll"
-
-!ELSEIF  "$(CFG)" == "writetestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../examples/writetestdll/Debug"
-# PROP Intermediate_Dir "../../../examples/writetestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "writetestdll - Win32 Release"
-# Name "writetestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\examples\h5_write.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/allf90examples/allf90examples.dsp b/windows_vs6/fortran/examples/allf90examples/allf90examples.dsp
deleted file mode 100755
index 8e12935..0000000
--- a/windows_vs6/fortran/examples/allf90examples/allf90examples.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="allf90examples" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=allf90examples - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "allf90examples.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "allf90examples.mak" CFG="allf90examples - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "allf90examples - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "allf90examples - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "allf90examples - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/allf90examples/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/allf90examples/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "allf90examples - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/allf90examples/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/allf90examples/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "allf90examples - Win32 Release"
-# Name "allf90examples - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/allf90examples/allf90examples.dsw b/windows_vs6/fortran/examples/allf90examples/allf90examples.dsw
deleted file mode 100755
index 101b6d4..0000000
--- a/windows_vs6/fortran/examples/allf90examples/allf90examples.dsw
+++ /dev/null
@@ -1,449 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "allf90examples"=.\allf90examples.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name attreexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name compoundtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsetexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fileexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name groupexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpdsetexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpittest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpsexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hyperslabtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mountexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name refobjexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name refregexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name rwdsetexampletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name selecteletest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name attreexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name compoundtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsetexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fileexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name groupexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpdsetexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpittestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name grpsexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hyperslabtestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mountexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name refobjexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name refregexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name rwdsetexampletestdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name selecteletestdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "attreexampletest"=..\attreexampletest\attreexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "attreexampletestdll"=..\attreexampletestdll\attreexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtest"=..\compoundtest\compoundtest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "compoundtestdll"=..\compoundtestdll\compoundtestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "dsetexampletest"=..\dsetexampletest\dsetexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "dsetexampletestdll"=..\dsetexampletestdll\dsetexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "fileexampletest"=..\fileexampletest\fileexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "fileexampletestdll"=..\fileexampletestdll\fileexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "groupexampletest"=..\groupexampletest\groupexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "groupexampletestdll"=..\groupexampletestdll\groupexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpdsetexampletest"=..\grpdsetexampletest\grpdsetexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpdsetexampletestdll"=..\grpdsetexampletestdll\grpdsetexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpittest"=..\grpittest\grpittest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpittestdll"=..\grpittestdll\grpittestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpsexampletest"=..\grpsexampletest\grpsexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "grpsexampletestdll"=..\grpsexampletestdll\grpsexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "hyperslabtest"=..\hyperslabtest\hyperslabtest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "hyperslabtestdll"=..\hyperslabtestdll\hyperslabtestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mountexampletest"=..\mountexampletest\mountexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mountexampletestdll"=..\mountexampletestdll\mountexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "refobjexampletest"=..\refobjexampletest\refobjexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "refobjexampletestdll"=..\refobjexampletestdll\refobjexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "refregexampletest"=..\refregexampletest\refregexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "refregexampletestdll"=..\refregexampletestdll\refregexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "rwdsetexampletest"=..\rwdsetexampletest\rwdsetexampletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "rwdsetexampletestdll"=..\rwdsetexampletestdll\rwdsetexampletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "selecteletest"=..\selecteletest\selecteletest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "selecteletestdll"=..\selecteletestdll\selecteletestdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/fortran/examples/attreexampletest/attreexampletest.dsp b/windows_vs6/fortran/examples/attreexampletest/attreexampletest.dsp
deleted file mode 100755
index bc8aeb0..0000000
--- a/windows_vs6/fortran/examples/attreexampletest/attreexampletest.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="attreexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=attreexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "attreexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "attreexampletest.mak" CFG="attreexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "attreexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "attreexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "attreexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/attreexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/attreexampletest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "attreexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/attreexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/attreexampletest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "attreexampletest - Win32 Release"
-# Name "attreexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\attrexample.f90
-NODEP_F90_ATTRE=\
-	".\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/attreexampletestdll/attreexampletestdll.dsp b/windows_vs6/fortran/examples/attreexampletestdll/attreexampletestdll.dsp
deleted file mode 100755
index 982a293..0000000
--- a/windows_vs6/fortran/examples/attreexampletestdll/attreexampletestdll.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="attreexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=attreexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "attreexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "attreexampletestdll.mak" CFG="attreexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "attreexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "attreexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "attreexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/attreexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/attreexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "attreexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/attreexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/attreexampletestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "attreexampletestdll - Win32 Release"
-# Name "attreexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\attrexample.f90
-DEP_F90_ATTRE=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/compoundtest/compoundtest.dsp b/windows_vs6/fortran/examples/compoundtest/compoundtest.dsp
deleted file mode 100755
index 4fa435f..0000000
--- a/windows_vs6/fortran/examples/compoundtest/compoundtest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtest.mak" CFG="compoundtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/compoundtest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/compoundtest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "compoundtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/compoundtest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/compoundtest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtest - Win32 Release"
-# Name "compoundtest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\compound.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/compoundtestdll/compoundtestdll.dsp b/windows_vs6/fortran/examples/compoundtestdll/compoundtestdll.dsp
deleted file mode 100755
index 1e0f808..0000000
--- a/windows_vs6/fortran/examples/compoundtestdll/compoundtestdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="compoundtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=compoundtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "compoundtestdll.mak" CFG="compoundtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "compoundtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "compoundtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "compoundtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/compoundtestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/compoundtestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "compoundtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/compoundtestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/compoundtestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "compoundtestdll - Win32 Release"
-# Name "compoundtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\compound.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/dsetexampletest/dsetexampletest.dsp b/windows_vs6/fortran/examples/dsetexampletest/dsetexampletest.dsp
deleted file mode 100755
index 481b141..0000000
--- a/windows_vs6/fortran/examples/dsetexampletest/dsetexampletest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsetexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dsetexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetexampletest.mak" CFG="dsetexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsetexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsetexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dsetexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/dsetexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/dsetexampletest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "dsetexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/dsetexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/dsetexampletest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsetexampletest - Win32 Release"
-# Name "dsetexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\dsetexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/dsetexampletestdll/dsetexampletestdll.dsp b/windows_vs6/fortran/examples/dsetexampletestdll/dsetexampletestdll.dsp
deleted file mode 100755
index a50d4dc..0000000
--- a/windows_vs6/fortran/examples/dsetexampletestdll/dsetexampletestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsetexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dsetexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetexampletestdll.mak" CFG="dsetexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsetexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsetexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dsetexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/dsetexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/dsetexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "dsetexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/dsetexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/dsetexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsetexampletestdll - Win32 Release"
-# Name "dsetexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\dsetexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/fileexampletest/fileexampletest.dsp b/windows_vs6/fortran/examples/fileexampletest/fileexampletest.dsp
deleted file mode 100755
index 16d35c1..0000000
--- a/windows_vs6/fortran/examples/fileexampletest/fileexampletest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fileexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=fileexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fileexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fileexampletest.mak" CFG="fileexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fileexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fileexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fileexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/fileexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/fileexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "fileexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/fileexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/fileexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fileexampletest - Win32 Release"
-# Name "fileexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\fileexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/fileexampletestdll/fileexampletestdll.dsp b/windows_vs6/fortran/examples/fileexampletestdll/fileexampletestdll.dsp
deleted file mode 100755
index 1906303..0000000
--- a/windows_vs6/fortran/examples/fileexampletestdll/fileexampletestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fileexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=fileexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fileexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fileexampletestdll.mak" CFG="fileexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fileexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fileexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fileexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/fileexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/fileexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "fileexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/fileexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/fileexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fileexampletestdll - Win32 Release"
-# Name "fileexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\fileexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/groupexampletest/groupexampletest.dsp b/windows_vs6/fortran/examples/groupexampletest/groupexampletest.dsp
deleted file mode 100755
index e6cfc8d..0000000
--- a/windows_vs6/fortran/examples/groupexampletest/groupexampletest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="groupexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=groupexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "groupexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "groupexampletest.mak" CFG="groupexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "groupexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "groupexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "groupexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/groupexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/groupexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "groupexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/groupexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/groupexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "groupexampletest - Win32 Release"
-# Name "groupexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\groupexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/groupexampletestdll/groupexampletestdll.dsp b/windows_vs6/fortran/examples/groupexampletestdll/groupexampletestdll.dsp
deleted file mode 100755
index ceab331..0000000
--- a/windows_vs6/fortran/examples/groupexampletestdll/groupexampletestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="groupexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=groupexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "groupexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "groupexampletestdll.mak" CFG="groupexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "groupexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "groupexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "groupexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/groupexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/groupexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "groupexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/groupexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/groupexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "groupexampletestdll - Win32 Release"
-# Name "groupexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\groupexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpdsetexampletest/grpdsetexampletest.dsp b/windows_vs6/fortran/examples/grpdsetexampletest/grpdsetexampletest.dsp
deleted file mode 100755
index eb55062..0000000
--- a/windows_vs6/fortran/examples/grpdsetexampletest/grpdsetexampletest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpdsetexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpdsetexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpdsetexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpdsetexampletest.mak" CFG="grpdsetexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpdsetexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpdsetexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpdsetexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpdsetexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpdsetexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "grpdsetexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpdsetexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpdsetexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpdsetexampletest - Win32 Release"
-# Name "grpdsetexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpdsetexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.dsp b/windows_vs6/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.dsp
deleted file mode 100755
index f5c8c41..0000000
--- a/windows_vs6/fortran/examples/grpdsetexampletestdll/grpdsetexampletestdll.dsp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpdsetexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpdsetexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpdsetexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpdsetexampletestdll.mak" CFG="grpdsetexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpdsetexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpdsetexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpdsetexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpdsetexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpdsetexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "grpdsetexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpdsetexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpdsetexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpdsetexampletestdll - Win32 Release"
-# Name "grpdsetexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpdsetexample.f90
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpittest/grpittest.dsp b/windows_vs6/fortran/examples/grpittest/grpittest.dsp
deleted file mode 100755
index dc90730..0000000
--- a/windows_vs6/fortran/examples/grpittest/grpittest.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpittest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpittest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpittest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpittest.mak" CFG="grpittest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpittest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpittest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpittest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpittest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpittest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "grpittest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpittest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpittest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpittest - Win32 Release"
-# Name "grpittest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpit.f90
-DEP_F90_GRPIT=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpittestdll/grpittestdll.dsp b/windows_vs6/fortran/examples/grpittestdll/grpittestdll.dsp
deleted file mode 100755
index e380810..0000000
--- a/windows_vs6/fortran/examples/grpittestdll/grpittestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpittestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpittestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpittestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpittestdll.mak" CFG="grpittestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpittestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpittestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpittestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpittestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpittestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "grpittestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpittestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpittestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpittestdll - Win32 Release"
-# Name "grpittestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpit.f90
-NODEP_F90_GRPIT=\
-	"..\..\..\..\fortran\examples\grpittestdll\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpsexampletest/grpsexampletest.dsp b/windows_vs6/fortran/examples/grpsexampletest/grpsexampletest.dsp
deleted file mode 100755
index 0c018ea..0000000
--- a/windows_vs6/fortran/examples/grpsexampletest/grpsexampletest.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpsexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpsexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpsexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpsexampletest.mak" CFG="grpsexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpsexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpsexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpsexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpsexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpsexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "grpsexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpsexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpsexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpsexampletest - Win32 Release"
-# Name "grpsexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpsexample.f90
-DEP_F90_GRPSE=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/grpsexampletestdll/grpsexampletestdll.dsp b/windows_vs6/fortran/examples/grpsexampletestdll/grpsexampletestdll.dsp
deleted file mode 100755
index 288627a..0000000
--- a/windows_vs6/fortran/examples/grpsexampletestdll/grpsexampletestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grpsexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=grpsexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "grpsexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "grpsexampletestdll.mak" CFG="grpsexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "grpsexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "grpsexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "grpsexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/grpsexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpsexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "grpsexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/grpsexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/grpsexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "grpsexampletestdll - Win32 Release"
-# Name "grpsexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\grpsexample.f90
-DEP_F90_GRPSE=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/hyperslabtest/hyperslabtest.dsp b/windows_vs6/fortran/examples/hyperslabtest/hyperslabtest.dsp
deleted file mode 100755
index 230623d..0000000
--- a/windows_vs6/fortran/examples/hyperslabtest/hyperslabtest.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hyperslabtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hyperslabtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabtest.mak" CFG="hyperslabtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hyperslabtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslabtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hyperslabtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/hyperslabtest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/hyperslabtest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "hyperslabtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/hyperslabtest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/hyperslabtest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hyperslabtest - Win32 Release"
-# Name "hyperslabtest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\hyperslab.f90
-DEP_F90_HYPER=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/hyperslabtestdll/hyperslabtestdll.dsp b/windows_vs6/fortran/examples/hyperslabtestdll/hyperslabtestdll.dsp
deleted file mode 100755
index eb3b4a6..0000000
--- a/windows_vs6/fortran/examples/hyperslabtestdll/hyperslabtestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hyperslabtestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hyperslabtestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabtestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabtestdll.mak" CFG="hyperslabtestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hyperslabtestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslabtestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hyperslabtestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/hyperslabtestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/hyperslabtestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "hyperslabtestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/hyperslabtestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/hyperslabtestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hyperslabtestdll - Win32 Release"
-# Name "hyperslabtestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\hyperslab.f90
-DEP_F90_HYPER=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/mountexampletest/mountexampletest.dsp b/windows_vs6/fortran/examples/mountexampletest/mountexampletest.dsp
deleted file mode 100755
index 934a0a7..0000000
--- a/windows_vs6/fortran/examples/mountexampletest/mountexampletest.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mountexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=mountexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mountexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mountexampletest.mak" CFG="mountexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mountexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mountexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mountexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/mountexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/mountexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "mountexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/mountexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/mountexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mountexampletest - Win32 Release"
-# Name "mountexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\mountexample.f90
-DEP_F90_MOUNT=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/mountexampletestdll/mountexampletestdll.dsp b/windows_vs6/fortran/examples/mountexampletestdll/mountexampletestdll.dsp
deleted file mode 100755
index fe759e1..0000000
--- a/windows_vs6/fortran/examples/mountexampletestdll/mountexampletestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mountexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=mountexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mountexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mountexampletestdll.mak" CFG="mountexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mountexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mountexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mountexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/mountexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/mountexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "mountexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/mountexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/mountexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mountexampletestdll - Win32 Release"
-# Name "mountexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\mountexample.f90
-DEP_F90_MOUNT=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/refobjexampletest/refobjexampletest.dsp b/windows_vs6/fortran/examples/refobjexampletest/refobjexampletest.dsp
deleted file mode 100755
index 77dfdd2..0000000
--- a/windows_vs6/fortran/examples/refobjexampletest/refobjexampletest.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="refobjexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=refobjexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "refobjexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "refobjexampletest.mak" CFG="refobjexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "refobjexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "refobjexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "refobjexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/refobjexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/refobjexampletest/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "refobjexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/refobjexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/refobjexampletest/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "refobjexampletest - Win32 Release"
-# Name "refobjexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\refobjexample.f90
-DEP_F90_REFOB=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/refobjexampletestdll/refobjexampletestdll.dsp b/windows_vs6/fortran/examples/refobjexampletestdll/refobjexampletestdll.dsp
deleted file mode 100755
index d6c9f09..0000000
--- a/windows_vs6/fortran/examples/refobjexampletestdll/refobjexampletestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="refobjexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=refobjexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "refobjexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "refobjexampletestdll.mak" CFG="refobjexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "refobjexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "refobjexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "refobjexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/refobjexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/refobjexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "refobjexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/refobjexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/refobjexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "refobjexampletestdll - Win32 Release"
-# Name "refobjexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\refobjexample.f90
-DEP_F90_REFOB=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/refregexampletest/refregexampletest.dsp b/windows_vs6/fortran/examples/refregexampletest/refregexampletest.dsp
deleted file mode 100755
index 588a0c5..0000000
--- a/windows_vs6/fortran/examples/refregexampletest/refregexampletest.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="refregexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=refregexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "refregexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "refregexampletest.mak" CFG="refregexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "refregexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "refregexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "refregexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/refregexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/refregexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "refregexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/refregexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/refregexampletest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "refregexampletest - Win32 Release"
-# Name "refregexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\refregexample.f90
-DEP_F90_REFRE=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/refregexampletestdll/refregexampletestdll.dsp b/windows_vs6/fortran/examples/refregexampletestdll/refregexampletestdll.dsp
deleted file mode 100755
index 9ba58c9..0000000
--- a/windows_vs6/fortran/examples/refregexampletestdll/refregexampletestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="refregexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=refregexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "refregexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "refregexampletestdll.mak" CFG="refregexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "refregexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "refregexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "refregexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/refregexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/refregexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "refregexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/refregexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/refregexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "refregexampletestdll - Win32 Release"
-# Name "refregexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\refregexample.f90
-DEP_F90_REFRE=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/rwdsetexampletest/rwdsetexampletest.dsp b/windows_vs6/fortran/examples/rwdsetexampletest/rwdsetexampletest.dsp
deleted file mode 100755
index 6ccaf17..0000000
--- a/windows_vs6/fortran/examples/rwdsetexampletest/rwdsetexampletest.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rwdsetexampletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rwdsetexampletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "rwdsetexampletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "rwdsetexampletest.mak" CFG="rwdsetexampletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rwdsetexampletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rwdsetexampletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "rwdsetexampletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/rwdsetexampletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/rwdsetexampletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "rwdsetexampletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/rwdsetexampletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/rwdsetexampletest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rwdsetexampletest - Win32 Release"
-# Name "rwdsetexampletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\rwdsetexample.f90
-DEP_F90_RWDSE=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.dsp b/windows_vs6/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.dsp
deleted file mode 100755
index 42f2e1f..0000000
--- a/windows_vs6/fortran/examples/rwdsetexampletestdll/rwdsetexampletestdll.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rwdsetexampletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rwdsetexampletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "rwdsetexampletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "rwdsetexampletestdll.mak" CFG="rwdsetexampletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rwdsetexampletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rwdsetexampletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "rwdsetexampletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/rwdsetexampletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/rwdsetexampletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "rwdsetexampletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/rwdsetexampletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/rwdsetexampletestdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rwdsetexampletestdll - Win32 Release"
-# Name "rwdsetexampletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\rwdsetexample.f90
-DEP_F90_RWDSE=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/selecteletest/selecteletest.dsp b/windows_vs6/fortran/examples/selecteletest/selecteletest.dsp
deleted file mode 100755
index 47524cb..0000000
--- a/windows_vs6/fortran/examples/selecteletest/selecteletest.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="selecteletest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=selecteletest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "selecteletest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "selecteletest.mak" CFG="selecteletest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "selecteletest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "selecteletest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "selecteletest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/selecteletest/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/selecteletest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\hdf5lib\release\lib"
-
-!ELSEIF  "$(CFG)" == "selecteletest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/selecteletest/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/selecteletest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\hdf5lib\debug\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "selecteletest - Win32 Release"
-# Name "selecteletest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\selectele.f90
-DEP_F90_SELEC=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/examples/selecteletestdll/selecteletestdll.dsp b/windows_vs6/fortran/examples/selecteletestdll/selecteletestdll.dsp
deleted file mode 100755
index d7a5f46..0000000
--- a/windows_vs6/fortran/examples/selecteletestdll/selecteletestdll.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="selecteletestdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=selecteletestdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "selecteletestdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "selecteletestdll.mak" CFG="selecteletestdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "selecteletestdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "selecteletestdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "selecteletestdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/examples/selecteletestdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/examples/selecteletestdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\hdf5lib\release\DLL"
-
-!ELSEIF  "$(CFG)" == "selecteletestdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/examples/selecteletestdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/examples/selecteletestdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\src" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_fortranddll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\hdf5lib\debug\DLL"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "selecteletestdll - Win32 Release"
-# Name "selecteletestdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\examples\selectele.f90
-DEP_F90_SELEC=\
-	"..\..\..\..\proj\hdf5_fortrandll\Release\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/flush1_fortran/flush1_fortran.dsp b/windows_vs6/fortran/test/flush1_fortran/flush1_fortran.dsp
deleted file mode 100755
index 74f98c8..0000000
--- a/windows_vs6/fortran/test/flush1_fortran/flush1_fortran.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush1_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=flush1_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1_fortran.mak" CFG="flush1_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush1_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "flush1_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/flush1_fortran/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/flush1_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "flush1_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/flush1_fortran/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/flush1_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush1_fortran - Win32 Release"
-# Name "flush1_fortran - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fflush1.f90
-NODEP_F90_FFLUS=\
-	"..\..\..\..\fortran\test\flush1_fortran\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/flush1_fortrandll/flush1_fortrandll.dsp b/windows_vs6/fortran/test/flush1_fortrandll/flush1_fortrandll.dsp
deleted file mode 100755
index 145bfed..0000000
--- a/windows_vs6/fortran/test/flush1_fortrandll/flush1_fortrandll.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush1_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=flush1_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1_fortrandll.mak" CFG="flush1_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush1_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "flush1_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/flush1_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/flush1_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "flush1_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/flush1_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/flush1_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush1_fortrandll - Win32 Release"
-# Name "flush1_fortrandll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fflush1.f90
-NODEP_F90_FFLUS=\
-	"..\..\..\..\fortran\test\flush1_fortrandll\Debug\HDF5.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/flush2_fortran/flush2_fortran.dsp b/windows_vs6/fortran/test/flush2_fortran/flush2_fortran.dsp
deleted file mode 100755
index 84a0d85..0000000
--- a/windows_vs6/fortran/test/flush2_fortran/flush2_fortran.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush2_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=flush2_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2_fortran.mak" CFG="flush2_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush2_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "flush2_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/flush2_fortran/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/flush2_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "flush2_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/flush2_fortran/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/flush2_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush2_fortran - Win32 Release"
-# Name "flush2_fortran - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fflush2.f90
-NODEP_F90_FFLUS=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/flush2_fortrandll/flush2_fortrandll.dsp b/windows_vs6/fortran/test/flush2_fortrandll/flush2_fortrandll.dsp
deleted file mode 100755
index c4acf3e..0000000
--- a/windows_vs6/fortran/test/flush2_fortrandll/flush2_fortrandll.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush2_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=flush2_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2_fortrandll.mak" CFG="flush2_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush2_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "flush2_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/flush2_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/flush2_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "flush2_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/flush2_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/flush2_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush2_fortrandll - Win32 Release"
-# Name "flush2_fortrandll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fflush2.f90
-NODEP_F90_FFLUS=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/libtest_cstubdll/libtest_cstubdll.dsp b/windows_vs6/fortran/test/libtest_cstubdll/libtest_cstubdll.dsp
deleted file mode 100755
index 9dbd6c9..0000000
--- a/windows_vs6/fortran/test/libtest_cstubdll/libtest_cstubdll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtest_cstubdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libtest_cstubdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_cstubdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_cstubdll.mak" CFG="libtest_cstubdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtest_cstubdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libtest_cstubdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtest_cstubdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/libtest_cstubdll/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/libtest_cstubdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTEST_CSTUBDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_HDF5TESTUSEDLL_" /D "HDF5FORTTEST_CSTUB_DLL_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "libtest_cstubdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/libtest_cstubdll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/libtest_cstubdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTEST_CSTUBDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_HDF5TESTUSEDLL_" /D "HDF5FORTTEST_CSTUB_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtest_cstubdll - Win32 Release"
-# Name "libtest_cstubdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\src\H5f90kit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\t.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\t.h
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/libtest_fortran/libtest_fortran.dsp b/windows_vs6/fortran/test/libtest_fortran/libtest_fortran.dsp
deleted file mode 100755
index ed8b988..0000000
--- a/windows_vs6/fortran/test/libtest_fortran/libtest_fortran.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtest_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libtest_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_fortran.mak" CFG="libtest_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtest_fortran - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libtest_fortran - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtest_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\fortran\test\libtest_fortran\Release"
-# PROP Intermediate_Dir "..\..\..\..\fortran\test\libtest_fortran\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\fortran\test\libtest_fortran\Release\libtest_fortranr.lib"
-
-!ELSEIF  "$(CFG)" == "libtest_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\fortran\test\libtest_fortran\Debug"
-# PROP Intermediate_Dir "..\..\..\..\fortran\test\libtest_fortran\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\fortran\test\libtest_fortran\Debug\libtest_fortrand.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtest_fortran - Win32 Release"
-# Name "libtest_fortran - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\t.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\t.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tf.f90
-NODEP_F90_TF_F9=\
-	"..\..\..\..\fortran\test\libtest_fortran\Debug\H5GLOBAL.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/libtest_fortrandll/libtest_fortrandll.dsp b/windows_vs6/fortran/test/libtest_fortrandll/libtest_fortrandll.dsp
deleted file mode 100755
index 05f41ed..0000000
--- a/windows_vs6/fortran/test/libtest_fortrandll/libtest_fortrandll.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtest_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libtest_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest_fortrandll.mak" CFG="libtest_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtest_fortrandll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libtest_fortrandll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtest_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/libtest_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/libtest_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortrandll\Release/" /dll /nologo /threads /warn:nofileopt /module:"Release/;..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTEST_FORTRANDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5FORTTEST_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "libtest_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/libtest_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/libtest_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /dll /nologo /threads /traceback /warn:argument_checking /warn:nofileopt /module:"Debug/;..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTEST_FORTRANDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5FORTTEST_CSTUB_USEDLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../../fortran/test/libtest_fortrandll/Debug/libtest_fortranddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtest_fortrandll - Win32 Release"
-# Name "libtest_fortrandll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tf.f90
-NODEP_F90_TF_F9=\
-	"..\..\..\..\fortran\test\libtest_fortrandll\Release\H5GLOBAL.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/testhdf5_fortran/testhdf5_fortran.dsp b/windows_vs6/fortran/test/testhdf5_fortran/testhdf5_fortran.dsp
deleted file mode 100755
index 4ec1a1e..0000000
--- a/windows_vs6/fortran/test/testhdf5_fortran/testhdf5_fortran.dsp
+++ /dev/null
@@ -1,201 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testhdf5_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_fortran.mak" CFG="testhdf5_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testhdf5_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/testhdf5_fortran/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/testhdf5_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /include:"..\..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt /module:"..\..\..\proj\hdf5_fortran\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "testhdf5_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/testhdf5_fortran/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/testhdf5_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /include:"..\..\..\..\proj\hdf5_fortran\Debug/" /nologo /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortran\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5_fortran - Win32 Release"
-# Name "testhdf5_fortran - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fortranlib_test.f90
-NODEP_F90_FORTR=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5A.f90
-NODEP_F90_TH5A_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5D.f90
-NODEP_F90_TH5D_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5E.f90
-NODEP_F90_TH5E_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5F.f90
-NODEP_F90_TH5F_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5G.f90
-NODEP_F90_TH5G_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5I.f90
-NODEP_F90_TH5I_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5P.f90
-NODEP_F90_TH5P_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5R.f90
-NODEP_F90_TH5R_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5S.f90
-NODEP_F90_TH5S_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5Sselect.f90
-NODEP_F90_TH5SS=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5T.f90
-NODEP_F90_TH5T_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5VL.f90
-NODEP_F90_TH5VL=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5Z.f90
-NODEP_F90_TH5Z_=\
-	"..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.dsp b/windows_vs6/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.dsp
deleted file mode 100755
index 70b228f..0000000
--- a/windows_vs6/fortran/test/testhdf5_fortrandll/testhdf5_fortrandll.dsp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testhdf5_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5_fortrandll.mak" CFG="testhdf5_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testhdf5_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../fortran/test/testhdf5_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../fortran/test/testhdf5_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Release/" /include:"..\..\..\proj\hdf5_fortrandll\Release/" /libs:dll /nologo /threads /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testhdf5_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../fortran/test/testhdf5_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../fortran/test/testhdf5_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /include:"..\..\..\proj\hdf5_fortrandll\Debug/" /libs:dll /nologo /threads /warn:argument_checking /warn:nofileopt /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5_fortrandll - Win32 Release"
-# Name "testhdf5_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\fortranlib_test.f90
-NODEP_F90_FORTR=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5A.f90
-NODEP_F90_TH5A_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5D.f90
-NODEP_F90_TH5D_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5E.f90
-NODEP_F90_TH5E_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5F.f90
-NODEP_F90_TH5F_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5G.f90
-NODEP_F90_TH5G_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5I.f90
-NODEP_F90_TH5I_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5P.f90
-NODEP_F90_TH5P_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5R.f90
-NODEP_F90_TH5R_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5S.f90
-NODEP_F90_TH5S_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5Sselect.f90
-NODEP_F90_TH5SS=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5T.f90
-NODEP_F90_TH5T_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5VL.f90
-NODEP_F90_TH5VL=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\fortran\test\tH5Z.f90
-NODEP_F90_TH5Z_=\
-	"..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	
-
-!IF  "$(CFG)" == "testhdf5_fortrandll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5_fortrandll - Win32 Debug"
-
-# ADD F90 /include:"..\..\..\..\proj\hdf5_fortrandll\Debug/" /module:"..\..\..\..\proj\hdf5_fortrandll\Debug/"
-# SUBTRACT F90 /include:"..\..\..\proj\hdf5_fortrandll\Debug/"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.dsp b/windows_vs6/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.dsp
deleted file mode 100755
index 80a4b70..0000000
--- a/windows_vs6/hl/c++/test/hl_test_table_cpp/hl_test_table_cpp.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_table_cpp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_table_cpp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_cpp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_cpp.mak" CFG="hl_test_table_cpp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_table_cpp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_table_cpp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_table_cpp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/c++/test/hl_test_table_cpp/Release"
-# PROP Intermediate_Dir "../../../../../hl/c++/test/hl_test_table_cpp/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\..\hl\c++\src" /I "..\..\..\..\..\hl\src" /I "..\..\..\..\..\src" /I "..\..\..\..\..\c++\src" /I "..\..\..\..\..\test" /I "..\..\..\..\..\hl\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_table_cpp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/c++/test/hl_test_table_cpp/Debug"
-# PROP Intermediate_Dir "../../../../../hl/c++/test/hl_test_table_cpp/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\hl\c++\src" /I "..\..\..\..\..\hl\src" /I "..\..\..\..\..\src" /I "..\..\..\..\..\c++\src" /I "..\..\..\..\..\test" /I "..\..\..\..\..\hl\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_table_cpp - Win32 Release"
-# Name "hl_test_table_cpp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE="..\..\..\..\..\hl\c++\test\ptableTest.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.dsp b/windows_vs6/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.dsp
deleted file mode 100755
index cec9703..0000000
--- a/windows_vs6/hl/c++/test/hl_test_table_cppdll/hl_test_table_cppdll.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_table_cppdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_table_cppdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_cppdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_cppdll.mak" CFG="hl_test_table_cppdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_table_cppdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_table_cppdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_table_cppdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/c++/test/hl_test_table_cppdll/Release"
-# PROP Intermediate_Dir "../../../../../hl/c++/test/hl_test_table_cppdll/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\hl\c++\src" /I "..\..\..\..\..\hl\src" /I "..\..\..\..\..\src" /I "..\..\..\..\..\c++\src" /I "..\..\..\..\..\test" /I "..\..\..\..\..\hl\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEHLDLL_" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_table_cppdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/c++/test/hl_test_table_cppdll/Debug"
-# PROP Intermediate_Dir "../../../../../hl/c++/test/hl_test_table_cppdll/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\hl\c++\src" /I "..\..\..\..\..\hl\src" /I "..\..\..\..\..\c++\src" /I "..\..\..\..\..\src" /I "..\..\..\..\..\test" /I "..\..\..\..\..\hl\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HDF5USE_HLCPPDLL" /D "_HDF5USEHLDLL_" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_table_cppdll - Win32 Release"
-# Name "hl_test_table_cppdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE="..\..\..\..\..\hl\c++\test\ptableTest.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsp b/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsp
deleted file mode 100644
index eeee672..0000000
--- a/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Microsoft Developer Studio Project File - Name="allhlcexamples" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=allhlcexamples - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "allhlcexamples.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "allhlcexamples.mak" CFG="allhlcexamples - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "allhlcexamples - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "allhlcexamples - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF  "$(CFG)" == "allhlcexamples - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\allhlcexamples\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\allhlcexamples\Release"
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "allhlcexamples - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\allhlcexamples\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\allhlcexamples\Debug"
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "allhlcexamples - Win32 Release"
-# Name "allhlcexamples - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsw b/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsw
deleted file mode 100644
index 1db86e4..0000000
--- a/windows_vs6/hl/examples/allhlcexamples/allhlcexamples.dsw
+++ /dev/null
@@ -1,179 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "allhlcexamples"=.\allhlcexamples.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ex_images
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_imagesdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_lite
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_litedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_table
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_tabledll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_ds
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_dsdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_packet
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_packetdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ex_ds"=..\ex_ds\ex_ds.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_dsdll"=..\ex_dsdll\ex_dsdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_images"=..\ex_images\ex_images.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_imagesdll"=..\ex_imagesdll\ex_imagesdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_lite"=..\ex_lite\ex_lite.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_litedll"=..\ex_litedll\ex_litedll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_packet"=..\ex_packet\ex_packet.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_packetdll"=..\ex_packetdll\ex_packetdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_table"=..\ex_table\ex_table.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_tabledll"=..\ex_tabledll\ex_tabledll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/hl/examples/ex_ds/ex_ds.dsp b/windows_vs6/hl/examples/ex_ds/ex_ds.dsp
deleted file mode 100755
index c72279e..0000000
--- a/windows_vs6/hl/examples/ex_ds/ex_ds.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_ds" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_ds - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_ds.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_ds.mak" CFG="ex_ds - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_ds - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_ds - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_ds - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_ds\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_ds\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release"
-
-!ELSEIF  "$(CFG)" == "ex_ds - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_ds\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_ds\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib    hdf5d.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_ds - Win32 Release"
-# Name "ex_ds - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_ds1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp b/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp
deleted file mode 100755
index 13ab112..0000000
--- a/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_dsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_dsdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_dsdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_dsdll.mak" CFG="ex_dsdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_dsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_dsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_dsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_dsdll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_dsdll\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_hldll\release"
-
-!ELSEIF  "$(CFG)" == "ex_dsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_dsdll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_dsdll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_dsdll - Win32 Release"
-# Name "ex_dsdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_ds1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_images/ex_images.dsp b/windows_vs6/hl/examples/ex_images/ex_images.dsp
deleted file mode 100755
index d732331..0000000
--- a/windows_vs6/hl/examples/ex_images/ex_images.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_images" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_images - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_images.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_images.mak" CFG="ex_images - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_images - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_images - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_images - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_images\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_images\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release"
-
-!ELSEIF  "$(CFG)" == "ex_images - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_images\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_images\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_images - Win32 Release"
-# Name "ex_images - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_image1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp b/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp
deleted file mode 100755
index 750777f..0000000
--- a/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_imagesdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_imagesdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_imagesdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_imagesdll.mak" CFG="ex_imagesdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_imagesdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_imagesdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_imagesdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_imagesdll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_imagesdll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_hldll\release"
-
-!ELSEIF  "$(CFG)" == "ex_imagesdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_imagesdll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_imagesdll\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_imagesdll - Win32 Release"
-# Name "ex_imagesdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_image1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_lite/ex_lite.dsp b/windows_vs6/hl/examples/ex_lite/ex_lite.dsp
deleted file mode 100755
index 7f34eb2..0000000
--- a/windows_vs6/hl/examples/ex_lite/ex_lite.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_lite" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_lite - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_lite.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_lite.mak" CFG="ex_lite - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_lite - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_lite - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_lite - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_lite\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_lite\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release"
-
-!ELSEIF  "$(CFG)" == "ex_lite - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_lite\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_lite\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_lite - Win32 Release"
-# Name "ex_lite - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_lite1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp b/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp
deleted file mode 100755
index b6ab8ca..0000000
--- a/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_litedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_litedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_litedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_litedll.mak" CFG="ex_litedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_litedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_litedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_litedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_litedll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_litedll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_hldll\release"
-
-!ELSEIF  "$(CFG)" == "ex_litedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_litedll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_litedll\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_litedll - Win32 Release"
-# Name "ex_litedll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_lite1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_packet/ex_packet.dsp b/windows_vs6/hl/examples/ex_packet/ex_packet.dsp
deleted file mode 100755
index d230ef4..0000000
--- a/windows_vs6/hl/examples/ex_packet/ex_packet.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_packet" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_packet - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_packet.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_packet.mak" CFG="ex_packet - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_packet - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_packet - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_packet - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_packet\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_packet\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib    hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release"
-
-!ELSEIF  "$(CFG)" == "ex_packet - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_packet\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_packet\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_packet - Win32 Release"
-# Name "ex_packet - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ptExampleFL.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp b/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp
deleted file mode 100755
index 2121e8d..0000000
--- a/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_packetdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_packetdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_packetdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_packetdll.mak" CFG="ex_packetdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_packetdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_packetdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_packetdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_packetdll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_packetdll\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_hldll\release"
-
-!ELSEIF  "$(CFG)" == "ex_packetdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_packetdll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_packetdll\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_packetdll - Win32 Release"
-# Name "ex_packetdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ptExampleFL.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_table/ex_table.dsp b/windows_vs6/hl/examples/ex_table/ex_table.dsp
deleted file mode 100755
index c791648..0000000
--- a/windows_vs6/hl/examples/ex_table/ex_table.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_table" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_table - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_table.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_table.mak" CFG="ex_table - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_table - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_table - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_table - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_table\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_table\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib hdf5_hl.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\lib" /libpath:"..\..\..\..\proj\hdf5\release" /libpath:"..\..\..\..\proj\hdf5_hl\release"
-
-!ELSEIF  "$(CFG)" == "ex_table - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_table\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_table\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib hdf5_hld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\lib\\" /libpath:"..\..\..\..\proj\hdf5\debug" /libpath:"..\..\..\..\proj\hdf5_hl\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_table - Win32 Release"
-# Name "ex_table - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_table_01.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp b/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp
deleted file mode 100755
index fb88a85..0000000
--- a/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_tabledll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_tabledll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_tabledll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_tabledll.mak" CFG="ex_tabledll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_tabledll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_tabledll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_tabledll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_tabledll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_tabledll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hdf5lib\release\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib hdf5_hldll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\hdf5lib\release\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\..\proj\hdf5_hldll\release"
-
-!ELSEIF  "$(CFG)" == "ex_tabledll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\examples\ex_tabledll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\examples\ex_tabledll\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hdf5lib\debug\include" /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_tabledll - Win32 Release"
-# Name "ex_tabledll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\examples\ex_table_01.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsp b/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsp
deleted file mode 100644
index 61bf3b2..0000000
--- a/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Microsoft Developer Studio Project File - Name="allhlf90examples" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=allhlf90examples - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "allhlf90examples.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "allhlf90examples.mak" CFG="allhlf90examples - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "allhlf90examples - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "allhlf90examples - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF  "$(CFG)" == "allhlf90examples - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release"
-# PROP Intermediate_Dir "..\..\..\..\..\hl\fortran\examples\allhlf90examples\Release"
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "allhlf90examples - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug"
-# PROP Intermediate_Dir "..\..\..\..\..\hl\fortran\examples\allhlf90examples\Debug"
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "allhlf90examples - Win32 Release"
-# Name "allhlf90examples - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsw b/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsw
deleted file mode 100644
index 447fff8..0000000
--- a/windows_vs6/hl/fortran/examples/allhlf90examples/allhlf90examples.dsw
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "allhlf90examples"=".\allhlf90examples.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ex_lite
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ex_litedll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ex_lite"="..\ex_lite\ex_lite.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ex_litedll"="..\ex_litedll\ex_litedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/hl/fortran/examples/ex_lite/ex_lite.dsp b/windows_vs6/hl/fortran/examples/ex_lite/ex_lite.dsp
deleted file mode 100644
index fa73d3b..0000000
--- a/windows_vs6/hl/fortran/examples/ex_lite/ex_lite.dsp
+++ /dev/null
@@ -1,113 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_lite" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_lite - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_lite.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_lite.mak" CFG="ex_lite - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_lite - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_lite - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_lite - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\hl\fortran\examples\ex_lite\Release"
-# PROP Intermediate_Dir "..\..\..\..\..\hl\fortran\examples\ex_lite\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortran\release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\release/" /nologo /warn:nofileopt /module:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) hdf5_fortran.lib hdf5_hl_fortranr.lib hdf5_hl_fortran.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\proj\hdf5_fortran\release" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortran\release"
-
-!ELSEIF  "$(CFG)" == "ex_lite - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ex_lite___Win32_Debug"
-# PROP BASE Intermediate_Dir "ex_lite___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\hl\fortran\examples\ex_lite\Debug"
-# PROP Intermediate_Dir "..\..\..\..\..\hl\fortran\examples\ex_lite\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortran\debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt /module:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrand.lib hdf5_hl_fortrand.lib hdf5_hl_fortran.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\..\..\proj\hdf5_fortran\debug" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortran\debug"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_lite - Win32 Release"
-# Name "ex_lite - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\examples\exlite.f90
-DEP_F90_EXLIT=\
-	"..\..\..\..\..\proj\hdf5_fortran\debug\HDF5.mod"\
-	"..\..\..\..\..\proj\hdf5_hl_fortran\debug\H5LT.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp b/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp
deleted file mode 100644
index 2253114..0000000
--- a/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ex_litedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ex_litedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_litedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ex_litedll.mak" CFG="ex_litedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ex_litedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ex_litedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ex_litedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\hl\fortran\examples\ex_litedll\Release"
-# PROP Intermediate_Dir "..\..\..\..\..\hl\fortran\examples\ex_litedll\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortrandll\release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\release/" /nologo /warn:nofileopt /module:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortrandll.lib hdf5_hl_fortrandll.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\proj\hdf5_fortrandll\release" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortrandll\release"
-
-!ELSEIF  "$(CFG)" == "ex_litedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ex_litedll___Win32_Debug"
-# PROP BASE Intermediate_Dir "ex_litedll___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\fortran\examples\ex_litedll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\fortran\examples\ex_litedll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortrandll\debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt /module:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5_fortranddll.lib hdf5_hl_fortranddll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" /pdbtype:sept /libpath:"..\..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortrandll\debug"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ex_litedll - Win32 Release"
-# Name "ex_litedll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\examples\exlite.f90
-DEP_F90_EXLIT=\
-	"..\..\..\..\..\proj\hdf5_fortrandll\debug\HDF5.mod"\
-	"..\..\..\..\..\proj\hdf5_hl_fortrandll\debug\H5LT.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.dsp b/windows_vs6/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.dsp
deleted file mode 100755
index e5ee2e7..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_image_fortran/hl_test_image_fortran.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_image_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_image_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image_fortran.mak" CFG="hl_test_image_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_image_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_image_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_image_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_image_fortran/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_image_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortran\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_image_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_image_fortran/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_image_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortran\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_image_fortran - Win32 Release"
-# Name "hl_test_image_fortran - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tstimage.f90
-NODEP_F90_TSTIM=\
-	"..\..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	"..\..\..\..\..\proj\hdf5_hl_fortran\Debug\h5im.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.dsp b/windows_vs6/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.dsp
deleted file mode 100755
index 8d60a80..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_image_fortrandll/hl_test_image_fortrandll.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_image_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_image_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image_fortrandll.mak" CFG="hl_test_image_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_image_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_image_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_image_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_image_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_image_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"..\..\..\..\..\proj\hdf5_fortrandll\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_image_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_image_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_image_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortrandll\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_image_fortrandll - Win32 Release"
-# Name "hl_test_image_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tstimage.f90
-NODEP_F90_TSTIM=\
-	"..\..\..\..\..\hl\fortran\test\hl_test_image_fortrandll\Debug\h5im.mod"\
-	"..\..\..\..\..\hl\fortran\test\hl_test_image_fortrandll\Debug\hdf5.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.dsp b/windows_vs6/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.dsp
deleted file mode 100755
index e7d8bb7..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_lite_fortran/hl_test_lite_fortran.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_lite_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_lite_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite_fortran.mak" CFG="hl_test_lite_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_lite_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_lite_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_lite_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_lite_fortran/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_lite_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortran\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_lite_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_lite_fortran/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_lite_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortran\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_lite_fortran - Win32 Release"
-# Name "hl_test_lite_fortran - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tstlite.f90
-NODEP_F90_TSTLI=\
-	"..\..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	"..\..\..\..\..\proj\hdf5_hl_fortran\Debug\h5lt.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.dsp b/windows_vs6/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.dsp
deleted file mode 100755
index 25df3a9..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_lite_fortrandll/hl_test_lite_fortrandll.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_lite_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_lite_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite_fortrandll.mak" CFG="hl_test_lite_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_lite_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_lite_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_lite_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_lite_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_lite_fortrandll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortrandll\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_lite_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_lite_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_lite_fortrandll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortrandll\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_lite_fortrandll - Win32 Release"
-# Name "hl_test_lite_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tstlite.f90
-NODEP_F90_TSTLI=\
-	"..\..\..\..\..\hl\fortran\test\hl_test_lite_fortrandll\Debug\H5LT.mod"\
-	"..\..\..\..\..\hl\fortran\test\hl_test_lite_fortrandll\Debug\HDF5.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.dsp b/windows_vs6/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.dsp
deleted file mode 100755
index 31a0f3c..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_table_fortran/hl_test_table_fortran.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_table_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_table_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_fortran.mak" CFG="hl_test_table_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_table_fortran - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_table_fortran - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_table_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_table_fortran/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_table_fortran/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortran\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_table_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_table_fortran/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_table_fortran/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortran\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortran\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_table_fortran - Win32 Release"
-# Name "hl_test_table_fortran - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tsttable.f90
-NODEP_F90_TSTTA=\
-	"..\..\..\..\..\proj\hdf5_fortran\Debug\HDF5.MOD"\
-	"..\..\..\..\..\proj\hdf5_hl_fortran\Debug\h5tb.mod"\
-	
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.dsp b/windows_vs6/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.dsp
deleted file mode 100755
index 61dc5cb..0000000
--- a/windows_vs6/hl/fortran/test/hl_test_table_fortrandll/hl_test_table_fortrandll.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_table_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_table_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table_fortrandll.mak" CFG="hl_test_table_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_table_fortrandll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_table_fortrandll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_table_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_table_fortrandll/Release"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_table_fortrandll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\..\..\proj\hdf5_fortrandll\Release/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_table_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../hl/fortran/test/hl_test_table_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../../../hl/fortran/test/hl_test_table_fortrandll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\..\..\proj\hdf5_fortrandll\Debug/" /include:"..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_table_fortrandll - Win32 Release"
-# Name "hl_test_table_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\hl\fortran\test\tsttable.f90
-DEP_F90_TSTTA=\
-	"..\..\..\..\..\proj\hdf5_fortrandll\Debug\HDF5.MOD"\
-	"..\..\..\..\..\proj\hdf5_hl_fortrandll\Debug\h5tb.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp b/windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp
deleted file mode 100755
index df7116f..0000000
--- a/windows_vs6/hl/test/hl_test_ds/hl_test_ds.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_ds" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_ds - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_ds.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_ds.mak" CFG="hl_test_ds - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_ds - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_ds - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_ds - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_ds/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_ds/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_ds - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_ds/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_ds/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_ds - Win32 Release"
-# Name "hl_test_ds - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_ds.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\src\H5DS.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp b/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp
deleted file mode 100755
index ca1d3bd..0000000
--- a/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_dsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_dsdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_dsdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_dsdll.mak" CFG="hl_test_dsdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_dsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_dsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_dsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_dsdll/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_dsdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"
-
-!ELSEIF  "$(CFG)" == "hl_test_dsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_dsdll/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_dsdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".."
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_dsdll - Win32 Release"
-# Name "hl_test_dsdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_ds.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_image/hl_test_image.dsp b/windows_vs6/hl/test/hl_test_image/hl_test_image.dsp
deleted file mode 100755
index 69af7a0..0000000
--- a/windows_vs6/hl/test/hl_test_image/hl_test_image.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_image" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_image - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_image.mak" CFG="hl_test_image - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_image - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_image - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_image - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_image/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_image/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_image - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_image/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_image/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_image - Win32 Release"
-# Name "hl_test_image - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_image.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_imagedll/hl_test_imagedll.dsp b/windows_vs6/hl/test/hl_test_imagedll/hl_test_imagedll.dsp
deleted file mode 100755
index 5f13662..0000000
--- a/windows_vs6/hl/test/hl_test_imagedll/hl_test_imagedll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_imagedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_imagedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_imagedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_imagedll.mak" CFG="hl_test_imagedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_imagedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_imagedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_imagedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_imagedll/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_imagedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_imagedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_imagedll/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_imagedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_imagedll - Win32 Release"
-# Name "hl_test_imagedll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_image.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp b/windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp
deleted file mode 100755
index 6b8287c..0000000
--- a/windows_vs6/hl/test/hl_test_lite/hl_test_lite.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_lite" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_lite - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_lite.mak" CFG="hl_test_lite - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_lite - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_lite - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_lite - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_lite/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_lite/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_lite - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_lite/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_lite/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_lite - Win32 Release"
-# Name "hl_test_lite - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_lite.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_litedll/hl_test_litedll.dsp b/windows_vs6/hl/test/hl_test_litedll/hl_test_litedll.dsp
deleted file mode 100755
index 3e84161..0000000
--- a/windows_vs6/hl/test/hl_test_litedll/hl_test_litedll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_litedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_litedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_litedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_litedll.mak" CFG="hl_test_litedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_litedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_litedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_litedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_litedll/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_litedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_litedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_litedll/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_litedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_litedll - Win32 Release"
-# Name "hl_test_litedll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_lite.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_packet/hl_test_packet.dsp b/windows_vs6/hl/test/hl_test_packet/hl_test_packet.dsp
deleted file mode 100755
index ed29572..0000000
--- a/windows_vs6/hl/test/hl_test_packet/hl_test_packet.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_packet" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_packet - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_packet.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_packet.mak" CFG="hl_test_packet - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_packet - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_packet - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_packet - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_packet/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_packet/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "hl_test_packet - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_packet/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_packet/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_packet - Win32 Release"
-# Name "hl_test_packet - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_packet.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_packetdll/hl_test_packetdll.dsp b/windows_vs6/hl/test/hl_test_packetdll/hl_test_packetdll.dsp
deleted file mode 100755
index 9fd3195..0000000
--- a/windows_vs6/hl/test/hl_test_packetdll/hl_test_packetdll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_packetdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_packetdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_packetdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_packetdll.mak" CFG="hl_test_packetdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_packetdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_packetdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_packetdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_packetdll/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_packetdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_packetdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_packetdll/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_packetdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_packetdll - Win32 Release"
-# Name "hl_test_packetdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_packet.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_table/hl_test_table.dsp b/windows_vs6/hl/test/hl_test_table/hl_test_table.dsp
deleted file mode 100755
index 80db012..0000000
--- a/windows_vs6/hl/test/hl_test_table/hl_test_table.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_table" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_table - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_table.mak" CFG="hl_test_table - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_table - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_table - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_table - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_table/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_table/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_table - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_table/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_table/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\hl\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_table - Win32 Release"
-# Name "hl_test_table - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_table.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/hl/test/hl_test_tabledll/hl_test_tabledll.dsp b/windows_vs6/hl/test/hl_test_tabledll/hl_test_tabledll.dsp
deleted file mode 100755
index 9e21e35..0000000
--- a/windows_vs6/hl/test/hl_test_tabledll/hl_test_tabledll.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hl_test_tabledll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=hl_test_tabledll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_tabledll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hl_test_tabledll.mak" CFG="hl_test_tabledll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hl_test_tabledll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hl_test_tabledll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hl_test_tabledll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../hl/test/hl_test_tabledll/Release"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_tabledll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hl_test_tabledll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../hl/test/hl_test_tabledll/Debug"
-# PROP Intermediate_Dir "../../../../hl/test/hl_test_tabledll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\hl\src" /I "..\..\..\..\src" /I "..\..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hl_test_tabledll - Win32 Release"
-# Name "hl_test_tabledll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\test\test_table.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/tools/gifconv/gif2h5.dsp b/windows_vs6/hl/tools/gifconv/gif2h5.dsp
deleted file mode 100755
index 7148f97..0000000
--- a/windows_vs6/hl/tools/gifconv/gif2h5.dsp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gif2h5" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gif2h5 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gif2h5.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gif2h5.mak" CFG="gif2h5 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gif2h5 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gif2h5 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gif2h5 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconv\gif2h5\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconv\gif2h5\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "gif2h5 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconv\gif2h5\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconv\gif2h5\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gif2h5 - Win32 Release"
-# Name "gif2h5 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\decompress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gif2hdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gif2mem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gifread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\writehdf.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/tools/gifconv/h52gif.dsp b/windows_vs6/hl/tools/gifconv/h52gif.dsp
deleted file mode 100755
index 5183286..0000000
--- a/windows_vs6/hl/tools/gifconv/h52gif.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h52gif" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h52gif - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h52gif.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h52gif.mak" CFG="h52gif - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h52gif - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h52gif - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h52gif - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconv\h52gif\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconv\h52gif\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h52gif - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h52gif___Win32_Debug"
-# PROP BASE Intermediate_Dir "h52gif___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconv\h52gif\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconv\h52gif\debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h52gif - Win32 Release"
-# Name "h52gif - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\hdf2gif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\hdfgifwr.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp b/windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp
deleted file mode 100755
index 465a06f..0000000
--- a/windows_vs6/hl/tools/gifconvdll/gif2h5dll.dsp
+++ /dev/null
@@ -1,122 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gif2h5dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gif2h5dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gif2h5dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gif2h5dll.mak" CFG="gif2h5dll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gif2h5dll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gif2h5dll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gif2h5dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gif2h5dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconvdll\gif2h5dll\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gif2h5dll - Win32 Release"
-# Name "gif2h5dll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\decompress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gif2hdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gif2mem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\gifread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\writehdf.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp b/windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp
deleted file mode 100755
index 90d6c49..0000000
--- a/windows_vs6/hl/tools/gifconvdll/h52gifdll.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h52gifdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h52gifdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h52gifdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h52gifdll.mak" CFG="h52gifdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h52gifdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h52gifdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h52gifdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconvdll\h52gifdll\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h52gifdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h52gifdll___Win32_Debug"
-# PROP BASE Intermediate_Dir "h52gifdll___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug"
-# PROP Intermediate_Dir "..\..\..\..\hl\tools\gifconvdll\h52gifdll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /I "..\..\..\..\hl\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h52gifdll - Win32 Release"
-# Name "h52gifdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\hdf2gif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\hl\tools\gif2h5\hdfgifwr.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsp b/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsp
deleted file mode 100755
index ca84b3a..0000000
--- a/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="H5fortran_detect_gen" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=H5fortran_detect_gen - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "H5fortran_detect_gen.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "H5fortran_detect_gen.mak" CFG="H5fortran_detect_gen - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "H5fortran_detect_gen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "H5fortran_detect_gen - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "H5fortran_detect_gen - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "H5fortran_detect_gen - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../fortran/src/H5fortran_detect_gen.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "H5fortran_detect_gen - Win32 Release"
-# Name "H5fortran_detect_gen - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5test_kind.f90
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsw b/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsw
deleted file mode 100755
index 08e20a9..0000000
--- a/windows_vs6/misc/H5fortran_detect_gen/H5fortran_detect_gen.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "H5fortran_detect_gen"=.\H5fortran_detect_gen.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/misc/fortrantypegen/H5fortran_detect.dsp b/windows_vs6/misc/fortrantypegen/H5fortran_detect.dsp
deleted file mode 100755
index 1fe22c4..0000000
--- a/windows_vs6/misc/fortrantypegen/H5fortran_detect.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="H5fortran_detect" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=H5fortran_detect - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "H5fortran_detect.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "H5fortran_detect.mak" CFG="H5fortran_detect - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "H5fortran_detect - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "H5fortran_detect - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "H5fortran_detect - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "H5fortran_detect - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../fortran/src/H5fortran_detect.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "H5fortran_detect - Win32 Release"
-# Name "H5fortran_detect - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5fortran_detect.f90
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/misc/fortrantypegen/fortrantypegen.dsw b/windows_vs6/misc/fortrantypegen/fortrantypegen.dsw
deleted file mode 100755
index 87fe8e1..0000000
--- a/windows_vs6/misc/fortrantypegen/fortrantypegen.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "H5fortran_detect"=.\H5fortran_detect.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/misc/matchtypegen/H5match_types.dsp b/windows_vs6/misc/matchtypegen/H5match_types.dsp
deleted file mode 100755
index b619acb..0000000
--- a/windows_vs6/misc/matchtypegen/H5match_types.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="H5match_types" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=H5match_types - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "H5match_types.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "H5match_types.mak" CFG="H5match_types - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "H5match_types - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "H5match_types - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "H5match_types - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "H5match_types - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../fortran/src" /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../fortran/src/H5match_types.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "H5match_types - Win32 Release"
-# Name "H5match_types - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5match_types.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/misc/matchtypegen/matchtypegen.dsw b/windows_vs6/misc/matchtypegen/matchtypegen.dsw
deleted file mode 100755
index 003fcad..0000000
--- a/windows_vs6/misc/matchtypegen/matchtypegen.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "H5match_types"=.\H5match_types.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp b/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp
deleted file mode 100755
index a8bf1a9..0000000
--- a/windows_vs6/misc/typegen/h5tinit/h5tinit.dsp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5tinit" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5tinit - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5tinit.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5tinit.mak" CFG="h5tinit - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5tinit - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5tinit - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5tinit - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\src"
-# PROP Intermediate_Dir "..\..\..\..\src"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Generating H5tinit.c
-PostBuild_Cmds=..\..\..\..\src\h5tinit.exe > ..\..\..\..\src\H5tinit.c
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "h5tinit - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\src"
-# PROP Intermediate_Dir "..\..\..\..\src"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Generating H5tinit.c
-PostBuild_Cmds=..\..\..\..\src\h5tinit.exe > ..\..\..\..\src\H5tinit.c
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5tinit - Win32 Release"
-# Name "h5tinit - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\H5detect.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/all/all.dsp b/windows_vs6/proj/all/all.dsp
deleted file mode 100755
index 575d477..0000000
--- a/windows_vs6/proj/all/all.dsp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=all - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "all.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "all.mak" CFG="all - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "all - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "all - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF  "$(CFG)" == "all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "all___Win32_Release"
-# PROP BASE Intermediate_Dir "all___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"all___Win32_Release/"
-# ADD F90 /include:"Release/"
-
-!ELSEIF  "$(CFG)" == "all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "all - Win32 Release"
-# Name "all - Win32 Debug"
-# End Target
-# End Project
diff --git a/windows_vs6/proj/all/all.dsw b/windows_vs6/proj/all/all.dsw
deleted file mode 100755
index 1474436..0000000
--- a/windows_vs6/proj/all/all.dsw
+++ /dev/null
@@ -1,3695 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "all"=".\all.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name big
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bittests
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunk
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cmpd_dset
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsets
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dtypes
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name enum
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extend
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name external
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fillval
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name flush1
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name flush2
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gheap
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5debug
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5dump
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5dumptst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5import
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5ls
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repart
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hyperslab
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name iopipe
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name istore
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name lheap
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name links
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mount
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mtime
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ohdr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name overhead
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name stab
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name unlink
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bigdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bittestsdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name chunkdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cmpd_dsetdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsetsdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dtypesdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name enumdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name extenddll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name externaldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fillvaldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name flush1dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name flush2dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gheapdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5debugdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5dumpdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5importdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5lsdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repartdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hyperslabdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name iopipedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name istoredll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name lheapdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name linksdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mountdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mtimedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ohdrdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name overheaddll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name stabdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name unlinkdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name getname
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name set_extent
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ntypes
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name getnamedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ntypedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name set_extentdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ntypesdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testhdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testhdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5diff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5difftst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repack
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repacktst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5importtst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cache
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cachedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name reserved
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name reserveddll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5diffdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repackdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5jam
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5unjam
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5jamtst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name getub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name tellub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dangle
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dtransform
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dangledll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dtransformdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name talign
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name taligndll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testh5repack_detect_szipdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testh5repack_detect_szip
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_lite
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_image
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_table
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name btree2
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name btree2dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pool
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pooldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_ds
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_packet
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5repart_gentest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5reparttst
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dt_arith
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dt_arithdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_dsdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_imagedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_litedll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_packetdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_tabledll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5stat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5statdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name objcopy
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name objcopydll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cache_api
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cache_apidll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fheap
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fheapdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gif2h5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gif2h5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h52gif
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h52gifdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cross_read
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cross_readdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name binread
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5copy
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name vfd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name vfddll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name error_test
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name error_testdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name err_compat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name err_compatdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name h5mkgrp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsets_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dsets_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_table_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hl_test_table_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testhdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name testhdf5_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ohdr_gentst
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "big"="..\..\test\big\big.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bigdll"="..\..\test\bigdll\bigdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "binread"="..\..\tools\testfiles\binread\binread.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bittests"="..\..\test\bittests\bittests.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bittestsdll"="..\..\test\bittestsdll\bittestsdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "btree2"="..\..\test\btree2\btree2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "btree2dll"="..\..\test\btree2dll\btree2dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cache"="..\..\TEST\cache\cache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cache_api"="..\..\TEST\cache_api\cache_api.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cache_apidll"="..\..\TEST\cache_apidll\cache_apidll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cachedll"="..\..\TEST\cachedll\cachedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "chunk"="..\..\test\chunk\chunk.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "chunkdll"="..\..\test\chunkdll\chunkdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cmpd_dset"="..\..\test\cmpd_dset\cmpd_dset.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cmpd_dsetdll"="..\..\test\cmpd_dsetdll\cmpd_dsetdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cross_read"="..\..\TEST\cross_read\cross_read.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cross_readdll"="..\..\TEST\cross_readdll\cross_readdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dangle"="..\..\TEST\dangle\dangle.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dangledll"="..\..\TEST\dangledll\dangledll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dsets"="..\..\test\dsets\dsets.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dsets_cpp"="..\..\c++\test\dsets_cpp\dsets_cpp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dsets_cppdll"="..\..\c++\test\dsets_cppdll\dsets_cppdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dsetsdll"="..\..\test\dsetsdll\dsetsdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dt_arith"="..\..\test\dt_arith\dt_arith.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dt_arithdll"="..\..\test\dt_arithdll\dt_arithdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dtransform"="..\..\TEST\dtransform\dtransform.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dtransformdll"="..\..\TEST\dtransformdll\dtransformdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dtypes"="..\..\test\dtypes\dtypes.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dtypesdll"="..\..\test\dtypesdll\dtypesdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "enum"="..\..\test\enum\enum.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "enumdll"="..\..\test\enumdll\enumdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "err_compat"="..\..\test\err_compat\err_compat.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "err_compatdll"="..\..\test\err_compatdll\err_compatdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "error_test"="..\..\test\error_test\error_test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "error_testdll"="..\..\test\error_testdll\error_testdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "extend"="..\..\test\extend\extend.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "extenddll"="..\..\test\extenddll\extenddll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "external"="..\..\test\external\external.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "externaldll"="..\..\test\externaldll\externaldll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fheap"="..\..\test\fheap\fheap.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fheapdll"="..\..\TEST\fheapdll\fheapdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fillval"="..\..\test\fillval\fillval.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fillvaldll"="..\..\test\fillvaldll\fillvaldll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush1"="..\..\test\flush1\flush1.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush1_fortran"="..\..\FORTRAN\TEST\flush1_fortran\flush1_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush1_fortrandll"="..\..\FORTRAN\TEST\flush1_fortrandll\flush1_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush1dll"="..\..\test\flush1dll\flush1dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush2"="..\..\test\flush2\flush2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush2_fortran"="..\..\FORTRAN\TEST\flush2_fortran\flush2_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush2_fortrandll"="..\..\FORTRAN\TEST\flush2_fortrandll\flush2_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "flush2dll"="..\..\test\flush2dll\flush2dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "getname"="..\..\TEST\getname\getname.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "getnamedll"="..\..\test\getnamedll\getnamedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "getub"="..\..\TEST\getub\getub.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gheap"="..\..\test\gheap\gheap.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gheapdll"="..\..\test\gheapdll\gheapdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gif2h5"="..\..\hl\tools\gifconv\gif2h5.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gif2h5dll"="..\..\hl\tools\gifconvdll\gif2h5dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h52gif"="..\..\hl\tools\gifconv\h52gif.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h52gifdll"="..\..\hl\tools\gifconvdll\h52gifdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5copy"="..\..\tools\h5copy\h5copy.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5debug"="..\..\tools\h5debug\h5debug.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5debugdll"="..\..\tools\h5debugdll\h5debugdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5diff"="..\..\TOOLS\h5diff\h5diff.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5diffdll"="..\..\TOOLS\h5diffdll\h5diffdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5difftst"="..\..\TOOLS\TESTFILES\h5difftst\h5difftst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5dump"="..\..\tools\h5dump\h5dump.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5dumpdll"="..\..\tools\h5dumpdll\h5dumpdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5dumptst"="..\..\tools\testfiles\h5dumptst\h5dumptst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5import"="..\..\tools\h5import\h5import.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5importdll"="..\..\tools\h5importdll\h5importdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5importtst"="..\..\TOOLS\TESTFILES\h5importtst\h5importtst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5jam"="..\..\TOOLS\h5jam\h5jam.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5jamtst"="..\..\TOOLS\TESTFILES\h5jamtst\h5jamtst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5ls"="..\..\tools\h5ls\h5ls.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5lsdll"="..\..\tools\h5lsdll\h5lsdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5mkgrp"="..\..\TOOLS\h5mkgrp\h5mkgrp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repack"="..\..\tools\h5repack\h5repack.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repackdll"="..\..\TOOLS\h5repackdll\h5repackdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repacktst"="..\..\tools\testfiles\h5repacktst\h5repacktst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repart"="..\..\tools\h5repart\h5repart.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repart_gentest"="..\..\TOOLS\TESTFILES\h5repart_gentest\h5repart_gentest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5repartdll"="..\..\tools\h5repartdll\h5repartdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5reparttst"="..\..\TOOLS\TESTFILES\h5reparttst\h5reparttst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5stat"="..\..\TOOLS\h5stat\h5stat.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5statdll"="..\..\TOOLS\h5statdll\h5statdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "h5tinit"="..\..\misc\typegen\h5tinit\h5tinit.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "h5unjam"="..\..\TOOLS\h5unjam\h5unjam.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5"="..\hdf5\hdf5.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name h5tinit
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_cpp"="..\hdf5_cpp\hdf5_cpp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_cppdll"="..\hdf5_cppdll\hdf5_cppdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_f90cstub"="..\hdf5_f90cstub\hdf5_f90cstub.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_f90cstubdll"="..\hdf5_f90cstubdll\hdf5_f90cstubdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_fortran"="..\hdf5_fortran\hdf5_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_fortrandll"="..\hdf5_fortrandll\hdf5_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl"="..\hdf5_hl\hdf5_hl.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl_cpp"="..\hdf5_hl_cpp\hdf5_hl_cpp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl_cppdll"="..\hdf5_hl_cppdll\hdf5_hl_cppdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl_f90cstubdll"="..\hdf5_hl_f90cstubdll\hdf5_hl_f90cstubdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl_fortran"="..\hdf5_hl_fortran\hdf5_hl_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hl_fortrandll"="..\hdf5_hl_fortrandll\hdf5_hl_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5_hldll"="..\hdf5_hldll\hdf5_hldll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hdf5dll"="..\hdf5dll\hdf5dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name h5tinit
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_ds"="..\..\HL\TEST\hl_test_ds\hl_test_ds.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_dsdll"="..\..\hl\test\hl_test_dsdll\hl_test_dsdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_image"="..\..\HL\TEST\hl_test_image\hl_test_image.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_image_fortran"="..\..\HL\FORTRAN\TEST\hl_test_image_fortran\hl_test_image_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_image_fortrandll"="..\..\HL\FORTRAN\TEST\hl_test_image_fortrandll\hl_test_image_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_imagedll"="..\..\hl\test\hl_test_imagedll\hl_test_imagedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_lite"="..\..\HL\TEST\hl_test_lite\hl_test_lite.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_lite_fortran"="..\..\HL\FORTRAN\TEST\hl_test_lite_fortran\hl_test_lite_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_lite_fortrandll"="..\..\HL\FORTRAN\TEST\hl_test_lite_fortrandll\hl_test_lite_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_litedll"="..\..\hl\test\hl_test_litedll\hl_test_litedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_packet"="..\..\HL\TEST\hl_test_packet\hl_test_packet.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_packetdll"="..\..\hl\test\hl_test_packetdll\hl_test_packetdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_table"="..\..\HL\TEST\hl_test_table\hl_test_table.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_table_cpp"="..\..\hl\c++\test\hl_test_table_cpp\hl_test_table_cpp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_cpp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_table_cppdll"="..\..\hl\c++\test\hl_test_table_cppdll\hl_test_table_cppdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cppdll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_table_fortran"="..\..\HL\FORTRAN\TEST\hl_test_table_fortran\hl_test_table_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_table_fortrandll"="..\..\HL\FORTRAN\TEST\hl_test_table_fortrandll\hl_test_table_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hl_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hl_test_tabledll"="..\..\hl\test\hl_test_tabledll\hl_test_tabledll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_hldll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hyperslab"="..\..\test\hyperslab\hyperslab.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hyperslabdll"="..\..\test\hyperslabdll\hyperslabdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iopipe"="..\..\test\iopipe\iopipe.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iopipedll"="..\..\test\iopipedll\iopipedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "istore"="..\..\test\istore\istore.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "istoredll"="..\..\test\istoredll\istoredll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "lheap"="..\..\test\lheap\lheap.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "lheapdll"="..\..\test\lheapdll\lheapdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libtest"="..\..\test\libtest\libtest.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libtestD"="..\..\test\libtestD\libtestD.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libtest_cstubdll"="..\..\fortran\test\libtest_cstubdll\libtest_cstubdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libtest_fortran"="..\..\FORTRAN\TEST\libtest_fortran\libtest_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libtest_fortrandll"="..\..\fortran\test\libtest_fortrandll\libtest_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libtest_cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "links"="..\..\test\links\links.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "linksdll"="..\..\test\linksdll\linksdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mount"="..\..\test\mount\mount.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mountdll"="..\..\test\mountdll\mountdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mtime"="..\..\test\mtime\mtime.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mtimedll"="..\..\test\mtimedll\mtimedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ntypes"="..\..\test\ntypes\ntypes.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ntypesdll"="..\..\test\ntypesdll\ntypesdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "objcopy"="..\..\TEST\objcopy\objcopy.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "objcopydll"="..\..\TEST\objcopydll\objcopydll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ohdr"="..\..\test\ohdr\ohdr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ohdr_gentst"="..\..\TEST\ohdr_gentst\ohdr_gentst.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ohdrdll"="..\..\test\ohdrdll\ohdrdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "overhead"="..\..\test\overhead\overhead.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "overheaddll"="..\..\test\overheaddll\overheaddll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pool"="..\..\TEST\pool\pool.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pooldll"="..\..\TEST\pooldll\pooldll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "reserved"="..\..\TEST\reserved\reserved.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "reserveddll"="..\..\TEST\reserveddll\reserveddll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "set_extent"="..\..\TEST\set_extent\set_extent.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "set_extentdll"="..\..\test\set_extentdll\set_extentdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "stab"="..\..\test\stab\stab.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "stabdll"="..\..\test\stabdll\stabdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "talign"="..\..\TOOLS\talign\talign.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "taligndll"="..\..\TOOLS\taligndll\taligndll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "tellub"="..\..\TEST\tellub\tellub.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testh5repack_detect_szip"="..\..\TOOLS\TESTFILES\testh5repack_detect_szip\testh5repack_detect_szip.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testh5repack_detect_szipdll"="..\..\TOOLS\TESTFILES\testh5repack_detect_szipdll\testh5repack_detect_szipdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name toolslibD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5"="..\..\test\testhdf5\testhdf5.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5_cpp"="..\..\C++\TEST\testhdf5_cpp\testhdf5_cpp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cpp
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5_cppdll"="..\..\c++\test\testhdf5_cppdll\testhdf5_cppdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_cppdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5_fortran"="..\..\FORTRAN\TEST\testhdf5_fortran\testhdf5_fortran.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortran
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstub
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5_fortrandll"="..\..\fortran\test\testhdf5_fortrandll\testhdf5_fortrandll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5_f90cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_fortrandll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest_cstubdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testhdf5dll"="..\..\test\testhdf5dll\testhdf5dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "toolslib"="..\..\tools\toolslib\toolslib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "toolslibD"="..\..\tools\toolslibD\toolslibD.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ttsafedll"="..\..\test\ttsafedll\ttsafedll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "unlink"="..\..\test\unlink\unlink.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "unlinkdll"="..\..\test\unlinkdll\unlinkdll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "vfd"="..\..\TEST\vfd\vfd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtest
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "vfddll"="..\..\TEST\vfddll\vfddll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name hdf5dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libtestD
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows_vs6/proj/hdf5/hdf5.dsp b/windows_vs6/proj/hdf5/hdf5.dsp
deleted file mode 100755
index dabf5df..0000000
--- a/windows_vs6/proj/hdf5/hdf5.dsp
+++ /dev/null
@@ -1,3707 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5 - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5.mak" CFG="hdf5 - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5 - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5 - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5 - Win32 AlphaDbg" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "hdf5 - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\proj\hdf5\Release/" /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"..\..\..\proj\hdf5\Debug/" /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5\Debug\hdf5d.lib"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hdf5___W"
-# PROP BASE Intermediate_Dir "hdf5___W"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /browser /compile_only /debug:full /include:"hdf5___W/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "hdf5___0"
-# PROP BASE Intermediate_Dir "hdf5___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"hdf5___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5 - Win32 Release"
-# Name "hdf5 - Win32 Debug"
-# Name "hdf5 - Win32 AlphaDbg"
-# Name "hdf5 - Win32 AlphaRel"
-# Begin Group "source"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\H5.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5A.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Abtree2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5AC.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Adense.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Adeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Aint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Atest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2cache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2dbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2int.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2stat.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2test.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bcache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5C.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5checksum.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5D.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5dbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dcompact.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dcontig.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ddbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ddeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Defl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dfill.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dio.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Distore.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dmpio.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Doh.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dselect.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dtest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5E.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Edeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Eint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5F.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FD.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDcore.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDfamily.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDlog.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpi.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpio.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpiposix.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmulti.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDsec2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDstdio.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDstream.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDwindows.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ffake.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FL.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fmount.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FO.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FS.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FScache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FSdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fsfile.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FSsection.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fsuper.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ftest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5G.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gbtree2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gcompact.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gdense.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gdeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gent.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Glink.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gloc.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gname.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gnode.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gobj.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Goh.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gstab.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gtest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gtraverse.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HF.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFbtree2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFcache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdblock.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdtable.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFhdr.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFhuge.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFiblock.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFiter.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFman.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFsection.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFspace.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFstat.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFtest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFtiny.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HG.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HL.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HP.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5I.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5L.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Lexternal.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MF.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MM.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MP.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MPtest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5O.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oainfo.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oalloc.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oattr.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oattribute.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Obogus.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Obtreek.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocont.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocopy.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odrvinfo.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odtype.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oefl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ofill.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oginfo.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olayout.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olinfo.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olink.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Omessage.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Omtime.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oname.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Onull.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Opline.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Orefcount.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Osdspace.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oshared.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oshmesg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ostab.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Otest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ounknown.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5P.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pacpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdcpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdxpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfapl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfcpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfmpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pgcpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Plapl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Plcpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pocpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pocpypl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pstrcpl.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ptest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5R.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RC.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rdeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RS.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5S.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sall.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Shyper.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SL.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SM.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMbtree2.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMcache.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Smpio.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMtest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Snone.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Spoint.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sselect.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ST.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Stest.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5system.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5T.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tarray.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tbit.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcommit.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcompound.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tconv.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcset.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tdeprec.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tenum.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfields.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfixed.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfloat.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5timer.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tinit.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tnative.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Toffset.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Toh.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Topaque.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Torder.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpad.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tprecis.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5trace.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tstrpad.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tvisit.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tvlen.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5V.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5WB.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Z.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zdeflate.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zfletcher32.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Znbit.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zscaleoffset.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zshuffle.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zszip.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ztrans.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "header"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ACprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ACpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Apkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Aprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Apublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5BTpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Cprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Cpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Epkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Eprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Epublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Iprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ipublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Lprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MFprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MMprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MMpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MPpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Opublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ppublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5public.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RCprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SLprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Spublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Vprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5WBprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\hdf5.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp b/windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp
deleted file mode 100755
index 8108b62..0000000
--- a/windows_vs6/proj/hdf5_cpp/hdf5_cpp.dsp
+++ /dev/null
@@ -1,321 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_cpp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_cpp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_cpp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_cpp.mak" CFG="hdf5_cpp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_cpp - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_cpp - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_cpp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_cpp\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_cpp\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5_cpp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_cpp\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_cpp\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_cpp\Debug\hdf5_cppd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_cpp - Win32 Release"
-# Name "hdf5_cpp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AbstractDs.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5ArrayType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AtomType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Attribute.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CommonFG.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CompType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSet.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSpace.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DcreatProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DxferProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5EnumType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Exception.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FaccProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FcreatProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5File.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FloatType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Group.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IdComponent.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IntType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Library.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Object.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PredType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PropList.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5StrType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5VarLenType.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AbstractDs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Alltypes.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5ArrayType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AtomType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Attribute.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Classes.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CommonFG.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CompType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Cpp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSet.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSpace.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DcreatProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DxferProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5EnumType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Exception.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FaccProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FcreatProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5File.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FloatType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Group.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IdComponent.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Include.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IntType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Library.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Object.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PredType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PropList.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5StrType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5VarLenType.h"
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp b/windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp
deleted file mode 100755
index 4874bb6..0000000
--- a/windows_vs6/proj/hdf5_cppdll/hdf5_cppdll.dsp
+++ /dev/null
@@ -1,332 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_cppdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_cppdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_cppdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_cppdll.mak" CFG="hdf5_cppdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_cppdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_cppdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_cppdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../proj/hdf5_cppdll/Release"
-# PROP Intermediate_Dir "../../../proj/hdf5_cppdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_CPPDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "HDF5_CPPDLL_EXPORTS" /D "_HDF5USEDLL_" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_cppdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../proj/hdf5_cppdll/Debug"
-# PROP Intermediate_Dir "../../../proj/hdf5_cppdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_CPPDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "HDF5_CPPDLL_EXPORTS" /D "_HDF5USEDLL_" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"Debug/hdf5_cppddll.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../proj/hdf5_cppdll/Debug/hdf5_cppddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_cppdll - Win32 Release"
-# Name "hdf5_cppdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AbstractDs.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5ArrayType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AtomType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Attribute.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CommonFG.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CompType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSet.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSpace.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DcreatProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DxferProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5EnumType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Exception.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FaccProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FcreatProp.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5File.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FloatType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Group.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IdComponent.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IntType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Library.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Object.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PredType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PropList.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5StrType.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5VarLenType.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AbstractDs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Alltypes.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5ArrayType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5AtomType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Attribute.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Classes.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CommonFG.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5CompType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Cpp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSet.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataSpace.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DataType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DcreatProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5DxferProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5EnumType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Exception.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FaccProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FcreatProp.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5File.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5FloatType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Group.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IdComponent.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Include.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5IntType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Library.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5Object.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PredType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5PropList.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5StrType.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\c++\src\H5VarLenType.h"
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp b/windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp
deleted file mode 100755
index c63c2c1..0000000
--- a/windows_vs6/proj/hdf5_f90cstub/hdf5_f90cstub.dsp
+++ /dev/null
@@ -1,161 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_f90cstub" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_f90cstub - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_f90cstub.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_f90cstub.mak" CFG="hdf5_f90cstub - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_f90cstub - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_f90cstub - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_f90cstub - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_f90cstub\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_f90cstub\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5_f90cstub - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_f90cstub\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_f90cstub\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_f90cstub\Debug\hdf5_f90cstubd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_f90cstub - Win32 Release"
-# Name "hdf5_f90cstub - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5_f.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Af.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Df.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Ef.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90kit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Ff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Gf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5If.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Pf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Rf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Sf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Tf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Zf.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90i.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90proto.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp b/windows_vs6/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp
deleted file mode 100755
index 15a8872..0000000
--- a/windows_vs6/proj/hdf5_f90cstubdll/hdf5_f90cstubdll.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_f90cstubdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_f90cstubdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_f90cstubdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_f90cstubdll.mak" CFG="hdf5_f90cstubdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_f90cstubdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_f90cstubdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_f90cstubdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../proj/hdf5_f90cstubdll/Release"
-# PROP Intermediate_Dir "../../../proj/hdf5_f90cstubdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /dll /nologo /threads /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_F90CSTUBDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /D "HDF5FORT_CSTUB_DLL_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_f90cstubdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../proj/hdf5_f90cstubdll/Debug"
-# PROP Intermediate_Dir "../../../proj/hdf5_f90cstubdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /dll /nologo /threads /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_F90CSTUBDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /D "HDF5FORT_CSTUB_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../proj/hdf5_f90cstubdll/Debug/hdf5_f90cstubddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_f90cstubdll - Win32 Release"
-# Name "hdf5_f90cstubdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5_f.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Af.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Df.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Ef.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90kit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Ff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Gf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5If.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Pf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Rf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Sf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Tf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Zf.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90i.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90proto.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp b/windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp
deleted file mode 100755
index 93e20a7..0000000
--- a/windows_vs6/proj/hdf5_fortran/hdf5_fortran.dsp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_fortran.mak" CFG="hdf5_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_fortran - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_fortran - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_fortran\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_fortran\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_fortran\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_fortran\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /define:"HDF5F90_WINDOWS" /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_fortran\Debug\hdf5_fortrand.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_fortran - Win32 Release"
-# Name "hdf5_fortran - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5_ff.f90
-NODEP_F90_H5_FF=\
-	".\Release\H5GLOBAL.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Aff.f90
-NODEP_F90_H5AFF=\
-	".\Release\H5GLOBAL.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Dff.f90
-NODEP_F90_H5DFF=\
-	".\Release\H5GLOBAL.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Eff.f90
-NODEP_F90_H5EFF=\
-	".\Release\H5GLOBAL.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90global.f90
-NODEP_F90_H5F90=\
-	".\Release\H5FORTRAN_TYPES.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Fff.f90
-NODEP_F90_H5FFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5fortran_flags.f90
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5fortran_types.f90
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Gff.f90
-NODEP_F90_H5GFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Iff.f90
-NODEP_F90_H5IFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Pff.f90
-NODEP_F90_H5PFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Rff.f90
-NODEP_F90_H5RFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Sff.f90
-NODEP_F90_H5SFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Tff.f90
-NODEP_F90_H5TFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Zff.f90
-NODEP_F90_H5ZFF=\
-	".\5GLOBAL.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\HDF5.f90
-NODEP_F90_HDF5_=\
-	".\Release\H5A.MOD"\
-	".\Release\H5D.MOD"\
-	".\Release\H5E.MOD"\
-	".\Release\H5F.MOD"\
-	".\Release\H5G.MOD"\
-	".\Release\H5GLOBAL.MOD"\
-	".\Release\H5I.MOD"\
-	".\Release\H5LIB.MOD"\
-	".\Release\H5P.MOD"\
-	".\Release\H5R.MOD"\
-	".\Release\H5S.MOD"\
-	".\Release\H5T.MOD"\
-	".\Release\H5Z.MOD"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_fortrandll/hdf5_fortrandll.dsp b/windows_vs6/proj/hdf5_fortrandll/hdf5_fortrandll.dsp
deleted file mode 100755
index f6ece55..0000000
--- a/windows_vs6/proj/hdf5_fortrandll/hdf5_fortrandll.dsp
+++ /dev/null
@@ -1,226 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_fortrandll.mak" CFG="hdf5_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_fortrandll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_fortrandll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../proj/hdf5_fortrandll/Release"
-# PROP Intermediate_Dir "../../../proj/hdf5_fortrandll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /include:"Release/" /dll /nologo /threads /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../proj/hdf5_fortrandll/Debug"
-# PROP Intermediate_Dir "../../../proj/hdf5_fortrandll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /fpscomp:symbols /include:"Debug/" /dll /nologo /threads /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../../../proj/hdf5_fortrandll/Debug/hdf5_fortranddll.dll   " /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_fortrandll - Win32 Release"
-# Name "hdf5_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5_ff.f90
-DEP_F90_H5_FF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Aff.f90
-DEP_F90_H5AFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Dff.f90
-DEP_F90_H5DFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Eff.f90
-DEP_F90_H5EFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5f90global.f90
-DEP_F90_H5F90=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5fortran_types.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Fff.f90
-DEP_F90_H5FFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5fortran_flags.f90
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5fortran_types.f90
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Gff.f90
-DEP_F90_H5GFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Iff.f90
-DEP_F90_H5IFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Pff.f90
-DEP_F90_H5PFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Rff.f90
-DEP_F90_H5RFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Sff.f90
-DEP_F90_H5SFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Tff.f90
-DEP_F90_H5TFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\H5Zff.f90
-DEP_F90_H5ZFF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\fortran\src\HDF5.f90
-DEP_F90_HDF5_=\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5A.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5D.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5E.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5F.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5G.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5I.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5LIB.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5P.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5R.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5S.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5T.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\H5Z.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl/hdf5_hl.dsp b/windows_vs6/proj/hdf5_hl/hdf5_hl.dsp
deleted file mode 100755
index 2739b15..0000000
--- a/windows_vs6/proj/hdf5_hl/hdf5_hl.dsp
+++ /dev/null
@@ -1,125 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_hl - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl.mak" CFG="hdf5_hl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_hl - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"..\..\..\proj\hdf5_hl\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5_hl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"..\..\..\proj\hdf5_hl\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl\Debug\hdf5_hld.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl - Win32 Release"
-# Name "hdf5_hl - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5DS.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5IM.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LT.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LTanalyze.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LTparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5PT.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5TB.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp b/windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp
deleted file mode 100755
index 54679ba..0000000
--- a/windows_vs6/proj/hdf5_hl_cpp/hdf5_hl_cpp.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl_cpp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_hl_cpp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_cpp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_cpp.mak" CFG="hdf5_hl_cpp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl_cpp - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_hl_cpp - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl_cpp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_cpp\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_cpp\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "hdf5_hl_cpp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_cpp\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_cpp\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../src" /I "../../../hl/src" /I "../../../c++/src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl_cpp\Debug\hdf5_hl_cppd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl_cpp - Win32 Release"
-# Name "hdf5_hl_cpp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE="..\..\..\hl\c++\src\H5PacketTable.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp b/windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp
deleted file mode 100755
index 63e1770..0000000
--- a/windows_vs6/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl_cppdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_hl_cppdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_cppdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_cppdll.mak" CFG="hdf5_hl_cppdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl_cppdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_hl_cppdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl_cppdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_cppdll\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_cppdll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_CPPDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../src" /I "../../../hl/src" /I "../../../c++/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_CPPDLL_EXPORTS" /D "_HDF5USEHLDLL_" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_hl_cppdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_cppdll\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_cppdll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_CPPDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../src" /I "../../../hl/src" /I "../../../c++/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_CPPDLL_EXPORTS" /D "_HDF5USEHLDLL_" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\proj\hdf5_hl_cppdll\Debug/hdf5_hl_cppddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl_cppdll - Win32 Release"
-# Name "hdf5_hl_cppdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE="..\..\..\hl\c++\src\H5PacketTable.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp b/windows_vs6/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp
deleted file mode 100755
index a5a8924..0000000
--- a/windows_vs6/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.dsp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl_f90cstubdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_hl_f90cstubdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_f90cstubdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_f90cstubdll.mak" CFG="hdf5_hl_f90cstubdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl_f90cstubdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_hl_f90cstubdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl_f90cstubdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_f90cstubdll\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_f90cstubdll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_F90CSTUBDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_F90CSTUBDLL_EXPORTS" /D "_HDF5USEDLL_" /D "HDF5FORT_CSTUB_USEDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_hl_f90cstubdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_f90cstubdll\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_f90cstubdll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /include:"Debug/" /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_F90CSTUBDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_F90CSTUBDLL_EXPORTS" /D "HDF5FORT_CSTUB_USEDLL" /D "_HDF5USEDLL_" /D "HDF5USE_HLF90CSTUBDLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\proj\hdf5_hl_f90cstubdll\Debug/hdf5_hl_f90cstubddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl_f90cstubdll - Win32 Release"
-# Name "hdf5_hl_f90cstubdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMcc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMfc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5LTfc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5TBfc.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp b/windows_vs6/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp
deleted file mode 100755
index 3d7eac7..0000000
--- a/windows_vs6/proj/hdf5_hl_fortran/hdf5_hl_fortran.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl_fortran" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=hdf5_hl_fortran - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_fortran.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_fortran.mak" CFG="hdf5_hl_fortran - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl_fortran - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "hdf5_hl_fortran - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl_fortran - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_fortran\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_fortran\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /include:"..\..\..\proj\hdf5_fortran\Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-+# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl_fortran\Release\hdf5_hl_fortran.lib"
-
-!ELSEIF  "$(CFG)" == "hdf5_hl_fortran - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_fortran\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_fortran\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /include:"..\..\..\proj\hdf5_fortran\Debug/" /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\proj\hdf5_hl_fortran\Debug\hdf5_hl_fortrand.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl_fortran - Win32 Release"
-# Name "hdf5_hl_fortran - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMcc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMfc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMff.f90
-NODEP_F90_H5IMF=\
-	"..\..\..\proj\hdf5_fortran\Release\H5FORTRAN_TYPES.MOD"\
-	"..\..\..\proj\hdf5_fortran\Release\H5GLOBAL.mod"\
-	"..\..\..\proj\hdf5_fortran\Release\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5LTfc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5LTff.f90
-NODEP_F90_H5LTF=\
-	"..\..\..\proj\hdf5_fortran\Release\H5FORTRAN_TYPES.MOD"\
-	"..\..\..\proj\hdf5_fortran\Release\H5GLOBAL.mod"\
-	"..\..\..\proj\hdf5_fortran\Release\HDF5.MOD"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5TBfc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5TBff.f90
-NODEP_F90_H5TBF=\
-	"..\..\..\proj\hdf5_fortran\Release\H5FORTRAN_TYPES.MOD"\
-	"..\..\..\proj\hdf5_fortran\Release\H5GLOBAL.mod"\
-	"..\..\..\proj\hdf5_fortran\Release\HDF5.MOD"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5LTf90proto.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp b/windows_vs6/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp
deleted file mode 100755
index cfae5a3..0000000
--- a/windows_vs6/proj/hdf5_hl_fortrandll/hdf5_hl_fortrandll.dsp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hl_fortrandll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_hl_fortrandll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_fortrandll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hl_fortrandll.mak" CFG="hdf5_hl_fortrandll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hl_fortrandll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_hl_fortrandll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hl_fortrandll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_fortrandll\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_fortrandll\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /include:"..\..\..\proj\hdf5_fortrandll\Release/" /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_FORTRANDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_FORTRANDLL_EXPORTS" /D "HDF5USE_HLF90CSTUBDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_hl_fortrandll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hl_fortrandll\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hl_fortrandll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /define:"HDF5F90_WINDOWS" /define:"BUILD_HDF5_DLL" /include:"Debug/" /include:"..\..\..\proj\hdf5_fortrandll\Debug/" /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HL_FORTRANDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../src" /I "../../../hl/src" /I "../../../fortran/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_HDF5USEDLL_" /D "HDF5USE_HLF90CSTUBDLL" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\proj\hdf5_hl_fortrandll\Debug/hdf5_hl_fortranddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hl_fortrandll - Win32 Release"
-# Name "hdf5_hl_fortrandll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5IMff.f90
-DEP_F90_H5IMF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5fortran_types.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\hdf5.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5LTff.f90
-DEP_F90_H5LTF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5fortran_types.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\hdf5.mod"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\fortran\src\H5TBff.f90
-DEP_F90_H5TBF=\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5fortran_types.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\h5global.mod"\
-	"..\..\..\proj\hdf5_fortrandll\Release\hdf5.mod"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp b/windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp
deleted file mode 100755
index 6c8e66a..0000000
--- a/windows_vs6/proj/hdf5_hldll/hdf5_hldll.dsp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5_hldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=hdf5_hldll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hldll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5_hldll.mak" CFG="hdf5_hldll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5_hldll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5_hldll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "hdf5_hldll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\proj\hdf5_hldll\Release"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hldll\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HLDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_HDF5_HLDLL_EXPORTS_" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5_hldll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\proj\hdf5_hldll\Debug"
-# PROP Intermediate_Dir "..\..\..\proj\hdf5_hldll\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HDF5_HLDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_HDF5USEDLL_" /D "_HDF5_HLDLL_EXPORTS_" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /dll /debug /machine:I386 /out:"..\..\..\proj\hdf5_hldll\Debug/hdf5_hlddll.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5_hldll - Win32 Release"
-# Name "hdf5_hldll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5DS.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5IM.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LT.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LTanalyze.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5LTparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5PT.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\hl\src\H5TB.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/proj/hdf5dll/hdf5dll.dsp b/windows_vs6/proj/hdf5dll/hdf5dll.dsp
deleted file mode 100755
index 68f855b..0000000
--- a/windows_vs6/proj/hdf5dll/hdf5dll.dsp
+++ /dev/null
@@ -1,3925 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hdf5dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
-
-CFG=hdf5dll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hdf5dll.mak" CFG="hdf5dll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hdf5dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "hdf5dll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "hdf5dll - Win32 AlphaRel" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../proj/hdf5dll/Release"
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"../../../proj/hdf5dll/Release/" /include:"Release/" /dll /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /D "ZLIB_DLL" /D "_SZDLL_" /YX /FD /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../proj/hdf5dll/Debug"
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"../../../proj/hdf5dll/Debug/" /include:"Debug/" /dll /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /D "ZLIB_DLL" /D "_SZDLL_" /YX /FD /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../../../proj/hdf5dll/Debug/hdf5ddll.dll" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hdf5dll_"
-# PROP BASE Intermediate_Dir "hdf5dll_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MDd /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"hdf5dll_/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:nofileopt
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "hdf5dll0"
-# PROP BASE Intermediate_Dir "hdf5dll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"hdf5dll0/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hdf5dll - Win32 Release"
-# Name "hdf5dll - Win32 Debug"
-# Name "hdf5dll - Win32 AlphaDbg"
-# Name "hdf5dll - Win32 AlphaRel"
-# Begin Group "source"
-
-# PROP Default_Filter "*.c"
-# Begin Source File
-
-SOURCE=..\..\..\src\H5.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5A.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Abtree2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5AC.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Adense.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Adeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Aint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Atest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2cache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2dbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2int.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2stat.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5B2test.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bcache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5C.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5checksum.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5D.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5dbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dcompact.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dcontig.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ddbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ddeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Defl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dfill.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dio.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Distore.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dmpio.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Doh.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dselect.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dtest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5E.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Edeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Eint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5F.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FD.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDcore.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDfamily.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDlog.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpi.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpio.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmpiposix.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDmulti.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDsec2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDstdio.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDstream.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FDwindows.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ffake.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FL.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fmount.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FO.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FS.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FScache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FSdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fsfile.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5FSsection.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fsuper.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ftest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5G.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gbtree2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gcompact.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gdense.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gdeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gent.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Glink.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gloc.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gname.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gnode.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gobj.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Goh.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gstab.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gtest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gtraverse.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HF.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFbtree2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFcache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdblock.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFdtable.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFhdr.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFhuge.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFiblock.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFiter.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFman.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFsection.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFspace.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFstat.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFtest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HFtiny.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HG.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HL.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HP.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5I.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5L.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Lexternal.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MF.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MM.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MP.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MPtest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5O.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oainfo.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oalloc.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oattr.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oattribute.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Obogus.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Obtreek.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocont.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ocopy.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odrvinfo.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Odtype.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oefl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ofill.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oginfo.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olayout.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olinfo.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Olink.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Omessage.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Omtime.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oname.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Onull.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Opline.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Orefcount.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Osdspace.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oshared.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oshmesg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ostab.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Otest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ounknown.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5P.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pacpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdcpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pdxpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfapl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfcpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pfmpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pgcpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Plapl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Plcpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pocpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pocpypl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pstrcpl.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ptest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5R.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RC.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rdeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RS.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5S.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sall.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Shyper.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SL.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SM.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMbtree2.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMcache.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Smpio.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SMtest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Snone.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Spoint.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sselect.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ST.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Stest.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5system.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5T.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tarray.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tbit.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcommit.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcompound.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tconv.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tcset.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tdbg.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tdeprec.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tenum.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfields.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfixed.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tfloat.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5timer.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tinit.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tnative.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Toffset.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Toh.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Topaque.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Torder.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpad.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tprecis.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5trace.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tstrpad.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tvisit.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tvlen.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5V.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5WB.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Z.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zdeflate.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zfletcher32.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Znbit.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zscaleoffset.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zshuffle.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zszip.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ztrans.c
-
-!IF  "$(CFG)" == "hdf5dll - Win32 Release"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Release"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"
-
-# PROP Intermediate_Dir "../../../proj/hdf5dll/Debug"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "header "
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ACprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5ACpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Apkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Aprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Apublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Bpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5BTpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Cprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Cpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Dpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Epkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Eprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Epublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Fpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Gpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HGpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5HLpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Iprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ipublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MFprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MMprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5MMpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Opublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Pprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Ppublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5public.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5RCprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Rpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SHpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5SLprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Sprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Spublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Tpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Vprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5WBprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zprivate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Zpublic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\hdf5.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/big/big.dsp b/windows_vs6/test/big/big.dsp
deleted file mode 100755
index 7709891..0000000
--- a/windows_vs6/test/big/big.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="big" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=big - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "big.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "big.mak" CFG="big - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "big - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "big - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "big - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "big - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "big - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/big/Release"
-# PROP Intermediate_Dir "../../../test/big/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "big - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/big/Debug"
-# PROP Intermediate_Dir "../../../test/big/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "big - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "big___Wi"
-# PROP BASE Intermediate_Dir "big___Wi"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /browser /compile_only /debug:full /include:"big___Wi/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "big - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "big___W0"
-# PROP BASE Intermediate_Dir "big___W0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"big___W0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "big - Win32 Release"
-# Name "big - Win32 Debug"
-# Name "big - Win32 AlphaDbg"
-# Name "big - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\big.c
-
-!IF  "$(CFG)" == "big - Win32 Release"
-
-# PROP Intermediate_Dir "../../../test/big/Release"
-
-!ELSEIF  "$(CFG)" == "big - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "big - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "big - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/bigdll/bigdll.dsp b/windows_vs6/test/bigdll/bigdll.dsp
deleted file mode 100755
index 405899b..0000000
--- a/windows_vs6/test/bigdll/bigdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bigdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=bigdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bigdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bigdll.mak" CFG="bigdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bigdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "bigdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "bigdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "bigdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "bigdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/bigdll/Release"
-# PROP Intermediate_Dir "../../../test/bigdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/bigdll/Debug"
-# PROP Intermediate_Dir "../../../test/bigdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "bigdll__"
-# PROP BASE Intermediate_Dir "bigdll__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"bigdll__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "bigdll_0"
-# PROP BASE Intermediate_Dir "bigdll_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"bigdll_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bigdll - Win32 Release"
-# Name "bigdll - Win32 Debug"
-# Name "bigdll - Win32 AlphaDbg"
-# Name "bigdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\big.c
-
-!IF  "$(CFG)" == "bigdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "bigdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/bittests/bittests.dsp b/windows_vs6/test/bittests/bittests.dsp
deleted file mode 100755
index 33a1fdb..0000000
--- a/windows_vs6/test/bittests/bittests.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bittests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=bittests - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bittests.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bittests.mak" CFG="bittests - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bittests - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "bittests - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "bittests - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "bittests - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "bittests - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/bittests/Release"
-# PROP Intermediate_Dir "../../../test/bittests/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/bittests/Debug"
-# PROP Intermediate_Dir "../../../test/bittests/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "bittests"
-# PROP BASE Intermediate_Dir "bittests"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"bittests/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "bittest0"
-# PROP BASE Intermediate_Dir "bittest0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"bittest0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bittests - Win32 Release"
-# Name "bittests - Win32 Debug"
-# Name "bittests - Win32 AlphaDbg"
-# Name "bittests - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\bittests.c
-
-!IF  "$(CFG)" == "bittests - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "bittests - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/bittestsdll/bittestsdll.dsp b/windows_vs6/test/bittestsdll/bittestsdll.dsp
deleted file mode 100755
index 9c41b50..0000000
--- a/windows_vs6/test/bittestsdll/bittestsdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bittestsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=bittestsdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "bittestsdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "bittestsdll.mak" CFG="bittestsdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "bittestsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "bittestsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "bittestsdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "bittestsdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "bittestsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/bittestsdll/Release"
-# PROP Intermediate_Dir "../../../test/bittestsdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/bittestsdll/Debug"
-# PROP Intermediate_Dir "../../../test/bittestsdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "bittests"
-# PROP BASE Intermediate_Dir "bittests"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"bittests/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "bittest0"
-# PROP BASE Intermediate_Dir "bittest0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"bittest0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "bittestsdll - Win32 Release"
-# Name "bittestsdll - Win32 Debug"
-# Name "bittestsdll - Win32 AlphaDbg"
-# Name "bittestsdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\bittests.c
-
-!IF  "$(CFG)" == "bittestsdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "bittestsdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/btree2/btree2.dsp b/windows_vs6/test/btree2/btree2.dsp
deleted file mode 100755
index 61095ca..0000000
--- a/windows_vs6/test/btree2/btree2.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="btree2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=btree2 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "btree2.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "btree2.mak" CFG="btree2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "btree2 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "btree2 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "btree2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/btree2/Release"
-# PROP Intermediate_Dir "../../../test/btree2/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "btree2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/btree2/Debug"
-# PROP Intermediate_Dir "../../../test/btree2/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "btree2 - Win32 Release"
-# Name "btree2 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\btree2.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/btree2dll/btree2dll.dsp b/windows_vs6/test/btree2dll/btree2dll.dsp
deleted file mode 100755
index 426aea7..0000000
--- a/windows_vs6/test/btree2dll/btree2dll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="btree2dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=btree2dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "btree2dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "btree2dll.mak" CFG="btree2dll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "btree2dll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "btree2dll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "btree2dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/btree2dll/Release"
-# PROP Intermediate_Dir "../../../test/btree2dll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "btree2dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/btree2dll/Debug"
-# PROP Intermediate_Dir "../../../test/btree2dll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "btree2dll - Win32 Release"
-# Name "btree2dll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\btree2.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/cache/cache.dsp b/windows_vs6/test/cache/cache.dsp
deleted file mode 100755
index 1815439..0000000
--- a/windows_vs6/test/cache/cache.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cache" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cache - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cache.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cache.mak" CFG="cache - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cache - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cache - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cache - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cache/Release"
-# PROP Intermediate_Dir "../../../test/cache/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "cache - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cache/Debug"
-# PROP Intermediate_Dir "../../../test/cache/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cache - Win32 Release"
-# Name "cache - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_common.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/cache_api/cache_api.dsp b/windows_vs6/test/cache_api/cache_api.dsp
deleted file mode 100755
index de47803..0000000
--- a/windows_vs6/test/cache_api/cache_api.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cache_api" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cache_api - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cache_api.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cache_api.mak" CFG="cache_api - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cache_api - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cache_api - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cache_api - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cache_api/Release"
-# PROP Intermediate_Dir "../../../test/cache_api/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "cache_api - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cache_api/Debug"
-# PROP Intermediate_Dir "../../../test/cache_api/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cache_api - Win32 Release"
-# Name "cache_api - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_common.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/cache_apidll/cache_apidll.dsp b/windows_vs6/test/cache_apidll/cache_apidll.dsp
deleted file mode 100755
index 56f170f..0000000
--- a/windows_vs6/test/cache_apidll/cache_apidll.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cache_apidll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cache_apidll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cache_apidll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cache_apidll.mak" CFG="cache_apidll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cache_apidll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cache_apidll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cache_apidll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cache_apidll/Release"
-# PROP Intermediate_Dir "../../../test/cache_apidll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "cache_apidll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cache_apidll/Debug"
-# PROP Intermediate_Dir "../../../test/cache_apidll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cache_apidll - Win32 Release"
-# Name "cache_apidll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_common.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/cachedll/cachedll.dsp b/windows_vs6/test/cachedll/cachedll.dsp
deleted file mode 100755
index 065374b..0000000
--- a/windows_vs6/test/cachedll/cachedll.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cachedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cachedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cachedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cachedll.mak" CFG="cachedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cachedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cachedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cachedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cachedll/Release"
-# PROP Intermediate_Dir "../../../test/cachedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "cachedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cachedll/Debug"
-# PROP Intermediate_Dir "../../../test/cachedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cachedll - Win32 Release"
-# Name "cachedll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\cache_common.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/chunk/chunk.dsp b/windows_vs6/test/chunk/chunk.dsp
deleted file mode 100755
index ac7a660..0000000
--- a/windows_vs6/test/chunk/chunk.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunk" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=chunk - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunk.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunk.mak" CFG="chunk - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunk - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunk - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunk - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "chunk - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "chunk - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/chunk/Release"
-# PROP Intermediate_Dir "../../../test/chunk/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/chunk/Debug"
-# PROP Intermediate_Dir "../../../test/chunk/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "chunk___"
-# PROP BASE Intermediate_Dir "chunk___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /browser /compile_only /debug:full /include:"chunk___/" /nologo /warn:nofileopt
-# ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "chunk__0"
-# PROP BASE Intermediate_Dir "chunk__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"chunk__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunk - Win32 Release"
-# Name "chunk - Win32 Debug"
-# Name "chunk - Win32 AlphaDbg"
-# Name "chunk - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\chunk.c
-
-!IF  "$(CFG)" == "chunk - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "chunk - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/chunkdll/chunkdll.dsp b/windows_vs6/test/chunkdll/chunkdll.dsp
deleted file mode 100755
index f0c432b..0000000
--- a/windows_vs6/test/chunkdll/chunkdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="chunkdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=chunkdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "chunkdll.mak" CFG="chunkdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "chunkdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "chunkdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "chunkdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "chunkdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/chunkdll/Release"
-# PROP Intermediate_Dir "../../../test/chunkdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/chunkdll/Debug"
-# PROP Intermediate_Dir "../../../test/chunkdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "chunkdll"
-# PROP BASE Intermediate_Dir "chunkdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"chunkdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "chunkdl0"
-# PROP BASE Intermediate_Dir "chunkdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"chunkdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "chunkdll - Win32 Release"
-# Name "chunkdll - Win32 Debug"
-# Name "chunkdll - Win32 AlphaDbg"
-# Name "chunkdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\chunk.c
-
-!IF  "$(CFG)" == "chunkdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "chunkdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/cmpd_dset/cmpd_dset.dsp b/windows_vs6/test/cmpd_dset/cmpd_dset.dsp
deleted file mode 100755
index c3c2c66..0000000
--- a/windows_vs6/test/cmpd_dset/cmpd_dset.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cmpd_dset" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=cmpd_dset - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cmpd_dset.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cmpd_dset.mak" CFG="cmpd_dset - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cmpd_dset - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cmpd_dset - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "cmpd_dset - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "cmpd_dset - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "cmpd_dset - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cmpd_dset/Release"
-# PROP Intermediate_Dir "../../../test/cmpd_dset/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cmpd_dset/Debug"
-# PROP Intermediate_Dir "../../../test/cmpd_dset/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cmpd_dse"
-# PROP BASE Intermediate_Dir "cmpd_dse"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"cmpd_dse/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cmpd_ds0"
-# PROP BASE Intermediate_Dir "cmpd_ds0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"cmpd_ds0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cmpd_dset - Win32 Release"
-# Name "cmpd_dset - Win32 Debug"
-# Name "cmpd_dset - Win32 AlphaDbg"
-# Name "cmpd_dset - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\cmpd_dset.c
-
-!IF  "$(CFG)" == "cmpd_dset - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "cmpd_dset - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp b/windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp
deleted file mode 100755
index dd57a41..0000000
--- a/windows_vs6/test/cmpd_dsetdll/cmpd_dsetdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cmpd_dsetdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=cmpd_dsetdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cmpd_dsetdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cmpd_dsetdll.mak" CFG="cmpd_dsetdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cmpd_dsetdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cmpd_dsetdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "cmpd_dsetdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "cmpd_dsetdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "cmpd_dsetdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cmpd_dsetdll/Release"
-# PROP Intermediate_Dir "../../../test/cmpd_dsetdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cmpd_dsetdll/Debug"
-# PROP Intermediate_Dir "../../../test/cmpd_dsetdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cmpd_dse"
-# PROP BASE Intermediate_Dir "cmpd_dse"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"cmpd_dse/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cmpd_ds0"
-# PROP BASE Intermediate_Dir "cmpd_ds0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"cmpd_ds0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cmpd_dsetdll - Win32 Release"
-# Name "cmpd_dsetdll - Win32 Debug"
-# Name "cmpd_dsetdll - Win32 AlphaDbg"
-# Name "cmpd_dsetdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\cmpd_dset.c
-
-!IF  "$(CFG)" == "cmpd_dsetdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "cmpd_dsetdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/cross_read/cross_read.dsp b/windows_vs6/test/cross_read/cross_read.dsp
deleted file mode 100755
index 9363aaa..0000000
--- a/windows_vs6/test/cross_read/cross_read.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cross_read" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cross_read - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cross_read.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cross_read.mak" CFG="cross_read - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cross_read - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cross_read - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cross_read - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cross_read/Release"
-# PROP Intermediate_Dir "../../../test/cross_read/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "cross_read - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cross_read/Debug"
-# PROP Intermediate_Dir "../../../test/cross_read/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cross_read - Win32 Release"
-# Name "cross_read - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\cross_read.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/cross_readdll/cross_readdll.dsp b/windows_vs6/test/cross_readdll/cross_readdll.dsp
deleted file mode 100755
index 7de9b0b..0000000
--- a/windows_vs6/test/cross_readdll/cross_readdll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cross_readdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cross_readdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cross_readdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cross_readdll.mak" CFG="cross_readdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cross_readdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cross_readdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cross_readdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/cross_readdll/Release"
-# PROP Intermediate_Dir "../../../test/cross_readdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "cross_readdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/cross_readdll/Debug"
-# PROP Intermediate_Dir "../../../test/cross_readdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cross_readdll - Win32 Release"
-# Name "cross_readdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\cross_read.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/dangle/dangle.dsp b/windows_vs6/test/dangle/dangle.dsp
deleted file mode 100755
index 175c9a5..0000000
--- a/windows_vs6/test/dangle/dangle.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dangle" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dangle - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dangle.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dangle.mak" CFG="dangle - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dangle - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dangle - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dangle - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dangle/Release"
-# PROP Intermediate_Dir "../../../test/dangle/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "dangle - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dangle/Debug"
-# PROP Intermediate_Dir "../../../test/dangle/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dangle - Win32 Release"
-# Name "dangle - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\dangle.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dangledll/dangledll.dsp b/windows_vs6/test/dangledll/dangledll.dsp
deleted file mode 100755
index 1bfee71..0000000
--- a/windows_vs6/test/dangledll/dangledll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dangledll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dangledll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dangledll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dangledll.mak" CFG="dangledll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dangledll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dangledll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dangledll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dangledll/Release"
-# PROP Intermediate_Dir "../../../test/dangledll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "dangledll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dangledll/Debug"
-# PROP Intermediate_Dir "../../../test/dangledll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dangledll - Win32 Release"
-# Name "dangledll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\dangle.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dsets/dsets.dsp b/windows_vs6/test/dsets/dsets.dsp
deleted file mode 100755
index 0747216..0000000
--- a/windows_vs6/test/dsets/dsets.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsets" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=dsets - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsets.mak" CFG="dsets - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsets - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsets - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsets - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "dsets - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "dsets - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dsets/Release"
-# PROP Intermediate_Dir "../../../test/dsets/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dsets/Debug"
-# PROP Intermediate_Dir "../../../test/dsets/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dsets___"
-# PROP BASE Intermediate_Dir "dsets___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"dsets___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "dsets__0"
-# PROP BASE Intermediate_Dir "dsets__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"dsets__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsets - Win32 Release"
-# Name "dsets - Win32 Debug"
-# Name "dsets - Win32 AlphaDbg"
-# Name "dsets - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\dsets.c
-
-!IF  "$(CFG)" == "dsets - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "dsets - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dsetsdll/dsetsdll.dsp b/windows_vs6/test/dsetsdll/dsetsdll.dsp
deleted file mode 100755
index b735016..0000000
--- a/windows_vs6/test/dsetsdll/dsetsdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dsetsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=dsetsdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetsdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dsetsdll.mak" CFG="dsetsdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dsetsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsetsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsetsdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "dsetsdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "dsetsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dsetsdll/Release"
-# PROP Intermediate_Dir "../../../test/dsetsdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"../../../test/dsetsdll/Release/" /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dsetsdll/Debug"
-# PROP Intermediate_Dir "../../../test/dsetsdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"../../../test/dsetsdll/Debug/" /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dsetsdll"
-# PROP BASE Intermediate_Dir "dsetsdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"dsetsdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "dsetsdl0"
-# PROP BASE Intermediate_Dir "dsetsdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"dsetsdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dsetsdll - Win32 Release"
-# Name "dsetsdll - Win32 Debug"
-# Name "dsetsdll - Win32 AlphaDbg"
-# Name "dsetsdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\dsets.c
-
-!IF  "$(CFG)" == "dsetsdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "dsetsdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dt_arith/dt_arith.dsp b/windows_vs6/test/dt_arith/dt_arith.dsp
deleted file mode 100755
index 20bcb14..0000000
--- a/windows_vs6/test/dt_arith/dt_arith.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dt_arith" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dt_arith - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dt_arith.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dt_arith.mak" CFG="dt_arith - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dt_arith - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dt_arith - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dt_arith - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dt_arith/Release"
-# PROP Intermediate_Dir "../../../test/dt_arith/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dt_arith - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dt_arith/Debug"
-# PROP Intermediate_Dir "../../../test/dt_arith/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dt_arith - Win32 Release"
-# Name "dt_arith - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\dt_arith.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/dt_arithdll/dt_arithdll.dsp b/windows_vs6/test/dt_arithdll/dt_arithdll.dsp
deleted file mode 100755
index ce18f64..0000000
--- a/windows_vs6/test/dt_arithdll/dt_arithdll.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dt_arithdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dt_arithdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dt_arithdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dt_arithdll.mak" CFG="dt_arithdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dt_arithdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dt_arithdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dt_arithdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dt_arithdll/Release"
-# PROP Intermediate_Dir "../../../test/dt_arithdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dt_arithdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dt_arithdll/Debug"
-# PROP Intermediate_Dir "../../../test/dt_arithdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dt_arithdll - Win32 Release"
-# Name "dt_arithdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\dt_arith.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/dtransform/dtransform.dsp b/windows_vs6/test/dtransform/dtransform.dsp
deleted file mode 100755
index 6cc22e5..0000000
--- a/windows_vs6/test/dtransform/dtransform.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dtransform" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dtransform - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dtransform.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dtransform.mak" CFG="dtransform - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dtransform - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtransform - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dtransform - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dtransform/Release"
-# PROP Intermediate_Dir "../../../test/dtransform/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "dtransform - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dtransform/Debug"
-# PROP Intermediate_Dir "../../../test/dtransform/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dtransform - Win32 Release"
-# Name "dtransform - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\dtransform.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dtransformdll/dtransformdll.dsp b/windows_vs6/test/dtransformdll/dtransformdll.dsp
deleted file mode 100755
index af56baa..0000000
--- a/windows_vs6/test/dtransformdll/dtransformdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dtransformdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dtransformdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dtransformdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dtransformdll.mak" CFG="dtransformdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dtransformdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtransformdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dtransformdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dtransformdll/Release"
-# PROP Intermediate_Dir "../../../test/dtransformdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "dtransformdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dtransformdll/Debug"
-# PROP Intermediate_Dir "../../../test/dtransformdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dtransformdll - Win32 Release"
-# Name "dtransformdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\dtransform.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dtypes/dtypes.dsp b/windows_vs6/test/dtypes/dtypes.dsp
deleted file mode 100755
index da8e861..0000000
--- a/windows_vs6/test/dtypes/dtypes.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dtypes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=dtypes - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dtypes.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dtypes.mak" CFG="dtypes - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dtypes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtypes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtypes - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "dtypes - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "dtypes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dtypes/Release"
-# PROP Intermediate_Dir "../../../test/dtypes/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dtypes/Debug"
-# PROP Intermediate_Dir "../../../test/dtypes/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dtypes__"
-# PROP BASE Intermediate_Dir "dtypes__"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"dtypes__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "dtypes_0"
-# PROP BASE Intermediate_Dir "dtypes_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"dtypes_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dtypes - Win32 Release"
-# Name "dtypes - Win32 Debug"
-# Name "dtypes - Win32 AlphaDbg"
-# Name "dtypes - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\dtypes.c
-
-!IF  "$(CFG)" == "dtypes - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "dtypes - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/dtypesdll/dtypesdll.dsp b/windows_vs6/test/dtypesdll/dtypesdll.dsp
deleted file mode 100755
index e613b7e..0000000
--- a/windows_vs6/test/dtypesdll/dtypesdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dtypesdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=dtypesdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "dtypesdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "dtypesdll.mak" CFG="dtypesdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dtypesdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtypesdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "dtypesdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "dtypesdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "dtypesdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/dtypesdll/Release"
-# PROP Intermediate_Dir "../../../test/dtypesdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/dtypesdll/Debug"
-# PROP Intermediate_Dir "../../../test/dtypesdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dtypesdl"
-# PROP BASE Intermediate_Dir "dtypesdl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"dtypesdl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "dtypesd0"
-# PROP BASE Intermediate_Dir "dtypesd0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"dtypesd0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dtypesdll - Win32 Release"
-# Name "dtypesdll - Win32 Debug"
-# Name "dtypesdll - Win32 AlphaDbg"
-# Name "dtypesdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\dtypes.c
-
-!IF  "$(CFG)" == "dtypesdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "dtypesdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/enum/enum.dsp b/windows_vs6/test/enum/enum.dsp
deleted file mode 100755
index 74a8076..0000000
--- a/windows_vs6/test/enum/enum.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="enum" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=enum - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "enum.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "enum.mak" CFG="enum - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "enum - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "enum - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "enum - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "enum - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "enum - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/enum/Release"
-# PROP Intermediate_Dir "../../../test/enum/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "enum - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/enum/Debug"
-# PROP Intermediate_Dir "../../../test/enum/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "enum - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "enum___W"
-# PROP BASE Intermediate_Dir "enum___W"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"enum___W/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ELSEIF  "$(CFG)" == "enum - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "enum___0"
-# PROP BASE Intermediate_Dir "enum___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"enum___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "enum - Win32 Release"
-# Name "enum - Win32 Debug"
-# Name "enum - Win32 AlphaRel"
-# Name "enum - Win32 AlphaDbg"
-# Begin Source File
-
-SOURCE=..\..\..\test\enum.c
-
-!IF  "$(CFG)" == "enum - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "enum - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "enum - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "enum - Win32 AlphaDbg"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/enumdll/enumdll.dsp b/windows_vs6/test/enumdll/enumdll.dsp
deleted file mode 100755
index a56006a..0000000
--- a/windows_vs6/test/enumdll/enumdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="enumdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=enumdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "enumdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "enumdll.mak" CFG="enumdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "enumdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "enumdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "enumdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "enumdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "enumdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/enumdll/Release"
-# PROP Intermediate_Dir "../../../test/enumdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/enumdll/Debug"
-# PROP Intermediate_Dir "../../../test/enumdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "enumdll_"
-# PROP BASE Intermediate_Dir "enumdll_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"enumdll_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "enumdll0"
-# PROP BASE Intermediate_Dir "enumdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"enumdll0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "enumdll - Win32 Release"
-# Name "enumdll - Win32 Debug"
-# Name "enumdll - Win32 AlphaDbg"
-# Name "enumdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\enum.c
-
-!IF  "$(CFG)" == "enumdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "enumdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/err_compat/err_compat.dsp b/windows_vs6/test/err_compat/err_compat.dsp
deleted file mode 100644
index 5a41960..0000000
--- a/windows_vs6/test/err_compat/err_compat.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="err_compat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=err_compat - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "err_compat.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "err_compat.mak" CFG="err_compat - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "err_compat - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "err_compat - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "err_compat - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/err_compat/Release"
-# PROP Intermediate_Dir "../../../test/err_compat/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "err_compat - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/err_compat/Debug"
-# PROP Intermediate_Dir "../../../test/err_compat/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "err_compat - Win32 Release"
-# Name "err_compat - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\err_compat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/err_compatdll/err_compatdll.dsp b/windows_vs6/test/err_compatdll/err_compatdll.dsp
deleted file mode 100644
index f3ec537..0000000
--- a/windows_vs6/test/err_compatdll/err_compatdll.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="err_compatdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=err_compatdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "err_compatdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "err_compatdll.mak" CFG="err_compatdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "err_compatdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "err_compatdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "err_compatdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/err_compatdll/Release"
-# PROP Intermediate_Dir "../../../test/err_compatdll/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "err_compatdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/err_compatdll/Debug"
-# PROP Intermediate_Dir "../../../test/err_compatdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "err_compatdll - Win32 Release"
-# Name "err_compatdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\err_compat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/error_test/error_test.dsp b/windows_vs6/test/error_test/error_test.dsp
deleted file mode 100644
index 45c6a67..0000000
--- a/windows_vs6/test/error_test/error_test.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="error_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=error_test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "error_test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "error_test.mak" CFG="error_test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "error_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "error_test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "error_test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/error_test/Release"
-# PROP Intermediate_Dir "../../../test/error_test/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "error_test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/error_test/Debug"
-# PROP Intermediate_Dir "../../../test/error_test/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "error_test - Win32 Release"
-# Name "error_test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\error_test.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/error_testdll/error_testdll.dsp b/windows_vs6/test/error_testdll/error_testdll.dsp
deleted file mode 100644
index 94f479b..0000000
--- a/windows_vs6/test/error_testdll/error_testdll.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="error_testdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=error_testdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "error_testdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "error_testdll.mak" CFG="error_testdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "error_testdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "error_testdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "error_testdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/error_testdll/Release"
-# PROP Intermediate_Dir "../../../test/error_testdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "error_testdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/error_testdll/Debug"
-# PROP Intermediate_Dir "../../../test/error_testdll/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "error_testdll - Win32 Release"
-# Name "error_testdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\error_test.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/extend/extend.dsp b/windows_vs6/test/extend/extend.dsp
deleted file mode 100755
index 2cc6644..0000000
--- a/windows_vs6/test/extend/extend.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extend" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=extend - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extend.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extend.mak" CFG="extend - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extend - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extend - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "extend - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "extend - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "extend - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/extend/Release"
-# PROP Intermediate_Dir "../../../test/extend/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "extend - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/extend/Debug"
-# PROP Intermediate_Dir "../../../test/extend/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "extend - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "extend__"
-# PROP BASE Intermediate_Dir "extend__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"extend__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "extend - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "extend_0"
-# PROP BASE Intermediate_Dir "extend_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"extend_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extend - Win32 Release"
-# Name "extend - Win32 Debug"
-# Name "extend - Win32 AlphaDbg"
-# Name "extend - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\extend.c
-
-!IF  "$(CFG)" == "extend - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "extend - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "extend - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "extend - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/extenddll/extenddll.dsp b/windows_vs6/test/extenddll/extenddll.dsp
deleted file mode 100755
index cc83911..0000000
--- a/windows_vs6/test/extenddll/extenddll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extenddll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=extenddll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "extenddll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "extenddll.mak" CFG="extenddll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extenddll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "extenddll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "extenddll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "extenddll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "extenddll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/extenddll/Release"
-# PROP Intermediate_Dir "../../../test/extenddll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/extenddll/Debug"
-# PROP Intermediate_Dir "../../../test/extenddll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "extenddl"
-# PROP BASE Intermediate_Dir "extenddl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"extenddl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "extendd0"
-# PROP BASE Intermediate_Dir "extendd0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"extendd0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "extenddll - Win32 Release"
-# Name "extenddll - Win32 Debug"
-# Name "extenddll - Win32 AlphaDbg"
-# Name "extenddll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\extend.c
-
-!IF  "$(CFG)" == "extenddll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "extenddll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/external/external.dsp b/windows_vs6/test/external/external.dsp
deleted file mode 100755
index de3008e..0000000
--- a/windows_vs6/test/external/external.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="external" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=external - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "external.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "external.mak" CFG="external - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "external - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "external - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "external - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "external - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "external - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/external/Release"
-# PROP Intermediate_Dir "../../../test/external/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "external - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/external/Debug"
-# PROP Intermediate_Dir "../../../test/external/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "external - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "external"
-# PROP BASE Intermediate_Dir "external"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"external/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "external - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "externa0"
-# PROP BASE Intermediate_Dir "externa0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"externa0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "external - Win32 Release"
-# Name "external - Win32 Debug"
-# Name "external - Win32 AlphaDbg"
-# Name "external - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\external.c
-
-!IF  "$(CFG)" == "external - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "external - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "external - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "external - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/externaldll/externaldll.dsp b/windows_vs6/test/externaldll/externaldll.dsp
deleted file mode 100755
index c8e8115..0000000
--- a/windows_vs6/test/externaldll/externaldll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="externaldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=externaldll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "externaldll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "externaldll.mak" CFG="externaldll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "externaldll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "externaldll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "externaldll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "externaldll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "externaldll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/externaldll/Release"
-# PROP Intermediate_Dir "../../../test/externaldll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/externaldll/Debug"
-# PROP Intermediate_Dir "../../../test/externaldll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "external"
-# PROP BASE Intermediate_Dir "external"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"external/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "externa0"
-# PROP BASE Intermediate_Dir "externa0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"externa0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "externaldll - Win32 Release"
-# Name "externaldll - Win32 Debug"
-# Name "externaldll - Win32 AlphaDbg"
-# Name "externaldll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\external.c
-
-!IF  "$(CFG)" == "externaldll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "externaldll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/fheap/fheap.dsp b/windows_vs6/test/fheap/fheap.dsp
deleted file mode 100755
index 471cf22..0000000
--- a/windows_vs6/test/fheap/fheap.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fheap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=fheap - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fheap.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fheap.mak" CFG="fheap - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fheap - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fheap - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fheap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/fheap/Release"
-# PROP Intermediate_Dir "../../../test/fheap/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)  /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "fheap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/fheap/Debug"
-# PROP Intermediate_Dir "../../../test/fheap/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fheap - Win32 Release"
-# Name "fheap - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\fheap.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/fheapdll/fheapdll.dsp b/windows_vs6/test/fheapdll/fheapdll.dsp
deleted file mode 100755
index 85da1c0..0000000
--- a/windows_vs6/test/fheapdll/fheapdll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fheapdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=fheapdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fheapdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fheapdll.mak" CFG="fheapdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fheapdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fheapdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fheapdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/fheapdll/Release"
-# PROP Intermediate_Dir "../../../test/fheapdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "fheapdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/fheapdll/Debug"
-# PROP Intermediate_Dir "../../../test/fheapdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fheapdll - Win32 Release"
-# Name "fheapdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\fheap.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/fillval/fillval.dsp b/windows_vs6/test/fillval/fillval.dsp
deleted file mode 100755
index 1229859..0000000
--- a/windows_vs6/test/fillval/fillval.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fillval" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=fillval - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fillval.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fillval.mak" CFG="fillval - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fillval - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fillval - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "fillval - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "fillval - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "fillval - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/fillval/Release"
-# PROP Intermediate_Dir "../../../test/fillval/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/fillval/Debug"
-# PROP Intermediate_Dir "../../../test/fillval/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fillval_"
-# PROP BASE Intermediate_Dir "fillval_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"fillval_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fillval0"
-# PROP BASE Intermediate_Dir "fillval0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"fillval0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fillval - Win32 Release"
-# Name "fillval - Win32 Debug"
-# Name "fillval - Win32 AlphaDbg"
-# Name "fillval - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\fillval.c
-
-!IF  "$(CFG)" == "fillval - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "fillval - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/fillvaldll/fillvaldll.dsp b/windows_vs6/test/fillvaldll/fillvaldll.dsp
deleted file mode 100755
index 4d7c0f1..0000000
--- a/windows_vs6/test/fillvaldll/fillvaldll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fillvaldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=fillvaldll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "fillvaldll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "fillvaldll.mak" CFG="fillvaldll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fillvaldll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fillvaldll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "fillvaldll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "fillvaldll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "fillvaldll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/fillvaldll/Release"
-# PROP Intermediate_Dir "../../../test/fillvaldll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/fillvaldll/Debug"
-# PROP Intermediate_Dir "../../../test/fillvaldll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "fillvald"
-# PROP BASE Intermediate_Dir "fillvald"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"fillvald/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "fillval0"
-# PROP BASE Intermediate_Dir "fillval0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"fillval0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "fillvaldll - Win32 Release"
-# Name "fillvaldll - Win32 Debug"
-# Name "fillvaldll - Win32 AlphaDbg"
-# Name "fillvaldll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\fillval.c
-
-!IF  "$(CFG)" == "fillvaldll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "fillvaldll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/flush1/flush1.dsp b/windows_vs6/test/flush1/flush1.dsp
deleted file mode 100755
index bf8be2d..0000000
--- a/windows_vs6/test/flush1/flush1.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=flush1 - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1.mak" CFG="flush1 - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush1 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1 - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "flush1 - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "flush1 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/flush1/Release"
-# PROP Intermediate_Dir "../../../test/flush1/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/flush1/Debug"
-# PROP Intermediate_Dir "../../../test/flush1/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flush1__"
-# PROP BASE Intermediate_Dir "flush1__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"flush1__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flush1_0"
-# PROP BASE Intermediate_Dir "flush1_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"flush1_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush1 - Win32 Release"
-# Name "flush1 - Win32 Debug"
-# Name "flush1 - Win32 AlphaDbg"
-# Name "flush1 - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\flush1.c
-
-!IF  "$(CFG)" == "flush1 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "flush1 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/flush1dll/flush1dll.dsp b/windows_vs6/test/flush1dll/flush1dll.dsp
deleted file mode 100755
index c77f09c..0000000
--- a/windows_vs6/test/flush1dll/flush1dll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush1dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=flush1dll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush1dll.mak" CFG="flush1dll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush1dll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1dll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush1dll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "flush1dll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "flush1dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/flush1dll/Release"
-# PROP Intermediate_Dir "../../../test/flush1dll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/flush1dll/Debug"
-# PROP Intermediate_Dir "../../../test/flush1dll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flush1dl"
-# PROP BASE Intermediate_Dir "flush1dl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"flush1dl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flush1d0"
-# PROP BASE Intermediate_Dir "flush1d0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"flush1d0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush1dll - Win32 Release"
-# Name "flush1dll - Win32 Debug"
-# Name "flush1dll - Win32 AlphaDbg"
-# Name "flush1dll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\flush1.c
-
-!IF  "$(CFG)" == "flush1dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "flush1dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/flush2/flush2.dsp b/windows_vs6/test/flush2/flush2.dsp
deleted file mode 100755
index 6a4333b..0000000
--- a/windows_vs6/test/flush2/flush2.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=flush2 - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2.mak" CFG="flush2 - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush2 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2 - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "flush2 - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "flush2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/flush2/Release"
-# PROP Intermediate_Dir "../../../test/flush2/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/flush2/Debug"
-# PROP Intermediate_Dir "../../../test/flush2/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flush2__"
-# PROP BASE Intermediate_Dir "flush2__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"flush2__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flush2_0"
-# PROP BASE Intermediate_Dir "flush2_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"flush2_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush2 - Win32 Release"
-# Name "flush2 - Win32 Debug"
-# Name "flush2 - Win32 AlphaDbg"
-# Name "flush2 - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\flush2.c
-
-!IF  "$(CFG)" == "flush2 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "flush2 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/flush2dll/flush2dll.dsp b/windows_vs6/test/flush2dll/flush2dll.dsp
deleted file mode 100755
index 027e681..0000000
--- a/windows_vs6/test/flush2dll/flush2dll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flush2dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=flush2dll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "flush2dll.mak" CFG="flush2dll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "flush2dll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2dll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "flush2dll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "flush2dll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "flush2dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/flush2dll/Release"
-# PROP Intermediate_Dir "../../../test/flush2dll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/flush2dll/Debug"
-# PROP Intermediate_Dir "../../../test/flush2dll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flush2dl"
-# PROP BASE Intermediate_Dir "flush2dl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"flush2dl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flush2d0"
-# PROP BASE Intermediate_Dir "flush2d0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"flush2d0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "flush2dll - Win32 Release"
-# Name "flush2dll - Win32 Debug"
-# Name "flush2dll - Win32 AlphaDbg"
-# Name "flush2dll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\flush2.c
-
-!IF  "$(CFG)" == "flush2dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "flush2dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/getname/getname.dsp b/windows_vs6/test/getname/getname.dsp
deleted file mode 100755
index 05f4379..0000000
--- a/windows_vs6/test/getname/getname.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="getname" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=getname - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "getname.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "getname.mak" CFG="getname - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "getname - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "getname - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "getname - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/getname/Release"
-# PROP Intermediate_Dir "../../../test/getname/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "getname - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/getname/Debug"
-# PROP Intermediate_Dir "../../../test/getname/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "getname - Win32 Release"
-# Name "getname - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\getname.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/getnamedll/getnamedll.dsp b/windows_vs6/test/getnamedll/getnamedll.dsp
deleted file mode 100755
index 5ef1982..0000000
--- a/windows_vs6/test/getnamedll/getnamedll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="getnamedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=getnamedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "getnamedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "getnamedll.mak" CFG="getnamedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "getnamedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "getnamedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "getnamedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/getnamedll/Release"
-# PROP Intermediate_Dir "../../../test/getnamedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "getnamedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/getnamedll/Debug"
-# PROP Intermediate_Dir "../../../test/getnamedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "getnamedll - Win32 Release"
-# Name "getnamedll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\getname.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/getub/getub.dsp b/windows_vs6/test/getub/getub.dsp
deleted file mode 100755
index 80551bb..0000000
--- a/windows_vs6/test/getub/getub.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="getub" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=getub - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "getub.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "getub.mak" CFG="getub - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "getub - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "getub - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "getub - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/getub/Release"
-# PROP Intermediate_Dir "../../../test/getub/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "getub - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/getub/Debug"
-# PROP Intermediate_Dir "../../../test/getub/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "getub - Win32 Release"
-# Name "getub - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\getub.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/gheap/gheap.dsp b/windows_vs6/test/gheap/gheap.dsp
deleted file mode 100755
index fcdc793..0000000
--- a/windows_vs6/test/gheap/gheap.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gheap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=gheap - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gheap.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gheap.mak" CFG="gheap - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gheap - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gheap - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "gheap - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "gheap - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "gheap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/gheap/Release"
-# PROP Intermediate_Dir "../../../test/gheap/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/gheap/Debug"
-# PROP Intermediate_Dir "../../../test/gheap/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gheap___"
-# PROP BASE Intermediate_Dir "gheap___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"gheap___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gheap__0"
-# PROP BASE Intermediate_Dir "gheap__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"gheap__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gheap - Win32 Release"
-# Name "gheap - Win32 Debug"
-# Name "gheap - Win32 AlphaDbg"
-# Name "gheap - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\gheap.c
-
-!IF  "$(CFG)" == "gheap - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "gheap - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/gheapdll/gheapdll.dsp b/windows_vs6/test/gheapdll/gheapdll.dsp
deleted file mode 100755
index 3763f82..0000000
--- a/windows_vs6/test/gheapdll/gheapdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gheapdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=gheapdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gheapdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gheapdll.mak" CFG="gheapdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gheapdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gheapdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "gheapdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "gheapdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "gheapdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/gheapdll/Release"
-# PROP Intermediate_Dir "../../../test/gheapdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/gheapdll/Debug"
-# PROP Intermediate_Dir "../../../test/gheapdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gheapdll"
-# PROP BASE Intermediate_Dir "gheapdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"gheapdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gheapdl0"
-# PROP BASE Intermediate_Dir "gheapdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"gheapdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gheapdll - Win32 Release"
-# Name "gheapdll - Win32 Debug"
-# Name "gheapdll - Win32 AlphaDbg"
-# Name "gheapdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\gheap.c
-
-!IF  "$(CFG)" == "gheapdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "gheapdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/hyperslab/hyperslab.dsp b/windows_vs6/test/hyperslab/hyperslab.dsp
deleted file mode 100755
index 093ede8..0000000
--- a/windows_vs6/test/hyperslab/hyperslab.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hyperslab" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=hyperslab - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslab.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslab.mak" CFG="hyperslab - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hyperslab - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslab - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslab - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "hyperslab - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "hyperslab - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/hyperslab/Release"
-# PROP Intermediate_Dir "../../../test/hyperslab/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/hyperslab/Debug"
-# PROP Intermediate_Dir "../../../test/hyperslab/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hypersla"
-# PROP BASE Intermediate_Dir "hypersla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"hypersla/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "hypersl0"
-# PROP BASE Intermediate_Dir "hypersl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"hypersl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hyperslab - Win32 Release"
-# Name "hyperslab - Win32 Debug"
-# Name "hyperslab - Win32 AlphaDbg"
-# Name "hyperslab - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\hyperslab.c
-
-!IF  "$(CFG)" == "hyperslab - Win32 Release"
-
-# PROP Intermediate_Dir "../../../test/hyperslab/Release"
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hyperslab - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/hyperslabdll/hyperslabdll.dsp b/windows_vs6/test/hyperslabdll/hyperslabdll.dsp
deleted file mode 100755
index 156e386..0000000
--- a/windows_vs6/test/hyperslabdll/hyperslabdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hyperslabdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=hyperslabdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "hyperslabdll.mak" CFG="hyperslabdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "hyperslabdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslabdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "hyperslabdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "hyperslabdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "hyperslabdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/hyperslabdll/Release"
-# PROP Intermediate_Dir "../../../test/hyperslabdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/hyperslabdll/Debug"
-# PROP Intermediate_Dir "../../../test/hyperslabdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hypersla"
-# PROP BASE Intermediate_Dir "hypersla"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"hypersla/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "hypersl0"
-# PROP BASE Intermediate_Dir "hypersl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"hypersl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "hyperslabdll - Win32 Release"
-# Name "hyperslabdll - Win32 Debug"
-# Name "hyperslabdll - Win32 AlphaDbg"
-# Name "hyperslabdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\hyperslab.c
-
-!IF  "$(CFG)" == "hyperslabdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "hyperslabdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/iopipe/iopipe.dsp b/windows_vs6/test/iopipe/iopipe.dsp
deleted file mode 100755
index ec7d838..0000000
--- a/windows_vs6/test/iopipe/iopipe.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iopipe" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=iopipe - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "iopipe.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "iopipe.mak" CFG="iopipe - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "iopipe - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "iopipe - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "iopipe - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "iopipe - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "iopipe - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/iopipe/Release"
-# PROP Intermediate_Dir "../../../test/iopipe/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/iopipe/Debug"
-# PROP Intermediate_Dir "../../../test/iopipe/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "iopipe__"
-# PROP BASE Intermediate_Dir "iopipe__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"iopipe__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "iopipe_0"
-# PROP BASE Intermediate_Dir "iopipe_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"iopipe_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "iopipe - Win32 Release"
-# Name "iopipe - Win32 Debug"
-# Name "iopipe - Win32 AlphaDbg"
-# Name "iopipe - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\iopipe.c
-
-!IF  "$(CFG)" == "iopipe - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "iopipe - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/iopipedll/iopipedll.dsp b/windows_vs6/test/iopipedll/iopipedll.dsp
deleted file mode 100755
index 805354d..0000000
--- a/windows_vs6/test/iopipedll/iopipedll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iopipedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=iopipedll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "iopipedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "iopipedll.mak" CFG="iopipedll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "iopipedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "iopipedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "iopipedll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "iopipedll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "iopipedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/iopipedll/Release"
-# PROP Intermediate_Dir "../../../test/iopipedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/iopipedll/Debug"
-# PROP Intermediate_Dir "../../../test/iopipedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "iopipedl"
-# PROP BASE Intermediate_Dir "iopipedl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"iopipedl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "iopiped0"
-# PROP BASE Intermediate_Dir "iopiped0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"iopiped0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "iopipedll - Win32 Release"
-# Name "iopipedll - Win32 Debug"
-# Name "iopipedll - Win32 AlphaDbg"
-# Name "iopipedll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\iopipe.c
-
-!IF  "$(CFG)" == "iopipedll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "iopipedll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/istore/istore.dsp b/windows_vs6/test/istore/istore.dsp
deleted file mode 100755
index 46f05c1..0000000
--- a/windows_vs6/test/istore/istore.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="istore" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=istore - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "istore.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "istore.mak" CFG="istore - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "istore - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "istore - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "istore - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "istore - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "istore - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/istore/Release"
-# PROP Intermediate_Dir "../../../test/istore/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "istore - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/istore/Debug"
-# PROP Intermediate_Dir "../../../test/istore/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "istore - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "istore__"
-# PROP BASE Intermediate_Dir "istore__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"istore__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "istore - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "istore_0"
-# PROP BASE Intermediate_Dir "istore_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"istore_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "istore - Win32 Release"
-# Name "istore - Win32 Debug"
-# Name "istore - Win32 AlphaDbg"
-# Name "istore - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\istore.c
-
-!IF  "$(CFG)" == "istore - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "istore - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "istore - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "istore - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/istoredll/istoredll.dsp b/windows_vs6/test/istoredll/istoredll.dsp
deleted file mode 100755
index cd7cd6a..0000000
--- a/windows_vs6/test/istoredll/istoredll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="istoredll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=istoredll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "istoredll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "istoredll.mak" CFG="istoredll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "istoredll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "istoredll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "istoredll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "istoredll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "istoredll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/istoredll/Release"
-# PROP Intermediate_Dir "../../../test/istoredll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/istoredll/Debug"
-# PROP Intermediate_Dir "../../../test/istoredll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "istoredl"
-# PROP BASE Intermediate_Dir "istoredl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"istoredl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "istored0"
-# PROP BASE Intermediate_Dir "istored0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"istored0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "istoredll - Win32 Release"
-# Name "istoredll - Win32 Debug"
-# Name "istoredll - Win32 AlphaDbg"
-# Name "istoredll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\istore.c
-
-!IF  "$(CFG)" == "istoredll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "istoredll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/lheap/lheap.dsp b/windows_vs6/test/lheap/lheap.dsp
deleted file mode 100755
index 2c8ce19..0000000
--- a/windows_vs6/test/lheap/lheap.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="lheap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=lheap - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "lheap.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "lheap.mak" CFG="lheap - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "lheap - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "lheap - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "lheap - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "lheap - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "lheap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/lheap/Release"
-# PROP Intermediate_Dir "../../../test/lheap/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/lheap/Debug"
-# PROP Intermediate_Dir "../../../test/lheap/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "lheap___"
-# PROP BASE Intermediate_Dir "lheap___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"lheap___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "lheap__0"
-# PROP BASE Intermediate_Dir "lheap__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"lheap__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "lheap - Win32 Release"
-# Name "lheap - Win32 Debug"
-# Name "lheap - Win32 AlphaDbg"
-# Name "lheap - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\lheap.c
-
-!IF  "$(CFG)" == "lheap - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "lheap - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/lheapdll/lheapdll.dsp b/windows_vs6/test/lheapdll/lheapdll.dsp
deleted file mode 100755
index 49b8f6f..0000000
--- a/windows_vs6/test/lheapdll/lheapdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="lheapdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=lheapdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "lheapdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "lheapdll.mak" CFG="lheapdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "lheapdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "lheapdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "lheapdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "lheapdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "lheapdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/lheapdll/Release"
-# PROP Intermediate_Dir "../../../test/lheapdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/lheapdll/Debug"
-# PROP Intermediate_Dir "../../../test/lheapdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "lheapdll"
-# PROP BASE Intermediate_Dir "lheapdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"lheapdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "lheapdl0"
-# PROP BASE Intermediate_Dir "lheapdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"lheapdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "lheapdll - Win32 Release"
-# Name "lheapdll - Win32 Debug"
-# Name "lheapdll - Win32 AlphaDbg"
-# Name "lheapdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\lheap.c
-
-!IF  "$(CFG)" == "lheapdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "lheapdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/libtest/libtest.dsp b/windows_vs6/test/libtest/libtest.dsp
deleted file mode 100755
index 9028b96..0000000
--- a/windows_vs6/test/libtest/libtest.dsp
+++ /dev/null
@@ -1,127 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtest.mak" CFG="libtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtest - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libtest - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\test\libtest\Release"
-# PROP Intermediate_Dir "..\..\..\test\libtest\Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\test\libtest\Debug"
-# PROP Intermediate_Dir "..\..\..\test\libtest\Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtest - Win32 Release"
-# Name "libtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\h5test.c
-
-!IF  "$(CFG)" == "libtest - Win32 Release"
-
-# PROP Intermediate_Dir "..\..\..\test\libtest\Release"
-
-!ELSEIF  "$(CFG)" == "libtest - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\test\libtest\Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\testframe.c
-
-!IF  "$(CFG)" == "libtest - Win32 Release"
-
-# PROP Intermediate_Dir "..\..\..\test\libtest\Release"
-
-!ELSEIF  "$(CFG)" == "libtest - Win32 Debug"
-
-# PROP Intermediate_Dir "..\..\..\test\libtest\Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/libtestD/libtestD.dsp b/windows_vs6/test/libtestD/libtestD.dsp
deleted file mode 100755
index 9df025f..0000000
--- a/windows_vs6/test/libtestD/libtestD.dsp
+++ /dev/null
@@ -1,116 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtestD" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libtestD - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtestD.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtestD.mak" CFG="libtestD - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtestD - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libtestD - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtestD - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/libtestD/Release"
-# PROP Intermediate_Dir "../../../test/libtestD/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /D "_HDF5TESTDLL_" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "libtestD - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/libtestD/Debug"
-# PROP Intermediate_Dir "../../../test/libtestD/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /D "_HDF5TESTDLL_" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../../../test/libtestD/Debug/libtestDd.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtestD - Win32 Release"
-# Name "libtestD - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\h5test.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\testframe.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/links/links.dsp b/windows_vs6/test/links/links.dsp
deleted file mode 100755
index 4760a95..0000000
--- a/windows_vs6/test/links/links.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="links" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=links - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "links.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "links.mak" CFG="links - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "links - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "links - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "links - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "links - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "links - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/links/Release"
-# PROP Intermediate_Dir "../../../test/links/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "links - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/links/Debug"
-# PROP Intermediate_Dir "../../../test/links/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "links - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "links___"
-# PROP BASE Intermediate_Dir "links___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"links___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "links - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "links__0"
-# PROP BASE Intermediate_Dir "links__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"links__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "links - Win32 Release"
-# Name "links - Win32 Debug"
-# Name "links - Win32 AlphaDbg"
-# Name "links - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\links.c
-
-!IF  "$(CFG)" == "links - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "links - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "links - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "links - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/linksdll/linksdll.dsp b/windows_vs6/test/linksdll/linksdll.dsp
deleted file mode 100755
index d3f86a3..0000000
--- a/windows_vs6/test/linksdll/linksdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="linksdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=linksdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "linksdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "linksdll.mak" CFG="linksdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "linksdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "linksdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "linksdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "linksdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "linksdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/linksdll/Release"
-# PROP Intermediate_Dir "../../../test/linksdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/linksdll/Debug"
-# PROP Intermediate_Dir "../../../test/linksdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "linksdll"
-# PROP BASE Intermediate_Dir "linksdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"linksdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "linksdl0"
-# PROP BASE Intermediate_Dir "linksdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"linksdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "linksdll - Win32 Release"
-# Name "linksdll - Win32 Debug"
-# Name "linksdll - Win32 AlphaDbg"
-# Name "linksdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\links.c
-
-!IF  "$(CFG)" == "linksdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "linksdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/mount/mount.dsp b/windows_vs6/test/mount/mount.dsp
deleted file mode 100755
index 03f1271..0000000
--- a/windows_vs6/test/mount/mount.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mount" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=mount - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mount.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mount.mak" CFG="mount - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mount - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mount - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "mount - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "mount - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "mount - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/mount/Release"
-# PROP Intermediate_Dir "../../../test/mount/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "mount - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/mount/Debug"
-# PROP Intermediate_Dir "../../../test/mount/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mount - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mount___"
-# PROP BASE Intermediate_Dir "mount___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"mount___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mount - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mount__0"
-# PROP BASE Intermediate_Dir "mount__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"mount__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mount - Win32 Release"
-# Name "mount - Win32 Debug"
-# Name "mount - Win32 AlphaDbg"
-# Name "mount - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\mount.c
-
-!IF  "$(CFG)" == "mount - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mount - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "mount - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "mount - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/mountdll/mountdll.dsp b/windows_vs6/test/mountdll/mountdll.dsp
deleted file mode 100755
index 5c02b4f..0000000
--- a/windows_vs6/test/mountdll/mountdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mountdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=mountdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mountdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mountdll.mak" CFG="mountdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mountdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mountdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "mountdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "mountdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "mountdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/mountdll/Release"
-# PROP Intermediate_Dir "../../../test/mountdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/mountdll/Debug"
-# PROP Intermediate_Dir "../../../test/mountdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mountdll"
-# PROP BASE Intermediate_Dir "mountdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"mountdll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mountdl0"
-# PROP BASE Intermediate_Dir "mountdl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"mountdl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mountdll - Win32 Release"
-# Name "mountdll - Win32 Debug"
-# Name "mountdll - Win32 AlphaDbg"
-# Name "mountdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\mount.c
-
-!IF  "$(CFG)" == "mountdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "mountdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/mtime/mtime.dsp b/windows_vs6/test/mtime/mtime.dsp
deleted file mode 100755
index 2735f82..0000000
--- a/windows_vs6/test/mtime/mtime.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mtime" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=mtime - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mtime.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mtime.mak" CFG="mtime - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mtime - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mtime - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "mtime - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "mtime - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "mtime - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/mtime/Release"
-# PROP Intermediate_Dir "../../../test/mtime/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/mtime/Debug"
-# PROP Intermediate_Dir "../../../test/mtime/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mtime___"
-# PROP BASE Intermediate_Dir "mtime___"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"mtime___/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mtime__0"
-# PROP BASE Intermediate_Dir "mtime__0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"mtime__0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mtime - Win32 Release"
-# Name "mtime - Win32 Debug"
-# Name "mtime - Win32 AlphaDbg"
-# Name "mtime - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\mtime.c
-
-!IF  "$(CFG)" == "mtime - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "mtime - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/mtimedll/mtimedll.dsp b/windows_vs6/test/mtimedll/mtimedll.dsp
deleted file mode 100755
index 5e915c8..0000000
--- a/windows_vs6/test/mtimedll/mtimedll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mtimedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=mtimedll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mtimedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mtimedll.mak" CFG="mtimedll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mtimedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "mtimedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "mtimedll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "mtimedll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "mtimedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/mtimedll/Release"
-# PROP Intermediate_Dir "../../../test/mtimedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/mtimedll/Debug"
-# PROP Intermediate_Dir "../../../test/mtimedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mtimedll"
-# PROP BASE Intermediate_Dir "mtimedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"mtimedll/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mtimedl0"
-# PROP BASE Intermediate_Dir "mtimedl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"mtimedl0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mtimedll - Win32 Release"
-# Name "mtimedll - Win32 Debug"
-# Name "mtimedll - Win32 AlphaDbg"
-# Name "mtimedll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\mtime.c
-
-!IF  "$(CFG)" == "mtimedll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "mtimedll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/ntypes/ntypes.dsp b/windows_vs6/test/ntypes/ntypes.dsp
deleted file mode 100755
index f498c0f..0000000
--- a/windows_vs6/test/ntypes/ntypes.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ntypes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ntypes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ntypes.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ntypes.mak" CFG="ntypes - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ntypes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ntypes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ntypes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ntypes/Release"
-# PROP Intermediate_Dir "../../../test/ntypes/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "ntypes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ntypes/Debug"
-# PROP Intermediate_Dir "../../../test/ntypes/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ntypes - Win32 Release"
-# Name "ntypes - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\ntypes.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/ntypesdll/ntypesdll.dsp b/windows_vs6/test/ntypesdll/ntypesdll.dsp
deleted file mode 100755
index f02a36a..0000000
--- a/windows_vs6/test/ntypesdll/ntypesdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ntypesdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ntypesdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ntypesdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ntypesdll.mak" CFG="ntypesdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ntypesdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ntypesdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ntypesdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ntypesdll/Release"
-# PROP Intermediate_Dir "../../../test/ntypesdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "ntypesdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ntypesdll/Debug"
-# PROP Intermediate_Dir "../../../test/ntypesdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ntypesdll - Win32 Release"
-# Name "ntypesdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\ntypes.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/objcopy/objcopy.dsp b/windows_vs6/test/objcopy/objcopy.dsp
deleted file mode 100755
index e6a0631..0000000
--- a/windows_vs6/test/objcopy/objcopy.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="objcopy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=objcopy - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "objcopy.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "objcopy.mak" CFG="objcopy - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "objcopy - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "objcopy - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "objcopy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/objcopy/Release"
-# PROP Intermediate_Dir "../../../test/objcopy/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)  WS2_32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "objcopy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/objcopy/Debug"
-# PROP Intermediate_Dir "../../../test/objcopy/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "objcopy - Win32 Release"
-# Name "objcopy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\objcopy.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/objcopydll/objcopydll.dsp b/windows_vs6/test/objcopydll/objcopydll.dsp
deleted file mode 100755
index d46b423..0000000
--- a/windows_vs6/test/objcopydll/objcopydll.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="objcopydll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=objcopydll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "objcopydll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "objcopydll.mak" CFG="objcopydll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "objcopydll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "objcopydll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "objcopydll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/objcopydll/Release"
-# PROP Intermediate_Dir "../../../test/objcopydll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "objcopydll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/objcopydll/Debug"
-# PROP Intermediate_Dir "../../../test/objcopydll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "objcopydll - Win32 Release"
-# Name "objcopydll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\objcopy.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/ohdr/ohdr.dsp b/windows_vs6/test/ohdr/ohdr.dsp
deleted file mode 100755
index f1a4956..0000000
--- a/windows_vs6/test/ohdr/ohdr.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ohdr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=ohdr - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdr.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdr.mak" CFG="ohdr - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ohdr - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ohdr - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "ohdr - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "ohdr - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "ohdr - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ohdr/Release"
-# PROP Intermediate_Dir "../../../test/ohdr/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ohdr/Debug"
-# PROP Intermediate_Dir "../../../test/ohdr/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ohdr___W"
-# PROP BASE Intermediate_Dir "ohdr___W"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"ohdr___W/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ohdr___0"
-# PROP BASE Intermediate_Dir "ohdr___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"ohdr___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ohdr - Win32 Release"
-# Name "ohdr - Win32 Debug"
-# Name "ohdr - Win32 AlphaDbg"
-# Name "ohdr - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\ohdr.c
-
-!IF  "$(CFG)" == "ohdr - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "ohdr - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp b/windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp
deleted file mode 100644
index 3df8342..0000000
--- a/windows_vs6/test/ohdr_gentst/ohdr_gentst.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ohdr_gentst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ohdr_gentst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdr_gentst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdr_gentst.mak" CFG="ohdr_gentst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ohdr_gentst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ohdr_gentst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ohdr_gentst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ohdr_gentst/Release"
-# PROP Intermediate_Dir "../../../test/ohdr_gentst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)  /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "ohdr_gentst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ohdr_gentst/Debug"
-# PROP Intermediate_Dir "../../../test/ohdr_gentst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ohdr_gentst - Win32 Release"
-# Name "ohdr_gentst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\gen_bogus.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/ohdrdll/ohdrdll.dsp b/windows_vs6/test/ohdrdll/ohdrdll.dsp
deleted file mode 100755
index a67f43b..0000000
--- a/windows_vs6/test/ohdrdll/ohdrdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ohdrdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=ohdrdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdrdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ohdrdll.mak" CFG="ohdrdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ohdrdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ohdrdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "ohdrdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "ohdrdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "ohdrdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ohdrdll/Release"
-# PROP Intermediate_Dir "../../../test/ohdrdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ohdrdll/Debug"
-# PROP Intermediate_Dir "../../../test/ohdrdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ohdrdll_"
-# PROP BASE Intermediate_Dir "ohdrdll_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"ohdrdll_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ohdrdll0"
-# PROP BASE Intermediate_Dir "ohdrdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"ohdrdll0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ohdrdll - Win32 Release"
-# Name "ohdrdll - Win32 Debug"
-# Name "ohdrdll - Win32 AlphaDbg"
-# Name "ohdrdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\ohdr.c
-
-!IF  "$(CFG)" == "ohdrdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "ohdrdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/overhead/overhead.dsp b/windows_vs6/test/overhead/overhead.dsp
deleted file mode 100755
index 629dcf7..0000000
--- a/windows_vs6/test/overhead/overhead.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="overhead" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=overhead - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "overhead.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "overhead.mak" CFG="overhead - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "overhead - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "overhead - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "overhead - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "overhead - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "overhead - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/overhead/Release"
-# PROP Intermediate_Dir "../../../test/overhead/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/overhead/Debug"
-# PROP Intermediate_Dir "../../../test/overhead/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "overhead"
-# PROP BASE Intermediate_Dir "overhead"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"overhead/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "overhea0"
-# PROP BASE Intermediate_Dir "overhea0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"overhea0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "overhead - Win32 Release"
-# Name "overhead - Win32 Debug"
-# Name "overhead - Win32 AlphaDbg"
-# Name "overhead - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\overhead.c
-
-!IF  "$(CFG)" == "overhead - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "overhead - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/overheaddll/overheaddll.dsp b/windows_vs6/test/overheaddll/overheaddll.dsp
deleted file mode 100755
index 725c989..0000000
--- a/windows_vs6/test/overheaddll/overheaddll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="overheaddll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=overheaddll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "overheaddll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "overheaddll.mak" CFG="overheaddll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "overheaddll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "overheaddll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "overheaddll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "overheaddll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "overheaddll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/overheaddll/Release"
-# PROP Intermediate_Dir "../../../test/overheaddll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/overheaddll/Debug"
-# PROP Intermediate_Dir "../../../test/overheaddll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "overhead"
-# PROP BASE Intermediate_Dir "overhead"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"overhead/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "overhea0"
-# PROP BASE Intermediate_Dir "overhea0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"overhea0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "overheaddll - Win32 Release"
-# Name "overheaddll - Win32 Debug"
-# Name "overheaddll - Win32 AlphaDbg"
-# Name "overheaddll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\perform\overhead.c
-
-!IF  "$(CFG)" == "overheaddll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "overheaddll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/pool/pool.dsp b/windows_vs6/test/pool/pool.dsp
deleted file mode 100755
index 0a9c8ef..0000000
--- a/windows_vs6/test/pool/pool.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pool" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=pool - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "pool.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "pool.mak" CFG="pool - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pool - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pool - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "pool - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/pool/Release"
-# PROP Intermediate_Dir "../../../test/pool/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "pool - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/pool/Debug"
-# PROP Intermediate_Dir "../../../test/pool/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pool - Win32 Release"
-# Name "pool - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\pool.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/pooldll/pooldll.dsp b/windows_vs6/test/pooldll/pooldll.dsp
deleted file mode 100755
index 8ce6148..0000000
--- a/windows_vs6/test/pooldll/pooldll.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pooldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=pooldll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "pooldll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "pooldll.mak" CFG="pooldll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pooldll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pooldll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "pooldll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/pooldll/Release"
-# PROP Intermediate_Dir "../../../test/pooldll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "pooldll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/pooldll/Debug"
-# PROP Intermediate_Dir "../../../test/pooldll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pooldll - Win32 Release"
-# Name "pooldll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\pool.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/ref/ref.dsp b/windows_vs6/test/ref/ref.dsp
deleted file mode 100644
index 2f90ecf..0000000
--- a/windows_vs6/test/ref/ref.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ref" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ref - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ref.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ref.mak" CFG="ref - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ref - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ref - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ref - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ref/Release"
-# PROP Intermediate_Dir "../../../test/ref/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "ref - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ref/Debug"
-# PROP Intermediate_Dir "../../../test/ref/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ref - Win32 Release"
-# Name "ref - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\ref.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/refdll/refdll.dsp b/windows_vs6/test/refdll/refdll.dsp
deleted file mode 100644
index 71f5cae..0000000
--- a/windows_vs6/test/refdll/refdll.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="refdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=refdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "refdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "refdll.mak" CFG="refdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "refdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "refdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "refdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/refdll/Release"
-# PROP Intermediate_Dir "../../../test/refdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "refdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/refdll/Debug"
-# PROP Intermediate_Dir "../../../test/refdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "refdll - Win32 Release"
-# Name "refdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\test\ref.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/reserved/reserved.dsp b/windows_vs6/test/reserved/reserved.dsp
deleted file mode 100755
index 0ab665d..0000000
--- a/windows_vs6/test/reserved/reserved.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="reserved" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=reserved - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "reserved.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "reserved.mak" CFG="reserved - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "reserved - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "reserved - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "reserved - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/reserved/Release"
-# PROP Intermediate_Dir "../../../test/reserved/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "reserved - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/reserved/Debug"
-# PROP Intermediate_Dir "../../../test/reserved/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "reserved - Win32 Release"
-# Name "reserved - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\reserved.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/reserveddll/reserveddll.dsp b/windows_vs6/test/reserveddll/reserveddll.dsp
deleted file mode 100755
index 7652296..0000000
--- a/windows_vs6/test/reserveddll/reserveddll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="reserveddll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=reserveddll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "reserveddll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "reserveddll.mak" CFG="reserveddll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "reserveddll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "reserveddll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "reserveddll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/reserveddll/Release"
-# PROP Intermediate_Dir "../../../test/reserveddll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "reserveddll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/reserveddll/Debug"
-# PROP Intermediate_Dir "../../../test/reserveddll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "reserveddll - Win32 Release"
-# Name "reserveddll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\reserved.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/set_extent/set_extent.dsp b/windows_vs6/test/set_extent/set_extent.dsp
deleted file mode 100755
index 90ac49f..0000000
--- a/windows_vs6/test/set_extent/set_extent.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="set_extent" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=set_extent - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "set_extent.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "set_extent.mak" CFG="set_extent - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "set_extent - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "set_extent - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "set_extent - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/set_extent/Release"
-# PROP Intermediate_Dir "../../../test/set_extent/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "set_extent - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/set_extent/Debug"
-# PROP Intermediate_Dir "../../../test/set_extent/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "set_extent - Win32 Release"
-# Name "set_extent - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\set_extent.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/set_extentdll/set_extentdll.dsp b/windows_vs6/test/set_extentdll/set_extentdll.dsp
deleted file mode 100755
index 6c8672a..0000000
--- a/windows_vs6/test/set_extentdll/set_extentdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="set_extentdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=set_extentdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "set_extentdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "set_extentdll.mak" CFG="set_extentdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "set_extentdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "set_extentdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "set_extentdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/set_extentdll/Release"
-# PROP Intermediate_Dir "../../../test/set_extentdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x404 /d "NDEBUG"
-# ADD RSC /l 0x404 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "set_extentdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/set_extentdll/Debug"
-# PROP Intermediate_Dir "../../../test/set_extentdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x404 /d "_DEBUG"
-# ADD RSC /l 0x404 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "set_extentdll - Win32 Release"
-# Name "set_extentdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\test\set_extent.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/stab/stab.dsp b/windows_vs6/test/stab/stab.dsp
deleted file mode 100755
index 3b4dcbd..0000000
--- a/windows_vs6/test/stab/stab.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stab" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=stab - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "stab.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "stab.mak" CFG="stab - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stab - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "stab - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "stab - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "stab - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "stab - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/stab/Release"
-# PROP Intermediate_Dir "../../../test/stab/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "stab - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/stab/Debug"
-# PROP Intermediate_Dir "../../../test/stab/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "stab - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "stab___W"
-# PROP BASE Intermediate_Dir "stab___W"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"stab___W/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "stab - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "stab___0"
-# PROP BASE Intermediate_Dir "stab___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"stab___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "stab - Win32 Release"
-# Name "stab - Win32 Debug"
-# Name "stab - Win32 AlphaDbg"
-# Name "stab - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\stab.c
-
-!IF  "$(CFG)" == "stab - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "stab - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "stab - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "stab - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/stabdll/stabdll.dsp b/windows_vs6/test/stabdll/stabdll.dsp
deleted file mode 100755
index 6d9b8f0..0000000
--- a/windows_vs6/test/stabdll/stabdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stabdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=stabdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "stabdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "stabdll.mak" CFG="stabdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stabdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "stabdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "stabdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "stabdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "stabdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/stabdll/Release"
-# PROP Intermediate_Dir "../../../test/stabdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\test" /I "..\..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/stabdll/Debug"
-# PROP Intermediate_Dir "../../../test/stabdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\test" /I "..\..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "stabdll_"
-# PROP BASE Intermediate_Dir "stabdll_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\test" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"stabdll_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "stabdll0"
-# PROP BASE Intermediate_Dir "stabdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"stabdll0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "stabdll - Win32 Release"
-# Name "stabdll - Win32 Debug"
-# Name "stabdll - Win32 AlphaDbg"
-# Name "stabdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\stab.c
-
-!IF  "$(CFG)" == "stabdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "stabdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/tellub/tellub.dsp b/windows_vs6/test/tellub/tellub.dsp
deleted file mode 100755
index 7a01fe2..0000000
--- a/windows_vs6/test/tellub/tellub.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="tellub" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=tellub - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "tellub.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "tellub.mak" CFG="tellub - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "tellub - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "tellub - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "tellub - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/tellub/Release"
-# PROP Intermediate_Dir "../../../test/tellub/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "tellub - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/tellub/Debug"
-# PROP Intermediate_Dir "../../../test/tellub/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "tellub - Win32 Release"
-# Name "tellub - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\tellub.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/testhdf5/testhdf5.dsp b/windows_vs6/test/testhdf5/testhdf5.dsp
deleted file mode 100755
index cab8848..0000000
--- a/windows_vs6/test/testhdf5/testhdf5.dsp
+++ /dev/null
@@ -1,530 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=testhdf5 - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5.mak" CFG="testhdf5 - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5 - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "testhdf5 - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/testhdf5/Release"
-# PROP Intermediate_Dir "../../../test/testhdf5/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "WIN32" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/testhdf5/Debug"
-# PROP Intermediate_Dir "../../../test/testhdf5/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "testhdf5"
-# PROP BASE Intermediate_Dir "testhdf5"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"testhdf5/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "testhdf0"
-# PROP BASE Intermediate_Dir "testhdf0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"testhdf0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5 - Win32 Release"
-# Name "testhdf5 - Win32 Debug"
-# Name "testhdf5 - Win32 AlphaDbg"
-# Name "testhdf5 - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\tarray.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tattr.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tchecksum.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tconfig.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\testframe.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\testhdf5.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tfile.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tgenprop.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\th5o.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\th5s.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\theap.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tid.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\titerate.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tmeta.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tmisc.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\trefer.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\trefstr.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tselect.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tskiplist.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tsohm.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttime.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttst.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tunicode.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tvlstr.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tvltypes.c
-
-!IF  "$(CFG)" == "testhdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5 - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/testhdf5dll/testhdf5dll.dsp b/windows_vs6/test/testhdf5dll/testhdf5dll.dsp
deleted file mode 100755
index 67c8f4f..0000000
--- a/windows_vs6/test/testhdf5dll/testhdf5dll.dsp
+++ /dev/null
@@ -1,517 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testhdf5dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=testhdf5dll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testhdf5dll.mak" CFG="testhdf5dll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testhdf5dll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5dll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "testhdf5dll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "testhdf5dll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/testhdf5dll/Release"
-# PROP Intermediate_Dir "../../../test/testhdf5dll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "NDEBUG" /D "WIN32" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/testhdf5dll/Debug"
-# PROP Intermediate_Dir "../../../test/testhdf5dll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_DEBUG" /D "WIN32" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "testhdf5"
-# PROP BASE Intermediate_Dir "testhdf5"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"testhdf5/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "testhdf0"
-# PROP BASE Intermediate_Dir "testhdf0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"testhdf0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testhdf5dll - Win32 Release"
-# Name "testhdf5dll - Win32 Debug"
-# Name "testhdf5dll - Win32 AlphaDbg"
-# Name "testhdf5dll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\tarray.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tattr.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tchecksum.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tconfig.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\testhdf5.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tfile.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tgenprop.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\th5o.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\th5s.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\theap.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tid.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\titerate.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tmeta.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tmisc.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\trefer.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\trefstr.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tselect.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tskiplist.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tsohm.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttime.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttst.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tunicode.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tvlstr.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\tvltypes.c
-
-!IF  "$(CFG)" == "testhdf5dll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/ttsafedll/ttsafedll.dsp b/windows_vs6/test/ttsafedll/ttsafedll.dsp
deleted file mode 100644
index ae20eb9..0000000
--- a/windows_vs6/test/ttsafedll/ttsafedll.dsp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttsafedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ttsafedll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ttsafedll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttsafedll.mak" CFG="ttsafedll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ttsafedll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ttsafedll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ttsafedll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/ttsafedll/Release"
-# PROP Intermediate_Dir "../../../test/ttsafedll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "ttsafedll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/ttsafedll/Debug"
-# PROP Intermediate_Dir "../../../test/ttsafedll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) pthreadVC2.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ttsafedll - Win32 Release"
-# Name "ttsafedll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\ttsafe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttsafe_acreate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttsafe_cancel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttsafe_dcreate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\test\ttsafe_error.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/unlink/unlink.dsp b/windows_vs6/test/unlink/unlink.dsp
deleted file mode 100755
index 11113c9..0000000
--- a/windows_vs6/test/unlink/unlink.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="unlink" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=unlink - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "unlink.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "unlink.mak" CFG="unlink - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "unlink - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "unlink - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "unlink - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "unlink - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "unlink - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/unlink/Release"
-# PROP Intermediate_Dir "../../../test/unlink/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/unlink/Debug"
-# PROP Intermediate_Dir "../../../test/unlink/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "unlink__"
-# PROP BASE Intermediate_Dir "unlink__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"unlink__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "unlink_0"
-# PROP BASE Intermediate_Dir "unlink_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\test" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"unlink_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "unlink - Win32 Release"
-# Name "unlink - Win32 Debug"
-# Name "unlink - Win32 AlphaDbg"
-# Name "unlink - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\unlink.c
-
-!IF  "$(CFG)" == "unlink - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "unlink - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/unlinkdll/unlinkdll.dsp b/windows_vs6/test/unlinkdll/unlinkdll.dsp
deleted file mode 100755
index 5a7b42c..0000000
--- a/windows_vs6/test/unlinkdll/unlinkdll.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="unlinkdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=unlinkdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "unlinkdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "unlinkdll.mak" CFG="unlinkdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "unlinkdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "unlinkdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "unlinkdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "unlinkdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "unlinkdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/unlinkdll/Release"
-# PROP Intermediate_Dir "../../../test/unlinkdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/unlinkdll/Debug"
-# PROP Intermediate_Dir "../../../test/unlinkdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /include:"_gethostname@8" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "unlinkdl"
-# PROP BASE Intermediate_Dir "unlinkdl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\test" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"unlinkdl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "unlinkd0"
-# PROP BASE Intermediate_Dir "unlinkd0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\test" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"unlinkd0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "unlinkdll - Win32 Release"
-# Name "unlinkdll - Win32 Debug"
-# Name "unlinkdll - Win32 AlphaDbg"
-# Name "unlinkdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\test\unlink.c
-
-!IF  "$(CFG)" == "unlinkdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "unlinkdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/test/vfd/vfd.dsp b/windows_vs6/test/vfd/vfd.dsp
deleted file mode 100644
index d09e425..0000000
--- a/windows_vs6/test/vfd/vfd.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="vfd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=vfd - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "vfd.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "vfd.mak" CFG="vfd - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "vfd - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "vfd - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "vfd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/vfd/release"
-# PROP Intermediate_Dir "../../../test/vfd/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "vfd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/vfd/Debug"
-# PROP Intermediate_Dir "../../../test/vfd/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "vfd - Win32 Release"
-# Name "vfd - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\vfd.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/test/vfddll/vfddll.dsp b/windows_vs6/test/vfddll/vfddll.dsp
deleted file mode 100644
index 4217e58..0000000
--- a/windows_vs6/test/vfddll/vfddll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="vfddll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=vfddll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "vfddll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "vfddll.mak" CFG="vfddll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "vfddll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "vfddll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "vfddll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../test/vfddll/release"
-# PROP Intermediate_Dir "../../../test/vfddll/release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib" /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "vfddll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../test/vfddll/Debug"
-# PROP Intermediate_Dir "../../../test/vfddll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /D "_HDF5TESTUSEDLL_" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  WS2_32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "vfddll - Win32 Release"
-# Name "vfddll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\test\vfd.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5copy/h5copy.dsp b/windows_vs6/tools/h5copy/h5copy.dsp
deleted file mode 100644
index 8356a8b..0000000
--- a/windows_vs6/tools/h5copy/h5copy.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5copy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5copy - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5copy.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5copy.mak" CFG="h5copy - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5copy - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5copy - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5copy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5copy/Release"
-# PROP Intermediate_Dir "../../../tools/h5copy/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5copy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5copy/Debug"
-# PROP Intermediate_Dir "../../../tools/h5copy/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5copy - Win32 Release"
-# Name "h5copy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5copy\h5copy.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5debug/h5debug.dsp b/windows_vs6/tools/h5debug/h5debug.dsp
deleted file mode 100755
index f58b990..0000000
--- a/windows_vs6/tools/h5debug/h5debug.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5debug" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5debug - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5debug.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5debug.mak" CFG="h5debug - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5debug - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debug - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debug - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5debug - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5debug - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5debug/Release"
-# PROP Intermediate_Dir "../../../tools/h5debug/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5debug/Debug"
-# PROP Intermediate_Dir "../../../tools/h5debug/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5debug_"
-# PROP BASE Intermediate_Dir "h5debug_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5debug_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5debug0"
-# PROP BASE Intermediate_Dir "h5debug0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5debug - Win32 Release"
-# Name "h5debug - Win32 Debug"
-# Name "h5debug - Win32 AlphaDbg"
-# Name "h5debug - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5debug.c
-
-!IF  "$(CFG)" == "h5debug - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5debug - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5debugdll/h5debugdll.dsp b/windows_vs6/tools/h5debugdll/h5debugdll.dsp
deleted file mode 100755
index 9e8ba13..0000000
--- a/windows_vs6/tools/h5debugdll/h5debugdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5debugdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5debugdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5debugdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5debugdll.mak" CFG="h5debugdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5debugdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debugdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5debugdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5debugdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5debugdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5debugdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5debugdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5debugdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5debugdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5debugd"
-# PROP BASE Intermediate_Dir "h5debugd"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5debugd/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5debug0"
-# PROP BASE Intermediate_Dir "h5debug0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5debug0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5debugdll - Win32 Release"
-# Name "h5debugdll - Win32 Debug"
-# Name "h5debugdll - Win32 AlphaDbg"
-# Name "h5debugdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5debug.c
-
-!IF  "$(CFG)" == "h5debugdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5debugdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5diff/h5diff.dsp b/windows_vs6/tools/h5diff/h5diff.dsp
deleted file mode 100755
index e49dada..0000000
--- a/windows_vs6/tools/h5diff/h5diff.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5diff" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5diff - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5diff.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5diff.mak" CFG="h5diff - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5diff - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5diff - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5diff - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5diff/Release"
-# PROP Intermediate_Dir "../../../tools/h5diff/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5diff - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5diff/Debug"
-# PROP Intermediate_Dir "../../../tools/h5diff/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5diff - Win32 Release"
-# Name "h5diff - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_common.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_main.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5diffdll/h5diffdll.dsp b/windows_vs6/tools/h5diffdll/h5diffdll.dsp
deleted file mode 100755
index acc00d0..0000000
--- a/windows_vs6/tools/h5diffdll/h5diffdll.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5diffdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5diffdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5diffdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5diffdll.mak" CFG="h5diffdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5diffdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5diffdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5diffdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5diffdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5diffdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5diffdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5diffdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5diffdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5diffdll - Win32 Release"
-# Name "h5diffdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_common.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5diff\h5diff_main.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5dump/h5dump.dsp b/windows_vs6/tools/h5dump/h5dump.dsp
deleted file mode 100755
index 291e28b..0000000
--- a/windows_vs6/tools/h5dump/h5dump.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5dump" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dump - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dump.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dump.mak" CFG="h5dump - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5dump - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dump - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dump - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dump - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5dump - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5dump/Release"
-# PROP Intermediate_Dir "../../../tools/h5dump/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5dump/Debug"
-# PROP Intermediate_Dir "../../../tools/h5dump/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dump__"
-# PROP BASE Intermediate_Dir "h5dump__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dump__/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dump_0"
-# PROP BASE Intermediate_Dir "h5dump_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dump_0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5dump - Win32 Release"
-# Name "h5dump - Win32 Debug"
-# Name "h5dump - Win32 AlphaDbg"
-# Name "h5dump - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5dump\h5dump.c
-
-!IF  "$(CFG)" == "h5dump - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5dump - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5dumpdll/h5dumpdll.dsp b/windows_vs6/tools/h5dumpdll/h5dumpdll.dsp
deleted file mode 100755
index 42ea12e..0000000
--- a/windows_vs6/tools/h5dumpdll/h5dumpdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5dumpdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dumpdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dumpdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dumpdll.mak" CFG="h5dumpdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5dumpdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumpdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumpdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dumpdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5dumpdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5dumpdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5dumpdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5dumpdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5dumpdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dumpdl"
-# PROP BASE Intermediate_Dir "h5dumpdl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\tools" /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /I /I"..\..tools"/Fp"Debug/h5dumpdll.pch" /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dumpdl/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dumpd0"
-# PROP BASE Intermediate_Dir "h5dumpd0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dumpd0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5dumpdll - Win32 Release"
-# Name "h5dumpdll - Win32 Debug"
-# Name "h5dumpdll - Win32 AlphaDbg"
-# Name "h5dumpdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5dump\h5dump.c
-
-!IF  "$(CFG)" == "h5dumpdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5dumpdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5import/h5import.dsp b/windows_vs6/tools/h5import/h5import.dsp
deleted file mode 100755
index 7528bc9..0000000
--- a/windows_vs6/tools/h5import/h5import.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5import" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5import - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5import.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5import.mak" CFG="h5import - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5import - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5import - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5import - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5import - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5import - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5import/Release"
-# PROP Intermediate_Dir "../../../tools/h5import/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5import/Debug"
-# PROP Intermediate_Dir "../../../tools/h5import/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5import"
-# PROP BASE Intermediate_Dir "h5import"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5impor0"
-# PROP BASE Intermediate_Dir "h5impor0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5import - Win32 Release"
-# Name "h5import - Win32 Debug"
-# Name "h5import - Win32 AlphaDbg"
-# Name "h5import - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5import\h5import.c
-
-!IF  "$(CFG)" == "h5import - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5import - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5importdll/h5importdll.dsp b/windows_vs6/tools/h5importdll/h5importdll.dsp
deleted file mode 100755
index 935f64a..0000000
--- a/windows_vs6/tools/h5importdll/h5importdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5importdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5importdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5importdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5importdll.mak" CFG="h5importdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5importdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5importdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5importdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5importdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5importdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5importdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5importdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5import"
-# PROP BASE Intermediate_Dir "h5import"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5import/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5impor0"
-# PROP BASE Intermediate_Dir "h5impor0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5impor0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5importdll - Win32 Release"
-# Name "h5importdll - Win32 Debug"
-# Name "h5importdll - Win32 AlphaDbg"
-# Name "h5importdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5import\h5import.c
-
-!IF  "$(CFG)" == "h5importdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5importdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5jam/h5jam.dsp b/windows_vs6/tools/h5jam/h5jam.dsp
deleted file mode 100755
index 0f5453c..0000000
--- a/windows_vs6/tools/h5jam/h5jam.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5jam" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5jam - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5jam.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5jam.mak" CFG="h5jam - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5jam - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5jam - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5jam - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5jam/Release"
-# PROP Intermediate_Dir "../../../tools/h5jam/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5jam - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5jam/Debug"
-# PROP Intermediate_Dir "../../../tools/h5jam/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5jam - Win32 Release"
-# Name "h5jam - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\h5jam.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5ls/h5ls.dsp b/windows_vs6/tools/h5ls/h5ls.dsp
deleted file mode 100755
index e7d69cd..0000000
--- a/windows_vs6/tools/h5ls/h5ls.dsp
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5ls" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5ls - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5ls.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5ls.mak" CFG="h5ls - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5ls - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5ls - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5ls - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5ls - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5ls - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5ls/Release"
-# PROP Intermediate_Dir "../../../tools/h5ls/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5ls/Debug"
-# PROP Intermediate_Dir "../../../tools/h5ls/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5ls___W"
-# PROP BASE Intermediate_Dir "h5ls___W"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "../../tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5ls___W/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5ls___0"
-# PROP BASE Intermediate_Dir "h5ls___0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5ls___0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5ls - Win32 Release"
-# Name "h5ls - Win32 Debug"
-# Name "h5ls - Win32 AlphaDbg"
-# Name "h5ls - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5ls\h5ls.c
-
-!IF  "$(CFG)" == "h5ls - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5ls - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5lsdll/h5lsdll.dsp b/windows_vs6/tools/h5lsdll/h5lsdll.dsp
deleted file mode 100755
index a285ed5..0000000
--- a/windows_vs6/tools/h5lsdll/h5lsdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5lsdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5lsdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5lsdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5lsdll.mak" CFG="h5lsdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5lsdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5lsdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5lsdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5lsdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5lsdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5lsdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5lsdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5lsdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5lsdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5lsdll_"
-# PROP BASE Intermediate_Dir "h5lsdll_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\tools" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5lsdll_/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5lsdll0"
-# PROP BASE Intermediate_Dir "h5lsdll0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /I "..\..\tools" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5lsdll0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5lsdll - Win32 Release"
-# Name "h5lsdll - Win32 Debug"
-# Name "h5lsdll - Win32 AlphaDbg"
-# Name "h5lsdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5ls\h5ls.c
-
-!IF  "$(CFG)" == "h5lsdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5lsdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5mkgrp/h5mkgrp.dsp b/windows_vs6/tools/h5mkgrp/h5mkgrp.dsp
deleted file mode 100644
index 094d14e..0000000
--- a/windows_vs6/tools/h5mkgrp/h5mkgrp.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5mkgrp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5mkgrp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5mkgrp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5mkgrp.mak" CFG="h5mkgrp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5mkgrp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5mkgrp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5mkgrp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5mkgrp/Release"
-# PROP Intermediate_Dir "../../../tools/h5mkgrp/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5mkgrp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5mkgrp/Debug"
-# PROP Intermediate_Dir "../../../tools/h5mkgrp/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5mkgrp - Win32 Release"
-# Name "h5mkgrp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5mkgrp.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5repack/h5repack.dsp b/windows_vs6/tools/h5repack/h5repack.dsp
deleted file mode 100755
index b94c764..0000000
--- a/windows_vs6/tools/h5repack/h5repack.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repack" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repack - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repack.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repack.mak" CFG="h5repack - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repack - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repack - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5repack - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repack/Release"
-# PROP Intermediate_Dir "../../../tools/h5repack/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5repack - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repack/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repack/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"D:\szip\all\lib\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repack - Win32 Release"
-# Name "h5repack - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5repackdll/h5repackdll.dsp b/windows_vs6/tools/h5repackdll/h5repackdll.dsp
deleted file mode 100755
index 17832f9..0000000
--- a/windows_vs6/tools/h5repackdll/h5repackdll.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repackdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repackdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repackdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repackdll.mak" CFG="h5repackdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repackdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repackdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5repackdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repackdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5repackdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5repackdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repackdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repackdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /I "..\..\..\test" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repackdll - Win32 Release"
-# Name "h5repackdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5repart/h5repart.dsp b/windows_vs6/tools/h5repart/h5repart.dsp
deleted file mode 100755
index b8875a4..0000000
--- a/windows_vs6/tools/h5repart/h5repart.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repart" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5repart - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repart.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repart.mak" CFG="h5repart - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repart - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5repart - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5repart - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repart/Release"
-# PROP Intermediate_Dir "../../../tools/h5repart/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repart/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repart/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5repart"
-# PROP BASE Intermediate_Dir "h5repart"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5repar0"
-# PROP BASE Intermediate_Dir "h5repar0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repart - Win32 Release"
-# Name "h5repart - Win32 Debug"
-# Name "h5repart - Win32 AlphaDbg"
-# Name "h5repart - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5repart.c
-
-!IF  "$(CFG)" == "h5repart - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5repart - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5repartdll/h5repartdll.dsp b/windows_vs6/tools/h5repartdll/h5repartdll.dsp
deleted file mode 100755
index 5c11feb..0000000
--- a/windows_vs6/tools/h5repartdll/h5repartdll.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repartdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5repartdll - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repartdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repartdll.mak" CFG="h5repartdll - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repartdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repartdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repartdll - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5repartdll - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5repartdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5repartdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5repartdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Release/"
-# ADD F90 /include:"Release/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5repartdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5repartdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /include:"Debug/"
-# ADD F90 /include:"Debug/"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5repart"
-# PROP BASE Intermediate_Dir "h5repart"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5repart/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5repar0"
-# PROP BASE Intermediate_Dir "h5repar0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5DLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5repar0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repartdll - Win32 Release"
-# Name "h5repartdll - Win32 Debug"
-# Name "h5repartdll - Win32 AlphaDbg"
-# Name "h5repartdll - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\tools\misc\h5repart.c
-
-!IF  "$(CFG)" == "h5repartdll - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5repartdll - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5stat/h5stat.dsp b/windows_vs6/tools/h5stat/h5stat.dsp
deleted file mode 100755
index cf2ec71..0000000
--- a/windows_vs6/tools/h5stat/h5stat.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5stat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5stat - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5stat.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5stat.mak" CFG="h5stat - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5stat - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5stat - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5stat - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5stat/Release"
-# PROP Intermediate_Dir "../../../tools/h5stat/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5stat - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5stat/Debug"
-# PROP Intermediate_Dir "../../../tools/h5stat/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5stat - Win32 Release"
-# Name "h5stat - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5stat\h5stat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5statdll/h5statdll.dsp b/windows_vs6/tools/h5statdll/h5statdll.dsp
deleted file mode 100755
index 4028a47..0000000
--- a/windows_vs6/tools/h5statdll/h5statdll.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5statdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5statdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5statdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5statdll.mak" CFG="h5statdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5statdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5statdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5statdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5statdll/Release"
-# PROP Intermediate_Dir "../../../tools/h5statdll/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5statdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5statdll/Debug"
-# PROP Intermediate_Dir "../../../tools/h5statdll/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5statdll - Win32 Release"
-# Name "h5statdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5stat\h5stat.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/h5unjam/h5unjam.dsp b/windows_vs6/tools/h5unjam/h5unjam.dsp
deleted file mode 100755
index 02d6b58..0000000
--- a/windows_vs6/tools/h5unjam/h5unjam.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5unjam" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5unjam - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5unjam.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5unjam.mak" CFG="h5unjam - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5unjam - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5unjam - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5unjam - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/h5unjam/Release"
-# PROP Intermediate_Dir "../../../tools/h5unjam/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5unjam - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/h5unjam/Debug"
-# PROP Intermediate_Dir "../../../tools/h5unjam/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5unjam - Win32 Release"
-# Name "h5unjam - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\h5jam\h5unjam.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/talign/talign.dsp b/windows_vs6/tools/talign/talign.dsp
deleted file mode 100755
index ce2195c..0000000
--- a/windows_vs6/tools/talign/talign.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="talign" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=talign - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "talign.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "talign.mak" CFG="talign - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "talign - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "talign - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "talign - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/talign/Release"
-# PROP Intermediate_Dir "../../../tools/talign/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "talign - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/talign/Debug"
-# PROP Intermediate_Dir "../../../tools/talign/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "talign - Win32 Release"
-# Name "talign - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\talign.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/taligndll/taligndll.dsp b/windows_vs6/tools/taligndll/taligndll.dsp
deleted file mode 100755
index cc3e8c4..0000000
--- a/windows_vs6/tools/taligndll/taligndll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="taligndll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=taligndll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "taligndll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "taligndll.mak" CFG="taligndll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "taligndll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "taligndll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "taligndll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../tools/taligndll/Release"
-# PROP Intermediate_Dir "../../../tools/taligndll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "taligndll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../tools/taligndll/Debug"
-# PROP Intermediate_Dir "../../../tools/taligndll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\tools\lib" /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "taligndll - Win32 Release"
-# Name "taligndll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\talign.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/binread/binread.dsp b/windows_vs6/tools/testfiles/binread/binread.dsp
deleted file mode 100644
index fdab412..0000000
--- a/windows_vs6/tools/testfiles/binread/binread.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="binread" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=binread - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "binread.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "binread.mak" CFG="binread - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "binread - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "binread - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "binread - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/binread/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/binread/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "binread - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/binread/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/binread/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "binread - Win32 Release"
-# Name "binread - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5dump\binread.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5difftst/h5difftst.dsp b/windows_vs6/tools/testfiles/h5difftst/h5difftst.dsp
deleted file mode 100755
index 979894f..0000000
--- a/windows_vs6/tools/testfiles/h5difftst/h5difftst.dsp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5difftst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5difftst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5difftst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5difftst.mak" CFG="h5difftst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5difftst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5difftst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5difftst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5difftst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5difftst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5difftst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5difftst - Win32 Release"
-# Name "h5difftst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5diff\h5diffgentest.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5diff\testh5diff.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5dumptst/h5dumptst.dsp b/windows_vs6/tools/testfiles/h5dumptst/h5dumptst.dsp
deleted file mode 100755
index f79af25..0000000
--- a/windows_vs6/tools/testfiles/h5dumptst/h5dumptst.dsp
+++ /dev/null
@@ -1,170 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5dumptst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=h5dumptst - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dumptst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5dumptst.mak" CFG="h5dumptst - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5dumptst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumptst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5dumptst - Win32 AlphaDbg" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "h5dumptst - Win32 AlphaRel" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "h5dumptst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd.lib"
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5dumptst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5dumptst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "h5dumpts"
-# PROP BASE Intermediate_Dir "h5dumpts"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "h5dumpts"
-# PROP Intermediate_Dir "h5dumpts"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"h5dumpts/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "h5dumpt0"
-# PROP BASE Intermediate_Dir "h5dumpt0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "h5dumpt0"
-# PROP Intermediate_Dir "h5dumpt0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"h5dumpt0/" /nologo /warn:nofileopt
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5dumptst - Win32 Release"
-# Name "h5dumptst - Win32 Debug"
-# Name "h5dumptst - Win32 AlphaDbg"
-# Name "h5dumptst - Win32 AlphaRel"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5dump\h5dumpgentest.c
-
-!IF  "$(CFG)" == "h5dumptst - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "h5dumptst - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5importtst/h5importtst.dsp b/windows_vs6/tools/testfiles/h5importtst/h5importtst.dsp
deleted file mode 100755
index 571705d..0000000
--- a/windows_vs6/tools/testfiles/h5importtst/h5importtst.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5importtst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5importtst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5importtst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5importtst.mak" CFG="h5importtst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5importtst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5importtst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5importtst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5importtst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5importtst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5importtst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5importtst - Win32 Release"
-# Name "h5importtst - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5import\h5importtest.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp b/windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp
deleted file mode 100755
index 1682d36..0000000
--- a/windows_vs6/tools/testfiles/h5jamtst/h5jamtst.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5jamtst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5jamtst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5jamtst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5jamtst.mak" CFG="h5jamtst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5jamtst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5jamtst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5jamtst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5jamtst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5jamtst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5jamtst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5jamtst - Win32 Release"
-# Name "h5jamtst - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5jam\h5jamgentest.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5repacktst/h5repacktst.dsp b/windows_vs6/tools/testfiles/h5repacktst/h5repacktst.dsp
deleted file mode 100755
index b522fc9..0000000
--- a/windows_vs6/tools/testfiles/h5repacktst/h5repacktst.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repacktst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repacktst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repacktst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repacktst.mak" CFG="h5repacktst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repacktst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repacktst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5repacktst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /include:"_gethostname@8"
-
-!ELSEIF  "$(CFG)" == "h5repacktst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5repacktst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repacktst/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /include:"_gethostname@8" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repacktst - Win32 Release"
-# Name "h5repacktst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_opttable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_refs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack_verify.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repacktst.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\h5repack.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp b/windows_vs6/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp
deleted file mode 100755
index bc5d3b8..0000000
--- a/windows_vs6/tools/testfiles/h5repart_gentest/h5repart_gentest.dsp
+++ /dev/null
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5repart_gentest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5repart_gentest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repart_gentest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5repart_gentest.mak" CFG="h5repart_gentest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5repart_gentest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5repart_gentest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5repart_gentest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5repart_gentest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5repart_gentest/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5repart_gentest - Win32 Release"
-# Name "h5repart_gentest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\misc\h5repart_gentest.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/h5reparttst/h5reparttst.dsp b/windows_vs6/tools/testfiles/h5reparttst/h5reparttst.dsp
deleted file mode 100755
index 7df8b68..0000000
--- a/windows_vs6/tools/testfiles/h5reparttst/h5reparttst.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="h5reparttst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=h5reparttst - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "h5reparttst.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "h5reparttst.mak" CFG="h5reparttst - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "h5reparttst - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "h5reparttst - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "h5reparttst - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Release"
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "h5reparttst - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/h5reparttst/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/h5reparttst/Debug"
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "h5reparttst - Win32 Release"
-# Name "h5reparttst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\misc\repart_test.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp b/windows_vs6/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp
deleted file mode 100755
index aa719a1..0000000
--- a/windows_vs6/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testh5repack_detect_szip" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testh5repack_detect_szip - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testh5repack_detect_szip.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testh5repack_detect_szip.mak" CFG="testh5repack_detect_szip - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testh5repack_detect_szip - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testh5repack_detect_szip - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testh5repack_detect_szip - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testh5repack_detect_szip - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szip/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testh5repack_detect_szip - Win32 Release"
-# Name "testh5repack_detect_szip - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp b/windows_vs6/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp
deleted file mode 100755
index d06b4ed..0000000
--- a/windows_vs6/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testh5repack_detect_szipdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testh5repack_detect_szipdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testh5repack_detect_szipdll.mak" CFG="testh5repack_detect_szipdll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testh5repack_detect_szipdll - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testh5repack_detect_szipdll - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-F90=df.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testh5repack_detect_szipdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /compile_only /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "testh5repack_detect_szipdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
-# PROP Intermediate_Dir "../../../../tools/testfiles/testh5repack_detect_szipdll/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /check:bounds /compile_only /dbglibs /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\tools\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testh5repack_detect_szipdll - Win32 Release"
-# Name "testh5repack_detect_szipdll - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\..\..\tools\h5repack\testh5repack_detect_szip.c
-# End Source File
-# End Target
-# End Project
diff --git a/windows_vs6/tools/toolslib/toolslib.dsp b/windows_vs6/tools/toolslib/toolslib.dsp
deleted file mode 100755
index 9a7b5db..0000000
--- a/windows_vs6/tools/toolslib/toolslib.dsp
+++ /dev/null
@@ -1,359 +0,0 @@
-# Microsoft Developer Studio Project File - Name="toolslib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=toolslib - Win32 Alphadbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "toolslib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "toolslib.mak" CFG="toolslib - Win32 Alphadbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "toolslib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslib - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "toolslib - Win32 Alphadbg" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\tools\toolslib\Release"
-# PROP Intermediate_Dir "..\..\..\tools\toolslib\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\tools\toolslib\Debug"
-# PROP Intermediate_Dir "..\..\..\tools\toolslib\Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "toolslib"
-# PROP BASE Intermediate_Dir "toolslib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "toolslib"
-# PROP Intermediate_Dir "toolslib"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"toolslib/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "toolsli0"
-# PROP BASE Intermediate_Dir "toolsli0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "toolsli0"
-# PROP Intermediate_Dir "toolsli0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"toolsli0/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "toolslib - Win32 Release"
-# Name "toolslib - Win32 Debug"
-# Name "toolslib - Win32 AlphaRel"
-# Name "toolslib - Win32 Alphadbg"
-# Begin Group "source"
-
-# PROP Default_Filter "*.c"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_array.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_attr.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_dset.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_util.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_filters.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_type.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.c
-
-!IF  "$(CFG)" == "toolslib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 AlphaRel"
-
-!ELSEIF  "$(CFG)" == "toolslib - Win32 Alphadbg"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "headers"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows_vs6/tools/toolslibD/toolslibD.dsp b/windows_vs6/tools/toolslibD/toolslibD.dsp
deleted file mode 100755
index 8d53d14..0000000
--- a/windows_vs6/tools/toolslibD/toolslibD.dsp
+++ /dev/null
@@ -1,359 +0,0 @@
-# Microsoft Developer Studio Project File - Name="toolslibD" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=toolslibD - Win32 AlphaDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "toolslibD.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "toolslibD.mak" CFG="toolslibD - Win32 AlphaDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "toolslibD - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslibD - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "toolslibD - Win32 AlphaDbg" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "toolslibD - Win32 AlphaRel" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\tools\toolslibD\Release"
-# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /I "..\..\..\tools\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\tools\toolslibD\Debug"
-# PROP Intermediate_Dir "..\..\..\tools\toolslibD\Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "toolslib"
-# PROP BASE Intermediate_Dir "toolslib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "toolslib"
-# PROP Intermediate_Dir "toolslib"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I ".." /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /debug:full /include:"toolslib/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "toolsli0"
-# PROP BASE Intermediate_Dir "toolsli0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "toolsli0"
-# PROP Intermediate_Dir "toolsli0"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5USEDLL_" /YX /FD /c
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"toolsli0/" /nologo /warn:nofileopt
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "toolslibD - Win32 Release"
-# Name "toolslibD - Win32 Debug"
-# Name "toolslibD - Win32 AlphaDbg"
-# Name "toolslibD - Win32 AlphaRel"
-# Begin Group "source"
-
-# PROP Default_Filter "*.c"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_array.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_attr.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_dset.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff_util.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_filters.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_type.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.c
-
-!IF  "$(CFG)" == "toolslibD - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaDbg"
-
-!ELSEIF  "$(CFG)" == "toolslibD - Win32 AlphaRel"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "headers"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5diff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_ref.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_str.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5tools_utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\tools\lib\h5trav.h
-# End Source File
-# End Group
-# End Target
-# End Project
-- 
cgit v0.12