[svn-r18451] Description:

	Bring r18172:18446 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, 36 insertions, 39 deletions

diff --git a/windows/fortran/examples/allf90examples/allf90examples.sln b/windows/fortran/examples/allf90examples/allf90examples.sln
index d2cf985..e488eae 100644
--- a/windows/fortran/examples/allf90examples/allf90examples.sln
+++ b/windows/fortran/examples/allf90examples/allf90examples.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allf90examples", "allf90examples.vcproj", "{D493CF06-423A-4FA5-8B3F-416C2EDAFF2B}"

 	ProjectSection(ProjectDependencies) = postProject

 		{4F759F00-49B0-4D26-8BC7-D5D8F46449DA} = {4F759F00-49B0-4D26-8BC7-D5D8F46449DA}

diff --git a/windows/fortran/examples/allf90examples/allf90examples.vcproj b/windows/fortran/examples/allf90examples/allf90examples.vcproj
index 48a1b7e..db9a621 100644
--- a/windows/fortran/examples/allf90examples/allf90examples.vcproj
+++ b/windows/fortran/examples/allf90examples/allf90examples.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9.00"

 	Name="allf90examples"

 	ProjectGUID="{D493CF06-423A-4FA5-8B3F-416C2EDAFF2B}"

 	RootNamespace="allf90examples"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -124,6 +125,4 @@
 	</References>

 	<Files>

 	</Files>

-	<Globals>

-	</Globals>

 </VisualStudioProject>

diff --git a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
index 4e9b47f..2fdf67e 100644
--- a/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
+++ b/windows/fortran/test/libtest_cstubdll/libtest_cstubdll.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9.00"

 	Name="libtest_cstubdll"

 	ProjectGUID="{1BFA0FE4-B924-4325-9EA1-3CB26BBAE31C}"

 	RootNamespace="libtest_cstubdll"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -41,7 +42,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

@@ -53,7 +54,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -71,7 +72,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -83,6 +84,8 @@
 				LinkIncremental="0"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.lib"

 				TargetMachine="1"

 			/>

@@ -105,9 +108,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -135,7 +135,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="3"

@@ -147,7 +147,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -165,7 +165,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -177,6 +177,8 @@
 				LinkIncremental="0"

 				SuppressStartupBanner="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Release/libtest_cstubdll.lib"

 				TargetMachine="17"

 			/>

@@ -199,9 +201,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -229,7 +228,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

@@ -240,7 +239,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -258,7 +257,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -271,6 +270,8 @@
 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.lib"

 				TargetMachine="1"

 			/>

@@ -293,9 +294,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -323,7 +321,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="3"

@@ -334,7 +332,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5TESTUSEDLL_;HDF5FORTTEST_CSTUB_DLL_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -352,7 +350,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -365,6 +363,8 @@
 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				ImportLibrary=".\../../../../fortran/test/libtest_cstubdll/Debug/libtest_cstubddll.lib"

 				TargetMachine="17"

 			/>

@@ -387,9 +387,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

diff --git a/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj b/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
index bc4d8cd..7517148 100644
--- a/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
+++ b/windows/fortran/test/libtest_fortran/libtest_cstub.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9.00"

 	Name="libtest_cstub"

 	ProjectGUID="{2B93688D-D766-4295-ABFA-003CF905F8D8}"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -45,7 +46,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

@@ -63,7 +64,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -120,7 +121,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_LIB"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

@@ -138,7 +139,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -195,7 +196,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -213,7 +214,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -271,7 +272,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="..\..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -289,7 +290,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"

 				Culture="1033"

 			/>

 			<Tool