mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22450] Update winsock define to match autotools configure check

Browse Source
This commit is contained in:
Allen Byrne 2012-06-11 10:49:25 -05:00
parent d1b7eede73
commit 75f3194882
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/cmake/ConfigureChecks.cmake
View File

@ -376,7 +376,7 @@ CHECK_INCLUDE_FILE_CONCAT ("mach/mach_time.h" H5_HAVE_MACH_MACH_TIME_H)
# Windows
CHECK_INCLUDE_FILE_CONCAT ("io.h" H5_HAVE_IO_H)
IF (NOT CYGWIN)
CHECK_INCLUDE_FILE_CONCAT ("winsock2.h" H5_HAVE_WINSOCK_H)
CHECK_INCLUDE_FILE_CONCAT ("winsock2.h" H5_HAVE_WINSOCK2_H)
ENDIF (NOT CYGWIN)
CHECK_INCLUDE_FILE_CONCAT ("sys/timeb.h" H5_HAVE_SYS_TIMEB_H)

2
config/cmake/H5pubconf.h.in
View File

@ -461,7 +461,7 @@
#cmakedefine H5_HAVE_WINDOW_PATH @H5_HAVE_WINDOW_PATH@
/* Define to 1 if you have the <winsock.h> header file. */
#cmakedefine H5_HAVE_WINSOCK_H @H5_HAVE_WINSOCK_H@
#cmakedefine H5_HAVE_WINSOCK2_H @H5_HAVE_WINSOCK2_H@
/* Define to 1 if you have the <zlib.h> header file. */
#cmakedefine H5_HAVE_ZLIB_H @H5_HAVE_ZLIB_H@

4
perform/sio_timer.h
View File

@ -26,9 +26,9 @@
# include <time.h>
#endif
#ifdef H5_HAVE_WINSOCK_H
#ifdef H5_HAVE_WINSOCK2_H
# include <winsock2.h>
#endif /* H5_HAVE_WINSOCK_H */
#endif /* H5_HAVE_WINSOCK2_H */
/* The different types of timers we can have */
typedef enum timer_type_ {

2
src/H5private.h
View File

@ -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

6
src/H5system.c
View File

@ -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;
}

2
vms/src/h5pubconf.h
View File

@ -418,7 +418,7 @@
/* #undef H5_HAVE_WINDOW_PATH */
/* Define to 1 if you have the <winsock.h> header file. */
/* #undef H5_HAVE_WINSOCK_H */
/* #undef H5_HAVE_WINSOCK2_H */
/* Define to 1 if you have the <zlib.h> header file. */
#define H5_HAVE_ZLIB_H 1

2
windows/src/H5pubconf.h
View File

@ -443,7 +443,7 @@
#define H5_HAVE_WINDOW_PATH 1
/* Define to 1 if you have the <winsock.h> header file. */
#define H5_HAVE_WINSOCK_H 1
#define H5_HAVE_WINSOCK2_H 1
/* Define to 1 if you have the <zlib.h> header file. */
#define H5_HAVE_ZLIB_H 1