[PATCH 5/5] sys_socket: use stdalign, not alignof

[Paul Eggert]

* lib/sys_socket.in.h: Include <stdalign.h> instead of <alignof.h>.
* 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 7aafff7..256675b 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 <stdalign.h> instead of <alignof.h>.
+       * modules/sys_socket (Depends-on): Depend on stdalign, not alignof.
+
 2011-10-15  Bruno Haible  <br...@clisp.org>
 
        xstrtoll: Fix compilation failure.
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index c42497d..107c180 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 <alignof.h>
+# include <stdalign.h>
 /* 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 82c6909..704f2a5 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:
-- 
1.7.4.4