# HG changeset patch # User Paul Eggert # Date 1318810758 25200 # Node ID 9b28a5d31bb55d621d0059d79e77f0a1857cb08f # Parent d8fd2f096b83365eb336dc63bc22486b28ec3ad7 sys_socket: use stdalign, not alignof * lib/sys_socket.in.h: Include instead of . * modules/sys_socket (Depends-on): Depend on stdalign, not alignof. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,10 @@ * modules/crypto/md5, modules/crypto/sha1, modules/crypto/sha256: * modules/crypto/sha512: Likewise. + sys_socket: use stdalign, not alignof + * lib/sys_socket.in.h: Include instead of . + * modules/sys_socket (Depends-on): Depend on stdalign, not alignof. + 2011-10-27 Bruno Haible raise test: Avoid a test failure on Linux/MIPS. diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -85,7 +85,7 @@ # endif # endif #else -# include +# include /* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on 2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */ # define __ss_aligntype unsigned long int diff --git a/modules/sys_socket b/modules/sys_socket --- a/modules/sys_socket +++ b/modules/sys_socket @@ -7,7 +7,6 @@ m4/sockpfaf.m4 Depends-on: -alignof errno include_next snippet/arg-nonnull @@ -15,6 +14,7 @@ snippet/warn-on-use socklen ssize_t +stdalign sys_uio configure.ac: