Merge from gnulib, for socklen_t.
This commit is contained in:
Paul Eggert
parent
591b2973e7
commit
6a90a4f198
3 changed files with 63 additions and 27 deletions
29
configure
vendored
29
configure
vendored
|
|
@ -14777,6 +14777,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||
|
||||
|
||||
|
||||
if test $ac_cv_header_sys_socket_h = no; then
|
||||
for ac_header in ws2tcpip.h
|
||||
do :
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_WS2TCPIP_H 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
|
||||
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
|
||||
|
|
@ -16351,10 +16365,17 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
|
|||
|
||||
|
||||
# Code from module socklen:
|
||||
ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
|
||||
#if HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
#endif
|
||||
ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
|
||||
/* <sys/types.h> is not needed according to POSIX, but the
|
||||
<sys/socket.h> in i386-unknown-freebsd4.10 and
|
||||
powerpc-apple-darwin5.5 required it. */
|
||||
#include <sys/types.h>
|
||||
#if HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
#elif HAVE_WS2TCPIP_H
|
||||
# include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
"
|
||||
if test "x$ac_cv_type_socklen_t" = xyes; then :
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# socklen.m4 serial 9
|
||||
# socklen.m4 serial 10
|
||||
dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -9,15 +9,11 @@ dnl From Albert Chin, Windows fixes from Simon Josefsson.
|
|||
dnl Check for socklen_t: historically on BSD it is an int, and in
|
||||
dnl POSIX 1g it is a type of its own, but some platforms use different
|
||||
dnl types for the argument to getsockopt, getpeername, etc.:
|
||||
dnl HP-UX 10.20, IRIX 6.5, Interix 3.5, BeOS.
|
||||
dnl HP-UX 10.20, IRIX 6.5, OSF/1 4.0, Interix 3.5, BeOS.
|
||||
dnl So we have to test to find something that will work.
|
||||
|
||||
dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
|
||||
dnl it there first. That file is included by gnulib's sys_socket.in.h, which
|
||||
dnl all users of this module should include if they want to be portable to
|
||||
dnl mingw32. Cygwin must not include ws2tcpip.h.
|
||||
AC_DEFUN([gl_TYPE_SOCKLEN_T],
|
||||
[AC_REQUIRE([gl_PREREQ_TYPE_SOCKLEN_T])dnl
|
||||
[AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])dnl
|
||||
AC_CHECK_TYPE([socklen_t], ,
|
||||
[AC_MSG_CHECKING([for socklen_t equivalent])
|
||||
AC_CACHE_VAL([gl_cv_socklen_t_equiv],
|
||||
|
|
@ -45,21 +41,37 @@ AC_DEFUN([gl_TYPE_SOCKLEN_T],
|
|||
AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
|
||||
AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
|
||||
[type to use in place of socklen_t if not defined])],
|
||||
[#include <sys/types.h>
|
||||
#if HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
]m4_ifdef([gl_SYS_SOCKET_H_DEFAULTS],
|
||||
[#elif HAVE_WS2TCPIP_H
|
||||
# include <ws2tcpip.h>]
|
||||
)[#endif])])
|
||||
[gl_SOCKET_HEADERS])])
|
||||
|
||||
AC_DEFUN([gl_PREREQ_TYPE_SOCKLEN_T],
|
||||
dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
|
||||
dnl it there too. But on Cygwin, wc2tcpip.h must not be included. Users
|
||||
dnl of this module should use the same include pattern as gl_SOCKET_HEADERS.
|
||||
dnl When you change this macro, keep also in sync:
|
||||
dnl - gl_CHECK_SOCKET_HEADERS,
|
||||
dnl - the Include section of modules/socklen.
|
||||
AC_DEFUN([gl_SOCKET_HEADERS],
|
||||
[
|
||||
/* <sys/types.h> is not needed according to POSIX, but the
|
||||
<sys/socket.h> in i386-unknown-freebsd4.10 and
|
||||
powerpc-apple-darwin5.5 required it. */
|
||||
#include <sys/types.h>
|
||||
#if HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
#elif HAVE_WS2TCPIP_H
|
||||
# include <ws2tcpip.h>
|
||||
#endif
|
||||
])
|
||||
|
||||
dnl Tests for the existence of the header for socket facilities.
|
||||
dnl Defines the C macros HAVE_SYS_SOCKET_H, HAVE_WS2TCPIP_H.
|
||||
dnl This macro must match gl_SOCKET_HEADERS.
|
||||
AC_DEFUN([gl_CHECK_SOCKET_HEADERS],
|
||||
[AC_CHECK_HEADERS_ONCE([sys/socket.h])
|
||||
m4_ifdef([gl_SYS_SOCKET_H_DEFAULTS],
|
||||
[if test $ac_cv_header_sys_socket_h = no; then
|
||||
dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
|
||||
dnl the check for those headers unconditional; yet cygwin reports
|
||||
dnl that the headers are present but cannot be compiled (since on
|
||||
dnl cygwin, all socket information should come from sys/socket.h).
|
||||
AC_CHECK_HEADERS([ws2tcpip.h])
|
||||
fi])])
|
||||
if test $ac_cv_header_sys_socket_h = no; then
|
||||
dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
|
||||
dnl the check for those headers unconditional; yet cygwin reports
|
||||
dnl that the headers are present but cannot be compiled (since on
|
||||
dnl cygwin, all socket information should come from sys/socket.h).
|
||||
AC_CHECK_HEADERS([ws2tcpip.h])
|
||||
fi
|
||||
])
|
||||
|
|
|
|||
|
|
@ -833,6 +833,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Define to 1 if `vfork' works. */
|
||||
#undef HAVE_WORKING_VFORK
|
||||
|
||||
/* Define to 1 if you have the <ws2tcpip.h> header file. */
|
||||
#undef HAVE_WS2TCPIP_H
|
||||
|
||||
/* Define to 1 if you want to use version 11 of X windows. Otherwise, Emacs
|
||||
expects to use version 10. */
|
||||
#undef HAVE_X11
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue