summaryrefslogtreecommitdiff
path: root/lib/sys_socket.in.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-12-19 18:00:28 +0100
committerAndy Wingo <wingo@pobox.com>2011-12-19 18:00:28 +0100
commit296004b3ba34139292eb1d8bf54739ee1a082712 (patch)
tree149e2c87f169583ade59bbb876530fc03af9b2ea /lib/sys_socket.in.h
parentbfe35b90ff0c7f78335e70bdb26ea3466f6e98d9 (diff)
parent52b680f85e84689778f10ed8f9e72adf8316fbe7 (diff)
downloadguile-296004b3ba34139292eb1d8bf54739ee1a082712.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/feature.c m4/gnulib-cache.m4 module/ice-9/deprecated.scm module/language/tree-il/peval.scm
Diffstat (limited to 'lib/sys_socket.in.h')
-rw-r--r--lib/sys_socket.in.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index 5fadb1af8..a92d36b8b 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