From ae8a01ead6d8d036ceeb496822d1cc51b279b808 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 31 Jul 2006 18:41:29 +0000
Subject: [PATCH] Avoid the risk of a false positive detection of MSG_NOSIGNAL
 when cross compiling a Windows target.

---
 acinclude.m4      | 15 +++++++++++++++
 ares/acinclude.m4 | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/acinclude.m4 b/acinclude.m4
index 4ec27d2ae..6369761de 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -935,11 +935,26 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
   AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
     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
       ],[
         int flag=MSG_NOSIGNAL;
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index aa87cba60..6745bc2f4 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -913,11 +913,26 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
   AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
     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
       ],[
         int flag=MSG_NOSIGNAL;