diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-06-11 15:49:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-06-11 15:49:25 (GMT) |
| commit | 75f31948821d7b134f20948f1d3c18547c4c654f (patch) | |
| tree | e6314a46e246b7ce56d8eadce1ea1994ca615576 /src | |
| parent | d1b7eede73dd9968042b3e8e1bbabe8949d670ed (diff) | |
| download | hdf5-75f31948821d7b134f20948f1d3c18547c4c654f.zip hdf5-75f31948821d7b134f20948f1d3c18547c4c654f.tar.gz hdf5-75f31948821d7b134f20948f1d3c18547c4c654f.tar.bz2 | |
[svn-r22450] Update winsock define to match autotools configure check
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 2 | ||||
| -rw-r--r-- | src/H5system.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5private.h b/src/H5private.h index 76d8a05..39ccb52 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -155,7 +155,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NOGDI /* Exclude Graphic Display Interface macros */ -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H #include <winsock2.h> #endif diff --git a/src/H5system.c b/src/H5system.c index bb1d2f1..c0baee1 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -639,7 +639,7 @@ Wgettimeofday(struct timeval *tv, struct timezone *tz) return 0; } -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H #pragma comment(lib, "advapi32.lib") #endif @@ -650,12 +650,12 @@ char* Wgetlogin() { -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H long bufferCount = WloginBuffer_count; if (GetUserName(Wlogin_buffer, &bufferCount) == 0) return (Wlogin_buffer); else -#endif /* H5_HAVE_WINSOCK_H */ +#endif /* H5_HAVE_WINSOCK2_H */ return NULL; } |