mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r15096] Purpose: Windows Project Cleanup-- Unify Windows h5tinit

Browse Source 
Description:
Previously, there was Windows-dependent code inside H5detect.c, because not all projects could access the gethostname() function.  However, we standardize our project-files to link with WS2_32.lib, so now this function is available.  Thus, the Windows-specific code has been removed from H5detect.c.

Tested:
VS2005 on WinXP
VS.NET on WinXP
no need to test other platforms, Windows-specific source change
This commit is contained in:
Scott Wegner 2008-05-29 14:19:30 -05:00
parent 735967fb12
commit ebd6e8a9c6
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H5detect.c
View File

@ -1090,15 +1090,9 @@ bit.\n";
* The FQDM of this host or the empty string.
*/
#ifdef H5_HAVE_GETHOSTNAME
#ifdef _WIN32
/* windows DLL cannot recognize gethostname, so turn off on windows for the time being!
KY, 2003-1-14 */
host_name[0] = '\0';
#else
if (gethostname(host_name, sizeof(host_name)) < 0) {
host_name[0] = '\0';
}
#endif
#else
host_name[0] = '\0';
#endif

6
windows/misc/typegen/h5tinit/h5tinit.vcproj
View File

@ -73,6 +73,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="WS2_32.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
@ -164,6 +165,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="WS2_32.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
@ -253,7 +255,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
AdditionalDependencies="WS2_32.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
@ -345,7 +347,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
AdditionalDependencies="WS2_32.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"

3
windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
View File

@ -37,6 +37,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="WS2_32.lib"
OutputFile=".\..\..\..\..\src/h5tinit.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@ -96,7 +97,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
AdditionalDependencies="WS2_32.lib"
OutputFile=".\..\..\..\..\src/h5tinit.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"