Commit bc2f0c7d authored Jul 05, 2006 by Yang Tse

Prevent definition of HAVE_WINxxx_H symbols and avoid inclusion of Windows...

Prevent definition of HAVE_WINxxx_H symbols and avoid inclusion of Windows headers when compiled with Cygwin in POSIX emulation mode.

parent c6ae0ebc

acinclude.m4

+98 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,26 @@
		# $Id$
		###########################################################################


		dnl CURL_CHECK_HEADERS_ONCE
		dnl -------------------------------------------------
		dnl Check for headers if check not already done.

		AC_DEFUN(CURL_CHECK_HEADERS_ONCE, [
		for i in $1; do
		eval prev_check_res=\$ac_cv_header_$i
		case "$prev_check_res" in
		yes \| no)
		;;
		*)
		AC_CHECK_HEADERS($i)
		;;
		esac

		done
		])


		dnl CURL_CHECK_HEADER_WINDOWS
		dnl -------------------------------------------------
		dnl Check for compilable and valid windows.h header
		@@ -35,7 +55,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
		#endif
		#include <windows.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINDOWS_H shall not be defined.
		#else
		int dummy=2*WINVER;
		#endif
		])
		],[
		ac_cv_header_windows_h="yes"
		@@ -68,7 +92,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
		#include <windows.h>
		#include <winsock.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINSOCK_H shall not be defined.
		#else
		int dummy=WSACleanup();
		#endif
		])
		],[
		ac_cv_header_winsock_h="yes"
		@@ -99,7 +127,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
		#include <windows.h>
		#include <winsock2.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINSOCK2_H shall not be defined.
		#else
		int dummy=2*IPPROTO_ESP;
		#endif
		])
		],[
		ac_cv_header_winsock2_h="yes"
		@@ -131,7 +163,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
		#include <winsock2.h>
		#include <ws2tcpip.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WS2TCPIP_H shall not be defined.
		#else
		int dummy=2*IP_PKTINFO;
		#endif
		])
		],[
		ac_cv_header_ws2tcpip_h="yes"
		@@ -566,16 +602,32 @@ dnl and RECV_TYPE_ARG4, defining the type of the function
		dnl return value in RECV_TYPE_RETV.

		AC_DEFUN([CURL_CHECK_FUNC_RECV], [
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
		AC_CHECK_HEADERS(sys/types.h sys/socket.h)
		#
		AC_MSG_CHECKING([for recv])
		AC_TRY_LINK([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		],[
		recv(0, 0, 0, 0);
		@@ -599,11 +651,25 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		extern $recv_retv recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
		],[
		@@ -663,16 +729,32 @@ dnl return value in SEND_TYPE_RETV, and also defining the
		dnl type qualifier of second argument in SEND_QUAL_ARG2.

		AC_DEFUN([CURL_CHECK_FUNC_SEND], [
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
		AC_CHECK_HEADERS(sys/types.h sys/socket.h)
		#
		AC_MSG_CHECKING([for send])
		AC_TRY_LINK([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		],[
		send(0, 0, 0, 0);
		@@ -696,11 +778,25 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		extern $send_retv send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
		],[

ares/acinclude.m4

+97 −2

Original line number	Diff line number	Diff line


		dnl CURL_CHECK_HEADERS_ONCE
		dnl -------------------------------------------------
		dnl Check for headers if check not already done.

		AC_DEFUN(CURL_CHECK_HEADERS_ONCE, [
		for i in $1; do
		eval prev_check_res=\$ac_cv_header_$i
		case "$prev_check_res" in
		yes \| no)
		;;
		*)
		AC_CHECK_HEADERS($i)
		;;
		esac

		done
		])


		dnl CURL_CHECK_HEADER_WINDOWS
		dnl -------------------------------------------------
		dnl Check for compilable and valid windows.h header
		@@ -14,7 +33,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
		#endif
		#include <windows.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINDOWS_H shall not be defined.
		#else
		int dummy=2*WINVER;
		#endif
		])
		],[
		ac_cv_header_windows_h="yes"
		@@ -47,7 +70,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
		#include <windows.h>
		#include <winsock.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINSOCK_H shall not be defined.
		#else
		int dummy=WSACleanup();
		#endif
		])
		],[
		ac_cv_header_winsock_h="yes"
		@@ -78,7 +105,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
		#include <windows.h>
		#include <winsock2.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WINSOCK2_H shall not be defined.
		#else
		int dummy=2*IPPROTO_ESP;
		#endif
		])
		],[
		ac_cv_header_winsock2_h="yes"
		@@ -110,7 +141,11 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
		#include <winsock2.h>
		#include <ws2tcpip.h>
		],[
		#ifdef __CYGWIN__
		HAVE_WS2TCPIP_H shall not be defined.
		#else
		int dummy=2*IP_PKTINFO;
		#endif
		])
		],[
		ac_cv_header_ws2tcpip_h="yes"
		@@ -545,16 +580,32 @@ dnl and RECV_TYPE_ARG4, defining the type of the function
		dnl return value in RECV_TYPE_RETV.

		AC_DEFUN([CURL_CHECK_FUNC_RECV], [
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
		AC_CHECK_HEADERS(sys/types.h sys/socket.h)
		#
		AC_MSG_CHECKING([for recv])
		AC_TRY_LINK([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		],[
		recv(0, 0, 0, 0);
		@@ -578,11 +629,25 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		extern $recv_retv recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
		],[
		@@ -642,16 +707,32 @@ dnl return value in SEND_TYPE_RETV, and also defining the
		dnl type qualifier of second argument in SEND_QUAL_ARG2.

		AC_DEFUN([CURL_CHECK_FUNC_SEND], [
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
		AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
		AC_CHECK_HEADERS(sys/types.h sys/socket.h)
		#
		AC_MSG_CHECKING([for send])
		AC_TRY_LINK([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		],[
		send(0, 0, 0, 0);
		@@ -675,11 +756,25 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM([
		#undef inline
		#ifdef HAVE_WINDOWS_H
		#ifndef WIN32_LEAN_AND_MEAN
		#define WIN32_LEAN_AND_MEAN
		#endif
		#include <windows.h>
		#ifdef HAVE_WINSOCK2_H
		#include <winsock2.h>
		#else
		#ifdef HAVE_WINSOCK_H
		#include <winsock.h>
		#endif
		#endif
		#else
		#ifdef HAVE_SYS_TYPES_H
		#include <sys/types.h>
		#endif
		#ifdef HAVE_SYS_SOCKET_H
		#include <sys/socket.h>
		#endif
		#endif
		extern $send_retv send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
		],[

ares/ares.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		#include <netinet/in.h>
		#include <sys/socket.h>
		#include <tcp.h>
		#elif defined(WIN32)
		#elif defined(WIN32) && !defined(__CYGWIN__)
		#include <winsock2.h>
		#include <windows.h>
		#else

ares/nameser.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,7 +7,9 @@
		port build */

		#ifndef NETWARE
		#ifndef __CYGWIN__
		#include <windows.h>
		#endif
		#include <process.h> /* for the _getpid() proto */
		#endif /* !NETWARE */
		#include <sys/types.h>

ares/setup.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -43,10 +43,12 @@
		* Include header files for windows builds before redefining anything.
		* Use this preproessor block only to include or exclude windows.h,
		* winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
		* to any other further and independant block.
		* to any other further and independant block. Under Cygwin things work
		* just as under linux (e.g. <sys/socket.h>) and the winsock headers should
		* never be included when __CYGWIN__ is defined.
		*/

		#ifdef HAVE_WINDOWS_H
		#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
		# ifndef WIN32_LEAN_AND_MEAN
		# define WIN32_LEAN_AND_MEAN
		# endif