[svn-r18175] Description:

	Bring r17986:18172 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                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.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

4 files changed, 14 insertions, 6 deletions

diff --git a/windows/hdf5check.BAT b/windows/hdf5check.BAT
index 2f14bfd..07319ca 100755
--- a/windows/hdf5check.BAT
+++ b/windows/hdf5check.BAT
@@ -20,7 +20,7 @@ rem    1. hdf5check                -- HDF5 tools and c library tests
 rem    2. hdf5check enablecpp      -- HDF5 tools and c/c++ library tests

 rem    3. hdf5check enablefortran  -- HDF5 tools and c/fortran library tests

 rem    4. hdf5check enableall      -- HDF5 tools and c/c++/fortran library tests

-rem    disabledebug                -- can be added to any of the above to not test debug versions

+rem    nodebug                     -- can be added to any of the above to not test debug versions

 

 setlocal enabledelayedexpansion

 pushd %~dp0

@@ -50,10 +50,10 @@ if /i "%1" equ "enablecpp" (
 ) else if /i "%1" equ "enableall" (

     set build_cpp_conditional=true

     set build_fortran_conditional=true

-) else if /i "%1" equ "disabledebug" (

+) else if /i "%1" equ "nodebug" (

     set chkdebug=

 )

-if /i "%2" equ "disabledebug" (

+if /i "%2" equ "nodebug" (

     set chkdebug=

 )

 

diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 8c72991..b6da610 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -845,6 +845,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5HLint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5HP.c"

 				>

 			</File>

diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index 68a8719..860d0d4 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -936,6 +936,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5HLint.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5HP.c"

 				>

 			</File>

diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 9af80ec..f42c762 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -479,13 +479,13 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.54-FA_a4"
+#define H5_PACKAGE_STRING "HDF5 1.9.59-FA_a4"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.54-FA_a4"
+#define H5_PACKAGE_VERSION "1.9.59-FA_a4"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -642,7 +642,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.54-FA_a4"
+#define H5_VERSION "1.9.59-FA_a4"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */