From 75f31948821d7b134f20948f1d3c18547c4c654f Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 11 Jun 2012 10:49:25 -0500
Subject: [svn-r22450] Update winsock define to match autotools configure check

---
 config/cmake/ConfigureChecks.cmake | 2 +-
 config/cmake/H5pubconf.h.in        | 2 +-
 perform/sio_timer.h                | 4 ++--
 src/H5private.h                    | 2 +-
 src/H5system.c                     | 6 +++---
 vms/src/h5pubconf.h                | 2 +-
 windows/src/H5pubconf.h            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 0948675..01a4d0e 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -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)
 
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 80406a3..0c6cc0b 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -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@
diff --git a/perform/sio_timer.h b/perform/sio_timer.h
index 04432af..46702c3 100644
--- a/perform/sio_timer.h
+++ b/perform/sio_timer.h
@@ -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_ {
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;
 }
 
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 889d7ba..48748b5 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -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
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 8e1a76a..99f466d 100644
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -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
-- 
cgit v0.12