generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix socklen_t equivalent detection when cross compiling Windows target

Browse Source
This commit is contained in:
Yang Tse
2008-05-19 12:31:11 +00:00
parent 512b9ac194
commit 8fc2f8ef62
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acinclude.m4
View File

@@ -773,10 +773,16 @@ dnl an equivalent type if socklen_t not available
AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
AC_CHECK_TYPE([socklen_t], ,[ AC_CHECK_TYPE([socklen_t], [
dnl socklen_t is available
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
],[
dnl socklen_t not available
AC_CACHE_CHECK([for socklen_t equivalent], AC_CACHE_CHECK([for socklen_t equivalent],
[curl_cv_socklen_t_equiv], [ [curl_cv_socklen_t_equiv], [
curl_cv_socklen_t_equiv="unknown" curl_cv_socklen_t_equiv="unknown"
for arg1 in 'int' 'SOCKET'; do
for arg2 in "struct sockaddr" void; do for arg2 in "struct sockaddr" void; do
for t in int size_t unsigned long "unsigned long"; do for t in int size_t unsigned long "unsigned long"; do
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
@@ -794,6 +800,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
#include <winsock.h> #include <winsock.h>
#endif #endif
#endif #endif
#define GETPEERNCALLCONV PASCAL
#else #else
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
@@ -801,18 +808,20 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#define GETPEERNCALLCONV
#endif #endif
int getpeername (int, $arg2 *, $t *); extern int GETPEERNCALLCONV getpeername ($arg1, $arg2 *, $t *);
],[ ],[
$t len=0; $t len=0;
getpeername(0,0,&len); getpeername(0,0,&len);
]) ])
],[ ],[
curl_cv_socklen_t_equiv="$t" curl_cv_socklen_t_equiv="$t"
break 2 break 3
]) ])
done done
done done
done
]) ])
case "$curl_cv_socklen_t_equiv" in case "$curl_cv_socklen_t_equiv" in
unknown) unknown)
@@ -821,6 +830,8 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
*) *)
AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv, AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
[type to use in place of socklen_t if not defined]) [type to use in place of socklen_t if not defined])
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
;; ;;
esac esac
],[ ],[

17
ares/acinclude.m4
View File

@@ -242,10 +242,16 @@ dnl an equivalent type if socklen_t not available
AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl AC_REQUIRE([CURL_CHECK_HEADER_WS2TCPIP])dnl
AC_CHECK_TYPE([socklen_t], ,[ AC_CHECK_TYPE([socklen_t], [
dnl socklen_t is available
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
],[
dnl socklen_t not available
AC_CACHE_CHECK([for socklen_t equivalent], AC_CACHE_CHECK([for socklen_t equivalent],
[curl_cv_socklen_t_equiv], [ [curl_cv_socklen_t_equiv], [
curl_cv_socklen_t_equiv="unknown" curl_cv_socklen_t_equiv="unknown"
for arg1 in 'int' 'SOCKET'; do
for arg2 in "struct sockaddr" void; do for arg2 in "struct sockaddr" void; do
for t in int size_t unsigned long "unsigned long"; do for t in int size_t unsigned long "unsigned long"; do
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
@@ -263,6 +269,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
#include <winsock.h> #include <winsock.h>
#endif #endif
#endif #endif
#define GETPEERNCALLCONV PASCAL
#else #else
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
@@ -270,18 +277,20 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#define GETPEERNCALLCONV
#endif #endif
int getpeername (int, $arg2 *, $t *); extern int GETPEERNCALLCONV getpeername ($arg1, $arg2 *, $t *);
],[ ],[
$t len=0; $t len=0;
getpeername(0,0,&len); getpeername(0,0,&len);
]) ])
],[ ],[
curl_cv_socklen_t_equiv="$t" curl_cv_socklen_t_equiv="$t"
break 2 break 3
]) ])
done done
done done
done
]) ])
case "$curl_cv_socklen_t_equiv" in case "$curl_cv_socklen_t_equiv" in
unknown) unknown)
@@ -290,6 +299,8 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
*) *)
AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv, AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
[type to use in place of socklen_t if not defined]) [type to use in place of socklen_t if not defined])
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
;; ;;
esac esac
],[ ],[