projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'unistr/u8-strcat'.
[gnulib.git]
/
m4
/
socklen.m4
diff --git
a/m4/socklen.m4
b/m4/socklen.m4
index
01da2b5
..
2933d4b
100644
(file)
--- a/
m4/socklen.m4
+++ b/
m4/socklen.m4
@@
-1,5
+1,5
@@
-# socklen.m4 serial
3
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# socklen.m4 serial
7
+dnl Copyright (C) 2005, 2006
, 2007, 2009, 2010
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 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.
@@
-12,33
+12,34
@@
dnl types for the argument to getsockopt, getpeername, etc. So we
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 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 it there first. That file is included by gnulib's sys_socket.in.h, which
+dnl all users of this module should include. Cygwin must not include
+dnl ws2tcpip.h.
AC_DEFUN([gl_TYPE_SOCKLEN_T],
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_CHECK_TYPE([socklen_t], ,
[AC_MSG_CHECKING([for socklen_t equivalent])
- AC_CACHE_VAL([gl_cv_
gl_cv_
socklen_t_equiv],
+ AC_CACHE_VAL([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>
+
for t in int size_t "unsigned int" "long int" "unsigned long int"; do
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM
(
+
[
[#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"])
+
int getpeername (int, $arg2 *, $t *);]
],
+
[
[$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
+
done
test "$gl_cv_socklen_t_equiv" != "" && break
done
])
if test "$gl_cv_socklen_t_equiv" = ""; then
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])
+
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],
fi
AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
@@
-46,7
+47,6
@@
AC_DEFUN([gl_TYPE_SOCKLEN_T],
[#include <sys/types.h>
#if HAVE_SYS_SOCKET_H
# include <sys/socket.h>
[#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])])
# include <ws2tcpip.h>
#endif])])