diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-16 23:34:00 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-02-16 23:34:00 +0000 |
| commit | 4492bcd9ef1f625c8acc56f637c77ca1f1c693ea (patch) | |
| tree | 4b2bc83c0b36ab77677829786248111dcc672548 /m4/socklen.m4 | |
| parent | 74699a2b521ccead4236a438adf6c36295034553 (diff) | |
| download | coreutils-4492bcd9ef1f625c8acc56f637c77ca1f1c693ea.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'm4/socklen.m4')
| -rw-r--r-- | m4/socklen.m4 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 01da2b547..5e3765a64 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,4 +1,4 @@ -# socklen.m4 serial 3 +# socklen.m4 serial 4 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,40 +13,40 @@ dnl 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 socket_.h, which -dnl all users of this module should include. +dnl all users of this module should include. Cygwin must not include +dnl ws2tcpip.h. AC_DEFUN([gl_TYPE_SOCKLEN_T], - [AC_CHECK_HEADERS_ONCE([sys/socket.h ws2tcpip.h]) + [AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl AC_CHECK_TYPE([socklen_t], , [AC_MSG_CHECKING([for socklen_t equivalent]) AC_CACHE_VAL([gl_cv_gl_cv_socklen_t_equiv], - [# Systems have either "struct sockaddr *" or - # "void *" as the second argument to getpeername - gl_cv_socklen_t_equiv= - for arg2 in "struct sockaddr" void; do + [# Systems have either "struct sockaddr *" or + # "void *" as the second argument to getpeername + gl_cv_socklen_t_equiv= + for arg2 in "struct sockaddr" void; do for t in int size_t "unsigned int" "long int" "unsigned long int"; do AC_TRY_COMPILE( [#include <sys/types.h> - #include <sys/socket.h> + #include <sys/socket.h> int getpeername (int, $arg2 *, $t *);], - [$t len; + [$t len; getpeername (0, 0, &len);], [gl_cv_socklen_t_equiv="$t"]) - test "$gl_cv_socklen_t_equiv" != "" && break + test "$gl_cv_socklen_t_equiv" != "" && break done - test "$gl_cv_socklen_t_equiv" != "" && break - done + test "$gl_cv_socklen_t_equiv" != "" && break + done ]) if test "$gl_cv_socklen_t_equiv" = ""; then AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) fi 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])], + [type to use in place of socklen_t if not defined])], [#include <sys/types.h> #if HAVE_SYS_SOCKET_H # include <sys/socket.h> - #endif - #if HAVE_WS2TCPIP_H + #elif HAVE_WS2TCPIP_H # include <ws2tcpip.h> #endif])]) |