[svn-r22447] DAILYTEST-13: Remove check for vsnprintf works in config. Correct HAVE_WINSOCK name.

Tested: windows

3 files changed, 12 insertions, 37 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 4a2daf2..0948675 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -153,23 +153,16 @@ IF (WINDOWS)
   # that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
   # (This flag should be _unset_ for all machines, except for Windows)
   SET (H5_HAVE_WINDOW_PATH 1)
-#  SET (LINK_LIBS ${LINK_LIBS} "kernel32")
 ENDIF (WINDOWS)
 
 IF (WINDOWS)
-  SET (H5_HAVE_IO_H 1)
-  SET (H5_HAVE_SETJMP_H 1)
   SET (H5_HAVE_STDDEF_H 1)
   SET (H5_HAVE_SYS_STAT_H 1)
-  SET (H5_HAVE_SYS_TIMEB_H 1)
   SET (H5_HAVE_SYS_TYPES_H 1)
-  SET (H5_HAVE_WINSOCK_H 1)
   SET (H5_HAVE_LIBM 1)
   SET (H5_HAVE_STRDUP 1)
   SET (H5_HAVE_SYSTEM 1)
-  SET (H5_HAVE_DIFFTIME 1)
   SET (H5_HAVE_LONGJMP 1)
-  SET (H5_STDC_HEADERS 1)
   IF (NOT MINGW)
     SET (H5_HAVE_GETHOSTNAME 1)
   ENDIF (NOT MINGW)
@@ -189,9 +182,7 @@ ENDIF (WINDOWS)
 # something not quite correct with the actual test implementation. This affects
 # the 'dt_arith' test and most likely lots of other code
 # ----------------------------------------------------------------------------
-IF (WINDOWS)
-  SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
-ENDIF (WINDOWS)
+SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
 
 # ----------------------------------------------------------------------
 # END of WINDOWS Hard code Values
@@ -283,9 +274,7 @@ ENDMACRO (HDF5_FUNCTION_TEST)
 #-----------------------------------------------------------------------------
 # Check for these functions before the time headers are checked
 #-----------------------------------------------------------------------------
-IF (NOT WINDOWS)
-  HDF5_FUNCTION_TEST (STDC_HEADERS)
-ENDIF (NOT WINDOWS)
+HDF5_FUNCTION_TEST (STDC_HEADERS)
 
 CHECK_FUNCTION_EXISTS (difftime          H5_HAVE_DIFFTIME)
 #CHECK_FUNCTION_EXISTS (gettimeofday      H5_HAVE_GETTIMEOFDAY)
@@ -590,16 +579,13 @@ IF (NOT WINDOWS)
   # Does the struct stat have the st_blocks field?  This field is not Posix.
   #
   HDF5_FUNCTION_TEST (HAVE_STAT_ST_BLOCKS)
-  
-ENDIF (NOT WINDOWS)
 
-# ----------------------------------------------------------------------
-# How do we figure out the width of a tty in characters?
-#
-CHECK_FUNCTION_EXISTS (ioctl             H5_HAVE_IOCTL)
-HDF5_FUNCTION_TEST (HAVE_STRUCT_VIDEOCONFIG)
-HDF5_FUNCTION_TEST (HAVE_STRUCT_TEXT_INFO)
-IF (NOT WINDOWS)
+  # ----------------------------------------------------------------------
+  # How do we figure out the width of a tty in characters?
+  #
+  CHECK_FUNCTION_EXISTS (ioctl             H5_HAVE_IOCTL)
+  HDF5_FUNCTION_TEST (HAVE_STRUCT_VIDEOCONFIG)
+  HDF5_FUNCTION_TEST (HAVE_STRUCT_TEXT_INFO)
   CHECK_FUNCTION_EXISTS (_getvideoconfig   H5_HAVE__GETVIDEOCONFIG)
   CHECK_FUNCTION_EXISTS (gettextinfo       H5_HAVE_GETTEXTINFO)
   CHECK_FUNCTION_EXISTS (_scrsize          H5_HAVE__SCRSIZE)
@@ -645,9 +631,9 @@ CHECK_FUNCTION_EXISTS (vasprintf         H5_HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (waitpid           H5_HAVE_WAITPID)
 
 CHECK_FUNCTION_EXISTS (vsnprintf         H5_HAVE_VSNPRINTF)
-IF (H5_HAVE_VSNPRINTF)
-  HDF5_FUNCTION_TEST (VSNPRINTF_WORKS)
-ENDIF (H5_HAVE_VSNPRINTF)
+#IF (H5_HAVE_VSNPRINTF)
+#  HDF5_FUNCTION_TEST (VSNPRINTF_WORKS)
+#ENDIF (H5_HAVE_VSNPRINTF)
 
 #-----------------------------------------------------------------------------
 # sigsetjmp is special; may actually be a macro
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de9c50c..c67431b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,6 @@ SET (H5_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5" "${H5_HDRS}" "${H5_SRCS}" )
 
-
 SET (H5A_SRCS
     ${HDF5_SRC_DIR}/H5A.c
     ${HDF5_SRC_DIR}/H5Abtree2.c
@@ -36,7 +35,6 @@ SET (H5A_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5A" "${H5A_HDRS}" "${H5A_SRCS}" )
 
-
 SET (H5AC_SRCS
     ${HDF5_SRC_DIR}/H5AC.c
 )
@@ -46,7 +44,6 @@ SET (H5AC_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5AC" "${H5AC_HDRS}" "${H5AC_SRCS}" )
 
-
 SET (H5B_SRCS
     ${HDF5_SRC_DIR}/H5B.c
     ${HDF5_SRC_DIR}/H5Bcache.c
@@ -118,7 +115,6 @@ SET (H5D_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5D" "${H5D_HDRS}" "${H5D_SRCS}" )
 
-
 SET (H5E_SRCS
     ${HDF5_SRC_DIR}/H5E.c
     ${HDF5_SRC_DIR}/H5Edeprec.c
@@ -258,7 +254,6 @@ SET (H5FS_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5FS" "${H5FS_HDRS}" "${H5FS_SRCS}" )
 
-
 SET (H5G_SRCS
     ${HDF5_SRC_DIR}/H5G.c
     ${HDF5_SRC_DIR}/H5Gbtree2.c
@@ -285,7 +280,6 @@ SET (H5G_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5G" "${H5G_HDRS}" "${H5G_SRCS}" )
 
-
 SET (H5HF_SRCS
     ${HDF5_SRC_DIR}/H5HF.c
     ${HDF5_SRC_DIR}/H5HFbtree2.c
@@ -310,7 +304,6 @@ SET (H5HF_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5HF" "${H5HF_HDRS}" "${H5HF_SRCS}" )
 
-
 SET (H5HG_SRCS
     ${HDF5_SRC_DIR}/H5HG.c
     ${HDF5_SRC_DIR}/H5HGcache.c
@@ -323,7 +316,6 @@ SET (H5HG_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5HG" "${H5HG_HDRS}" "${H5HG_SRCS}" )
 
-
 SET (H5HL_SRCS
     ${HDF5_SRC_DIR}/H5HL.c
     ${HDF5_SRC_DIR}/H5HLcache.c
@@ -396,7 +388,6 @@ SET (H5MP_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SRCS}" )
 
-
 SET (H5O_SRCS
     ${HDF5_SRC_DIR}/H5O.c
     ${HDF5_SRC_DIR}/H5Oainfo.c
@@ -439,7 +430,6 @@ SET (H5O_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5O" "${H5O_HDRS}" "${H5O_SRCS}" )
 
-
 SET (H5P_SRCS
     ${HDF5_SRC_DIR}/H5P.c
     ${HDF5_SRC_DIR}/H5Pacpl.c
@@ -616,7 +606,6 @@ SET (H5Z_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5Z" "${H5Z_HDRS}" "${H5Z_SRCS}" )
 
-
 SET (common_SRCS
     ${H5_SRCS}
     ${H5A_SRCS}
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 6176b33..a8668b8 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -406,7 +406,7 @@
 #undef HAVE_WINDOW_PATH
 
 /* Define to 1 if you have the <winsock2.h> header file. */
-#undef HAVE_WINSOCK2_H
+#undef HAVE_WINSOCK_H
 
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H