Mercurial > hg > octave-shane > gnulib-hg

annotate m4/socklen.m4 @ 10638:28050ad34088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix getaddrinfo emulation for systems with struct sockaddr.sa_len. 2008-10-13 Paolo Bonzini <bonzini@gnu.org> fix getaddrinfo emulation for systems with struct sockaddr.sa_len * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Detect struct sockaddr.sa_len. * lib/getaddrinfo.c (getaddrinfo): Set it if appropriate.
author Paolo Bonzini <bonzini@gnu.org>
date Mon, 13 Oct 2008 19:49:44 +0200
parents 2e4b4a414ab5
children 56ceeef91c22
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9266
2e4b4a414ab5 Rename sys_socket_.h to sys_socket.in.h.
Bruno Haible <bruno@clisp.org>
parents: 8741
diff changeset
1 # socklen.m4 serial 6
8068
b659313aacd0 m4/socklen.m4: Fix typo.
Simon Josefsson <simon@josefsson.org>
parents: 6646
diff changeset
2 dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
6217
f73f33cda590 2005-09-08 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
diff changeset
3 dnl This file is free software; the Free Software Foundation
f73f33cda590 2005-09-08 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
diff changeset
4 dnl gives unlimited permission to copy and/or distribute it,
f73f33cda590 2005-09-08 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
diff changeset
5 dnl with or without modifications, as long as this notice is preserved.
f73f33cda590 2005-09-08 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
diff changeset
6
6572
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
7 dnl From Albert Chin, Windows fixes from Simon Josefsson.
6217
f73f33cda590 2005-09-08 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
diff changeset
8
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
9 dnl Check for socklen_t: historically on BSD it is an int, and in
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
10 dnl POSIX 1g it is a type of its own, but some platforms use different
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
11 dnl types for the argument to getsockopt, getpeername, etc. So we
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
12 dnl have to test to find something that will work.
6572
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
13
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
14 dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
9266
2e4b4a414ab5 Rename sys_socket_.h to sys_socket.in.h.
Bruno Haible <bruno@clisp.org>
parents: 8741
diff changeset
15 dnl it there first. That file is included by gnulib's sys_socket.in.h, which
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
16 dnl all users of this module should include. Cygwin must not include
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
17 dnl ws2tcpip.h.
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
18 AC_DEFUN([gl_TYPE_SOCKLEN_T],
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
19 [AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl
6572
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
20 AC_CHECK_TYPE([socklen_t], ,
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
21 [AC_MSG_CHECKING([for socklen_t equivalent])
8068
b659313aacd0 m4/socklen.m4: Fix typo.
Simon Josefsson <simon@josefsson.org>
parents: 6646
diff changeset
22 AC_CACHE_VAL([gl_cv_socklen_t_equiv],
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
23 [# Systems have either "struct sockaddr *" or
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
24 # "void *" as the second argument to getpeername
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
25 gl_cv_socklen_t_equiv=
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
26 for arg2 in "struct sockaddr" void; do
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
27 for t in int size_t "unsigned int" "long int" "unsigned long int"; do
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
28 AC_TRY_COMPILE(
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
29 [#include <sys/types.h>
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
30 #include <sys/socket.h>
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
31
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
32 int getpeername (int, $arg2 *, $t *);],
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
33 [$t len;
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
34 getpeername (0, 0, &len);],
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
35 [gl_cv_socklen_t_equiv="$t"])
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
36 test "$gl_cv_socklen_t_equiv" != "" && break
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
37 done
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
38 test "$gl_cv_socklen_t_equiv" != "" && break
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
39 done
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
40 ])
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
41 if test "$gl_cv_socklen_t_equiv" = ""; then
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
42 AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
43 fi
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
44 AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
45 AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
46 [type to use in place of socklen_t if not defined])],
6468
c2f9aa6169d0 * socklen.m4 (gl_TYPE_SOCKLEN_T): Renamed from gl_SOCKLEN_T.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6258
diff changeset
47 [#include <sys/types.h>
6572
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
48 #if HAVE_SYS_SOCKET_H
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
49 # include <sys/socket.h>
6646
c8acef83bf3f * sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Don't attempt using
Simon Josefsson <simon@josefsson.org>
parents: 6572
diff changeset
50 #elif HAVE_WS2TCPIP_H
6572
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
51 # include <ws2tcpip.h>
df6195e003c4 * socklen.m4: Look in ws2tcpip.h too, for mingw32.
Simon Josefsson <simon@josefsson.org>
parents: 6468
diff changeset
52 #endif])])