From a8bd8dfca5a4e7691d91857e546ac8abe0f4b0f7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Oct 2011 17:19:18 -0700 Subject: [PATCH] sys_socket: use stdalign, not alignof * lib/sys_socket.in.h: Include instead of . * modules/sys_socket (Depends-on): Depend on stdalign, not alignof. --- ChangeLog | 4 ++++ lib/sys_socket.in.h | 2 +- modules/sys_socket | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8fcdcca49..e862b7a415 100644 --- 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 index c42497d049..107c180a1d 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -85,7 +85,7 @@ typedef unsigned short sa_family_t; # 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 index 82c6909ac9..704f2a5111 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -7,7 +7,6 @@ m4/sys_socket_h.m4 m4/sockpfaf.m4 Depends-on: -alignof errno include_next snippet/arg-nonnull @@ -15,6 +14,7 @@ snippet/c++defs snippet/warn-on-use socklen ssize_t +stdalign sys_uio configure.ac: -- 2.39.5