Merge branch 'curl-cygwin-no-windows' into release

This commit is contained in:
Brad King 2015-03-26 14:04:44 -04:00
commit 94d3988c3f
1 changed files with 8 additions and 2 deletions

View File

@ -524,12 +524,18 @@ check_include_file("features.h" HAVE_FEATURES_H)
if(NOT UNIX) if(NOT UNIX)
check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H) check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H)
check_include_file_concat("winsock2.h" HAVE_WINSOCK2_H) check_include_file_concat("winsock2.h" HAVE_WINSOCK2_H)
endif(NOT UNIX) else()
set(HAVE_WS2TCPIP_H 0)
set(HAVE_WINSOCK2_H 0)
endif()
check_include_file_concat("stdio.h" HAVE_STDIO_H) check_include_file_concat("stdio.h" HAVE_STDIO_H)
if(NOT UNIX) if(NOT UNIX)
check_include_file_concat("windows.h" HAVE_WINDOWS_H) check_include_file_concat("windows.h" HAVE_WINDOWS_H)
check_include_file_concat("winsock.h" HAVE_WINSOCK_H) check_include_file_concat("winsock.h" HAVE_WINSOCK_H)
endif(NOT UNIX) else()
set(HAVE_WINDOWS_H 0)
set(HAVE_WINSOCK_H 0)
endif()
check_include_file_concat("inttypes.h" HAVE_INTTYPES_H) check_include_file_concat("inttypes.h" HAVE_INTTYPES_H)
check_include_file_concat("sys/filio.h" HAVE_SYS_FILIO_H) check_include_file_concat("sys/filio.h" HAVE_SYS_FILIO_H)