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

In CURL_FUNC_GETNAMEINFO_ARGTYPES, when cross-compiling a windows 

target use calling convention WSAAPI for getnameinfo() prototype.
Checking type DWORD as argument 4 and 6 of getnameinfo not needed.
parent 7d1e3ebe

acinclude.m4

+7 −5
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
    curl_cv_func_getnameinfo_args="unknown"

    for gni_arg1 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do

      for gni_arg2 in 'socklen_t' 'size_t' 'int'; do

        for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do

        for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do

          for gni_arg7 in 'int' 'unsigned int'; do

            AC_COMPILE_IFELSE([

              AC_LANG_PROGRAM([
@@ -252,7 +252,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN

#endif

#if defined(__MINGW32__) && ( (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501) )

#if (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501)

#undef _WIN32_WINNT

#define _WIN32_WINNT 0x0501

#endif
@@ -263,6 +263,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#include <ws2tcpip.h>

#endif

#endif

#define GNICALLCONV WSAAPI

#else

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>
@@ -273,8 +274,9 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#ifdef HAVE_NETDB_H

#include <netdb.h>

#endif

#define GNICALLCONV

#endif

                extern int getnameinfo($gni_arg1, $gni_arg2,

                extern int GNICALLCONV getnameinfo($gni_arg1, $gni_arg2,

                                       char *, $gni_arg46,

                                       char *, $gni_arg46,

                                       $gni_arg7);

ares/acinclude.m4

+7 −5
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
    curl_cv_func_getnameinfo_args="unknown"

    for gni_arg1 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do

      for gni_arg2 in 'socklen_t' 'size_t' 'int'; do

        for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do

        for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do

          for gni_arg7 in 'int' 'unsigned int'; do

            AC_COMPILE_IFELSE([

              AC_LANG_PROGRAM([
@@ -231,7 +231,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN

#endif

#if defined(__MINGW32__) && ( (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501) )

#if (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501)

#undef _WIN32_WINNT

#define _WIN32_WINNT 0x0501

#endif
@@ -242,6 +242,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#include <ws2tcpip.h>

#endif

#endif

#define GNICALLCONV WSAAPI

#else

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>
@@ -252,8 +253,9 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ 
#ifdef HAVE_NETDB_H

#include <netdb.h>

#endif

#define GNICALLCONV

#endif

                extern int getnameinfo($gni_arg1, $gni_arg2,

                extern int GNICALLCONV getnameinfo($gni_arg1, $gni_arg2,

                                       char *, $gni_arg46,

                                       char *, $gni_arg46,

                                       $gni_arg7);