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

fix: remove need and definition of HAVE_SOCKLEN_T symbol

Browse Source
This commit is contained in:
Yang Tse
2008-05-21 14:04:14 +00:00
parent 0163b5b8be
commit d8efc99217
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -775,8 +775,6 @@ 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 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 dnl socklen_t not available
AC_CACHE_CHECK([for socklen_t equivalent], AC_CACHE_CHECK([for socklen_t equivalent],
@@ -830,8 +828,6 @@ 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 when system does not provide it.]) [Type to use in place of socklen_t when system does not provide it.])
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
;; ;;
esac esac
],[ ],[

4
ares/acinclude.m4
View File

@@ -244,8 +244,6 @@ 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 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 dnl socklen_t not available
AC_CACHE_CHECK([for socklen_t equivalent], AC_CACHE_CHECK([for socklen_t equivalent],
@@ -299,8 +297,6 @@ 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 when system does not provide it.]) [Type to use in place of socklen_t when system does not provide it.])
AC_DEFINE_UNQUOTED(HAVE_SOCKLEN_T, 1,
[Define to 1 if socklen_t is available or a equivalent is defined.])
;; ;;
esac esac
],[ ],[

3
ares/setup_once.h
View File

@@ -100,11 +100,10 @@ struct timeval {
* definition is present the other one also is available. * definition is present the other one also is available.
*/ */
#if defined(WIN32) && !defined(HAVE_SOCKLEN_T) #if defined(WIN32) && !defined(HAVE_CONFIG_H)
# if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \ # if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \
(!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) ) (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )
# define socklen_t int # define socklen_t int
# define HAVE_SOCKLEN_T
# endif # endif
#endif #endif

3
lib/setup_once.h
View File

@@ -107,11 +107,10 @@ struct timeval {
* definition is present the other one also is available. * definition is present the other one also is available.
*/ */
#if defined(WIN32) && !defined(HAVE_SOCKLEN_T) #if defined(WIN32) && !defined(HAVE_CONFIG_H)
# if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \ # if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \
(!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) ) (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) )
# define socklen_t int # define socklen_t int
# define HAVE_SOCKLEN_T
# endif # endif
#endif #endif