diff options
author | Simon Josefsson <simon@josefsson.org> | 2005-12-01 16:49:04 +0000 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2005-12-01 16:49:04 +0000 |
commit | a5d0a529fa0ca64730012057b9687af8f9abf8db (patch) | |
tree | 0bd06f4f1a739cd69148a55d73c91318b423d795 /gl/m4/socklen.m4 | |
parent | b36346bda4b00b9d510a4283affa56b281f1417b (diff) | |
download | gnutls-a5d0a529fa0ca64730012057b9687af8f9abf8db.tar.gz |
Update.
Diffstat (limited to 'gl/m4/socklen.m4')
-rw-r--r-- | gl/m4/socklen.m4 | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/gl/m4/socklen.m4 b/gl/m4/socklen.m4 index c26a2813a4..7db6ba3550 100644 --- a/gl/m4/socklen.m4 +++ b/gl/m4/socklen.m4 @@ -1,21 +1,42 @@ -# socklen.m4 serial 1 +# socklen.m4 serial 2 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl From Simon Josefsson. +dnl From Albert Chin. -AC_DEFUN([gl_SOCKLEN_T], -[ - AC_CHECK_HEADERS_ONCE(sys/types.h sys/socket.h) - AC_CHECK_TYPE([socklen_t],, [AC_DEFINE([socklen_t], [int], - [Map `socklen_t' to `int' if it is missing.])], [ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif) -]) -]) +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. So we +dnl have to test to find something that will work. +AC_DEFUN([gl_TYPE_SOCKLEN_T], + [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 + 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> + + int getpeername (int, $arg2 *, $t *);], + [$t len; + getpeername (0, 0, &len);], + [gl_cv_socklen_t_equiv="$t"]) + 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])], + [#include <sys/types.h> + #include <sys/socket.h>])]) |