diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-05-29 19:19:30 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-05-29 19:19:30 (GMT) |
| commit | ebd6e8a9c63827b220a716ba0d08569161559b7e (patch) | |
| tree | cd924c5a5728bd6eb6b8ec405a7b25b5a5b0ebb0 | |
| parent | 735967fb125e46772c86ddcfad232f0b242f922a (diff) | |
| download | hdf5-ebd6e8a9c63827b220a716ba0d08569161559b7e.zip hdf5-ebd6e8a9c63827b220a716ba0d08569161559b7e.tar.gz hdf5-ebd6e8a9c63827b220a716ba0d08569161559b7e.tar.bz2 | |
[svn-r15096] Purpose: Windows Project Cleanup-- Unify Windows h5tinit
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
| -rw-r--r-- | src/H5detect.c | 6 | ||||
| -rw-r--r-- | windows/misc/typegen/h5tinit/h5tinit.vcproj | 6 | ||||
| -rw-r--r-- | windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/H5detect.c b/src/H5detect.c index 1f79869..11a4d47 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -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 diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj index 9df7133..db8f012 100644 --- a/windows/misc/typegen/h5tinit/h5tinit.vcproj +++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj @@ -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"
diff --git a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj index 31d93b4..4ed9f1c 100644 --- a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj +++ b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj @@ -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"
|