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 /src/H5private.h | |
| 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 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5private.h b/src/H5private.h index 386a3e2..b606407 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -142,7 +142,11 @@ #ifdef _WIN32 -#define VC_EXTRALEAN /*Exclude rarely-used stuff from Windows headers */ +#ifdef H5_HAVE_WINSOCK_H +#include <winsock2.h> +#endif + +#define WIN32_LEAN_AND_MEAN /*Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <direct.h> /* For _getcwd() */ |