[svn-r14057] Purpose: Fixes for 64-bit Windows Intel Fortran 9.1

Description:

We are porting Fortran to 64-bit Windows, and need to make many syntactical changes to bring the code up to date.  We now go back to using "!DEC$" rather than "!MS$" in our "ATTRIBUTE" code.  Also, the naming conventions for mixed language is inconsistent from 32- to 64- bit Windows.  To make up with this, we use the "decorate" flag.  We also needed to change the "calling convention" in project settings from "CVF" to "default".

Also other minor cleanups on project files.

Tested:
32-bit: VS.NET and VS2005
64-bit: VS2005

1 files changed, 0 insertions, 501 deletions

diff --git a/windows/test/testhdf5dll/testhdf5dll.vcproj b/windows/test/testhdf5dll/testhdf5dll.vcproj
index 5cac7f7..8d7b7e8 100644
--- a/windows/test/testhdf5dll/testhdf5dll.vcproj
+++ b/windows/test/testhdf5dll/testhdf5dll.vcproj
@@ -11,123 +11,6 @@
 	</Platforms>

 	<Configurations>

 		<Configuration

-			Name="AlphaRel|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\src,..\..\test"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Release/testhdf5dll.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile=".\Release/testhdf5dll.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				ProgramDatabaseFile=".\Release/testhdf5dll.pdb"

-				SubSystem="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/testhdf5dll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="AlphaDbg|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\src,..\..\test"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\Debug/testhdf5dll.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile=".\Debug/testhdf5dll.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\Debug/testhdf5dll.pdb"

-				SubSystem="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/testhdf5dll.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\../../../test/testhdf5dll/Release"

 			IntermediateDirectory=".\../../../test/testhdf5dll/Release"

@@ -253,22 +136,6 @@
 		<File

 			RelativePath="..\..\..\test\tarray.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -288,22 +155,6 @@
 		<File

 			RelativePath="..\..\..\test\tattr.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -323,22 +174,6 @@
 		<File

 			RelativePath="..\..\..\test\tchecksum.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -358,22 +193,6 @@
 		<File

 			RelativePath="..\..\..\test\tconfig.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -393,22 +212,6 @@
 		<File

 			RelativePath="..\..\..\test\testhdf5.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -428,22 +231,6 @@
 		<File

 			RelativePath="..\..\..\test\tfile.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -463,22 +250,6 @@
 		<File

 			RelativePath="..\..\..\test\tgenprop.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -498,22 +269,6 @@
 		<File

 			RelativePath="..\..\..\test\th5o.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -533,22 +288,6 @@
 		<File

 			RelativePath="..\..\..\test\th5s.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -568,22 +307,6 @@
 		<File

 			RelativePath="..\..\..\test\theap.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -603,22 +326,6 @@
 		<File

 			RelativePath="..\..\..\test\tid.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -638,22 +345,6 @@
 		<File

 			RelativePath="..\..\..\test\titerate.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -673,22 +364,6 @@
 		<File

 			RelativePath="..\..\..\test\tmeta.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -708,22 +383,6 @@
 		<File

 			RelativePath="..\..\..\test\tmisc.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -743,22 +402,6 @@
 		<File

 			RelativePath="..\..\..\test\trefer.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -778,22 +421,6 @@
 		<File

 			RelativePath="..\..\..\test\trefstr.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -813,22 +440,6 @@
 		<File

 			RelativePath="..\..\..\test\tselect.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -848,22 +459,6 @@
 		<File

 			RelativePath="..\..\..\test\tskiplist.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -883,22 +478,6 @@
 		<File

 			RelativePath="..\..\..\test\tsohm.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -918,22 +497,6 @@
 		<File

 			RelativePath="..\..\..\test\ttime.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -953,22 +516,6 @@
 		<File

 			RelativePath="..\..\..\test\ttst.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -988,22 +535,6 @@
 		<File

 			RelativePath="..\..\..\test\tunicode.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -1023,22 +554,6 @@
 		<File

 			RelativePath="..\..\..\test\tvlstr.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"

@@ -1058,22 +573,6 @@
 		<File

 			RelativePath="..\..\..\test\tvltypes.c">

 			<FileConfiguration

-				Name="AlphaRel|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="2"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

-				Name="AlphaDbg|Win32">

-				<Tool

-					Name="VCCLCompilerTool"

-					Optimization="0"

-					AdditionalIncludeDirectories=""

-					PreprocessorDefinitions=""/>

-			</FileConfiguration>

-			<FileConfiguration

 				Name="Release|Win32">

 				<Tool

 					Name="VCCLCompilerTool"