diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-06-03 22:22:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-06-03 22:22:34 (GMT) |
| commit | c09abb325060bc8543769e5119adea114dbfa4af (patch) | |
| tree | 4663cb8967975a9fc543afcb5ca75672ebea89a6 /ConfigureChecks.cmake | |
| parent | 9a82383b35b155de8ba4a881ba13d89f18722994 (diff) | |
| download | hdf5-c09abb325060bc8543769e5119adea114dbfa4af.zip hdf5-c09abb325060bc8543769e5119adea114dbfa4af.tar.gz hdf5-c09abb325060bc8543769e5119adea114dbfa4af.tar.bz2 | |
[svn-r18965] Windows use of VC_EXTRALEAN no longer did anything. It has been replaced by WIN32_LEAN_AND_MEAN macro. This was the cause of a define conflict causing the use of grp1 and grp2 to be replaced with constants in the h5dumpgentest.c file.
This also affected the use of the #include <winsock.h> needed by gethostname. The new include: winsock2.h has been added to h5private.h and either removed or updated in the other files.
Tested: Windows
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d0ba2e2..913ea64 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -228,7 +228,7 @@ CHECK_INCLUDE_FILE_CONCAT ("memory.h" H5_HAVE_MEMORY_H) CHECK_INCLUDE_FILE_CONCAT ("dlfcn.h" H5_HAVE_DLFCN_H) CHECK_INCLUDE_FILE_CONCAT ("features.h" H5_HAVE_FEATURES_H) CHECK_INCLUDE_FILE_CONCAT ("inttypes.h" H5_HAVE_INTTYPES_H) -CHECK_INCLUDE_FILE_CONCAT ("winsock.h" H5_HAVE_WINSOCK_H) +CHECK_INCLUDE_FILE_CONCAT ("winsock2.h" H5_HAVE_WINSOCK_H) CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h" H5_HAVE_NETINET_IN_H) |