summaryrefslogtreecommitdiff
path: root/lib/sys_socket.in.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-12-07 21:43:04 +0100
committerLudovic Courtès <ludo@gnu.org>2010-12-07 23:13:19 +0100
commit0f00f2c33a85842a9611ed63f07e915ea9fd60de (patch)
treea02ec2b230021798eb854693c6c9270c6a1f87e6 /lib/sys_socket.in.h
parentcb26e97a88e90d04e6d4efe3de0de92dea53d1e5 (diff)
downloadguile-0f00f2c33a85842a9611ed63f07e915ea9fd60de.tar.gz
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120. * m4/gnulib-cache.m4: Add `nproc'.
Diffstat (limited to 'lib/sys_socket.in.h')
-rw-r--r--lib/sys_socket.in.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index e62a8d061..5c8462716 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -26,6 +26,7 @@
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+@PRAGMA_COLUMNS@
#if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
/* Special invocation convention:
@@ -69,7 +70,14 @@
typedef unsigned short sa_family_t;
#endif
-#if !@HAVE_STRUCT_SOCKADDR_STORAGE@
+#if @HAVE_STRUCT_SOCKADDR_STORAGE@
+/* Make the 'struct sockaddr_storage' field 'ss_family' visible on AIX 7.1. */
+# if !@HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@
+# ifndef ss_family
+# define ss_family __ss_family
+# endif
+# endif
+#else
# include <alignof.h>
/* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
@@ -122,8 +130,8 @@ struct sockaddr_storage
adding AC_DEFINE(WINVER, 0x0501) to configure.ac. Note that your
code may not run on older Windows releases then. My Windows 2000
box was not able to run the code, for example. The situation is
- slightly confusing because:
- http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/winsock/getaddrinfo_2.asp
+ slightly confusing because
+ <http://msdn.microsoft.com/en-us/library/ms738520>
suggests that getaddrinfo should be available on all Windows
releases. */