Commit ae8a01ea authored by Yang Tse's avatar Yang Tse
Browse files

Avoid the risk of a false positive detection of MSG_NOSIGNAL when cross compiling a Windows target.

parent 9dde0b54

acinclude.m4

+15 −0
Original line number Original line Diff line number Diff line
@@ -935,11 +935,26 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ 
  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [

  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [

    AC_COMPILE_IFELSE([

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([

      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

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#include <sys/types.h>

#endif

#endif

#ifdef HAVE_SYS_SOCKET_H

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#include <sys/socket.h>

#endif

#endif

#endif

      ],[

      ],[

        int flag=MSG_NOSIGNAL;

        int flag=MSG_NOSIGNAL;

ares/acinclude.m4

+15 −0
Original line number Original line Diff line number Diff line
@@ -913,11 +913,26 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ 
  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [

  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [

    AC_COMPILE_IFELSE([

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([

      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

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#include <sys/types.h>

#endif

#endif

#ifdef HAVE_SYS_SOCKET_H

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#include <sys/socket.h>

#endif

#endif

#endif

      ],[

      ],[

        int flag=MSG_NOSIGNAL;

        int flag=MSG_NOSIGNAL;