[svn-r11971] Purpose:

Maintenance on Windows
Description:
Update source files according to Quincey's check in
Solution:

Platforms tested:
Windows XP
Misc. update:

2 files changed, 143 insertions, 323 deletions

diff --git a/windows/proj/hdf5/hdf5.dsp b/windows/proj/hdf5/hdf5.dsp
index 34e9d63..eee2fc8 100755
--- a/windows/proj/hdf5/hdf5.dsp
+++ b/windows/proj/hdf5/hdf5.dsp
@@ -261,7 +261,7 @@ SOURCE=..\..\..\src\H5B2dbg.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5B2test.c
+SOURCE=..\..\..\src\H5B2int.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -276,7 +276,7 @@ SOURCE=..\..\..\src\H5B2test.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Bcache.c
+SOURCE=..\..\..\src\H5B2test.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -291,7 +291,7 @@ SOURCE=..\..\..\src\H5Bcache.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BP.c
+SOURCE=..\..\..\src\H5Bcache.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -306,26 +306,13 @@ SOURCE=..\..\..\src\H5BP.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BPcache.c
+SOURCE=..\..\..\src\H5C.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\H5BPdbg.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
+# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
 
 !ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
 
@@ -336,26 +323,13 @@ SOURCE=..\..\..\src\H5BPdbg.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BPtest.c
+SOURCE=..\..\..\src\H5D.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\H5BT.c
-
-!IF  "$(CFG)" == "hdf5 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"
+# PROP Intermediate_Dir "..\..\..\proj\hdf5\Debug"
 
 !ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"
 
@@ -366,12 +340,14 @@ SOURCE=..\..\..\src\H5BT.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTbtree2.c
+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"
@@ -381,12 +357,14 @@ SOURCE=..\..\..\src\H5BTbtree2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTcache.c
+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"
@@ -396,12 +374,14 @@ SOURCE=..\..\..\src\H5BTcache.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTdbg.c
+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"
@@ -411,12 +391,14 @@ SOURCE=..\..\..\src\H5BTdbg.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTtest.c
+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"
@@ -426,7 +408,7 @@ SOURCE=..\..\..\src\H5BTtest.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5C.c
+SOURCE=..\..\..\src\H5Distore.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -443,7 +425,7 @@ SOURCE=..\..\..\src\H5C.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5D.c
+SOURCE=..\..\..\src\H5Dmpio.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -460,14 +442,12 @@ SOURCE=..\..\..\src\H5D.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dcompact.c
+SOURCE=..\..\..\src\H5Doh.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"
@@ -477,7 +457,7 @@ SOURCE=..\..\..\src\H5Dcompact.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dcontig.c
+SOURCE=..\..\..\src\H5Dselect.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -494,7 +474,7 @@ SOURCE=..\..\..\src\H5Dcontig.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Defl.c
+SOURCE=..\..\..\src\H5Dtest.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -511,7 +491,7 @@ SOURCE=..\..\..\src\H5Defl.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dio.c
+SOURCE=..\..\..\src\H5E.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -528,7 +508,7 @@ SOURCE=..\..\..\src\H5Dio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Distore.c
+SOURCE=..\..\..\src\H5F.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -545,7 +525,7 @@ SOURCE=..\..\..\src\H5Distore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dmpio.c
+SOURCE=..\..\..\src\H5FD.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -562,12 +542,14 @@ SOURCE=..\..\..\src\H5Dmpio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Doh.c
+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"
@@ -577,7 +559,7 @@ SOURCE=..\..\..\src\H5Doh.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dselect.c
+SOURCE=..\..\..\src\H5FDcore.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -594,7 +576,7 @@ SOURCE=..\..\..\src\H5Dselect.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Dtest.c
+SOURCE=..\..\..\src\H5FDfamily.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -611,7 +593,7 @@ SOURCE=..\..\..\src\H5Dtest.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5E.c
+SOURCE=..\..\..\src\H5FDlog.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -628,14 +610,12 @@ SOURCE=..\..\..\src\H5E.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5F.c
+SOURCE=..\..\..\src\H5FDmpi.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"
@@ -645,7 +625,7 @@ SOURCE=..\..\..\src\H5F.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FD.c
+SOURCE=..\..\..\src\H5FDmpio.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -662,14 +642,12 @@ SOURCE=..\..\..\src\H5FD.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Fdbg.c
+SOURCE=..\..\..\src\H5FDmpiposix.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"
@@ -679,7 +657,7 @@ SOURCE=..\..\..\src\H5Fdbg.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDcore.c
+SOURCE=..\..\..\src\H5FDmulti.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -696,7 +674,7 @@ SOURCE=..\..\..\src\H5FDcore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDfamily.c
+SOURCE=..\..\..\src\H5FDsec2.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -713,7 +691,7 @@ SOURCE=..\..\..\src\H5FDfamily.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDlog.c
+SOURCE=..\..\..\src\H5FDstdio.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -730,12 +708,14 @@ SOURCE=..\..\..\src\H5FDlog.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDmpi.c
+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"
@@ -745,7 +725,7 @@ SOURCE=..\..\..\src\H5FDmpi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDmpio.c
+SOURCE=..\..\..\src\H5FL.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -762,7 +742,7 @@ SOURCE=..\..\..\src\H5FDmpio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDmpiposix.c
+SOURCE=..\..\..\src\H5Fmount.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -777,7 +757,7 @@ SOURCE=..\..\..\src\H5FDmpiposix.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDmulti.c
+SOURCE=..\..\..\src\H5FO.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -794,14 +774,12 @@ SOURCE=..\..\..\src\H5FDmulti.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDsec2.c
+SOURCE=..\..\..\src\H5Fsfile.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"
@@ -811,14 +789,12 @@ SOURCE=..\..\..\src\H5FDsec2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDstdio.c
+SOURCE=..\..\..\src\H5Fsuper.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"
@@ -828,7 +804,7 @@ SOURCE=..\..\..\src\H5FDstdio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FDstream.c
+SOURCE=..\..\..\src\H5G.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -845,7 +821,7 @@ SOURCE=..\..\..\src\H5FDstream.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5FL.c
+SOURCE=..\..\..\src\H5Gent.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -862,29 +838,12 @@ SOURCE=..\..\..\src\H5FL.c
 # 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
+SOURCE=..\..\..\src\H5Glink.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"
@@ -894,7 +853,7 @@ SOURCE=..\..\..\src\H5FO.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Fsfile.c
+SOURCE=..\..\..\src\H5Gloc.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -909,7 +868,7 @@ SOURCE=..\..\..\src\H5Fsfile.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Fsuper.c
+SOURCE=..\..\..\src\H5Gname.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -924,7 +883,7 @@ SOURCE=..\..\..\src\H5Fsuper.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5G.c
+SOURCE=..\..\..\src\H5Gnode.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -941,14 +900,12 @@ SOURCE=..\..\..\src\H5G.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gent.c
+SOURCE=..\..\..\src\H5Gobj.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"
@@ -958,7 +915,7 @@ SOURCE=..\..\..\src\H5Gent.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Glink.c
+SOURCE=..\..\..\src\H5Goh.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -973,12 +930,14 @@ SOURCE=..\..\..\src\H5Glink.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gloc.c
+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"
@@ -988,7 +947,7 @@ SOURCE=..\..\..\src\H5Gloc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gname.c
+SOURCE=..\..\..\src\H5Gtest.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -1003,14 +962,12 @@ SOURCE=..\..\..\src\H5Gname.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gnode.c
+SOURCE=..\..\..\src\H5Gtraverse.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"
@@ -1020,7 +977,7 @@ SOURCE=..\..\..\src\H5Gnode.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gobj.c
+SOURCE=..\..\..\src\H5HF.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -1035,7 +992,7 @@ SOURCE=..\..\..\src\H5Gobj.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Goh.c
+SOURCE=..\..\..\src\H5HFcache.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -1050,14 +1007,12 @@ SOURCE=..\..\..\src\H5Goh.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gstab.c
+SOURCE=..\..\..\src\H5HFdbg.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"
@@ -1067,7 +1022,7 @@ SOURCE=..\..\..\src\H5Gstab.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gtest.c
+SOURCE=..\..\..\src\H5HFint.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -1082,7 +1037,7 @@ SOURCE=..\..\..\src\H5Gtest.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5Gtraverse.c
+SOURCE=..\..\..\src\H5HFtest.c
 
 !IF  "$(CFG)" == "hdf5 - Win32 Release"
 
@@ -1750,51 +1705,6 @@ SOURCE=..\..\..\src\H5Sall.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5SH.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\H5SHcache.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\H5SHdbg.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"
diff --git a/windows/proj/hdf5dll/hdf5dll.dsp b/windows/proj/hdf5dll/hdf5dll.dsp
index df2886d..b1caf5f 100755
--- a/windows/proj/hdf5dll/hdf5dll.dsp
+++ b/windows/proj/hdf5dll/hdf5dll.dsp
@@ -291,127 +291,7 @@ SOURCE=..\..\..\src\H5B2dbg.c
 # 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\H5BP.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\H5BPcache.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\H5BPdbg.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\H5BPtest.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\H5BT.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\H5BTbtree2.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\H5BTcache.c
+SOURCE=..\..\..\src\H5B2int.c
 
 !IF  "$(CFG)" == "hdf5dll - Win32 Release"
 
@@ -426,7 +306,7 @@ SOURCE=..\..\..\src\H5BTcache.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTdbg.c
+SOURCE=..\..\..\src\H5B2test.c
 
 !IF  "$(CFG)" == "hdf5dll - Win32 Release"
 
@@ -441,7 +321,7 @@ SOURCE=..\..\..\src\H5BTdbg.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5BTtest.c
+SOURCE=..\..\..\src\H5Bcache.c
 
 !IF  "$(CFG)" == "hdf5dll - Win32 Release"
 
@@ -1183,6 +1063,81 @@ SOURCE=..\..\..\src\H5Gtraverse.c
 # 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\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\H5HFint.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\H5HG.c
 
 !IF  "$(CFG)" == "hdf5dll - Win32 Release"
@@ -1964,51 +1919,6 @@ SOURCE=..\..\..\src\H5Sall.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\H5SH.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\H5SHcache.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\H5SHdbg.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"