aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2014-12-12 17:51:03 -0800
committerPaul Eggert2014-12-12 17:54:02 -0800
commit7fc616afcfbaebea1658149da269110da94d6e59 (patch)
treefdf883b06477996b4705ebe64fa08795fa3e9715 /admin
parent67a48edb27172ae78182b13edf18789c2c79b7ac (diff)
downloademacs-7fc616afcfbaebea1658149da269110da94d6e59.tar.gz
emacs-7fc616afcfbaebea1658149da269110da94d6e59.zip
Replace union hack with C11-style max_align_t
* admin/merge-gnulib (GNULIB_MODULES): Add stddef, for max_align_t. * lib/gnulib.mk: Regenerate. * src/alloc.c (XMALLOC_BASE_ALIGNMENT): Use max_align_t instead of a hack involving a union.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index dc3cd6cf541..64514f79bdd 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -35,7 +35,7 @@ GNULIB_MODULES='
35 intprops largefile lstat 35 intprops largefile lstat
36 manywarnings memrchr mkostemp mktime 36 manywarnings memrchr mkostemp mktime
37 pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat 37 pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
38 sig2str socklen stat-time stdalign stdio 38 sig2str socklen stat-time stdalign stddef stdio
39 strftime strtoimax strtoumax symlink sys_stat 39 strftime strtoimax strtoumax symlink sys_stat
40 sys_time time time_r timer-time timespec-add timespec-sub 40 sys_time time time_r timer-time timespec-add timespec-sub
41 unsetenv update-copyright utimens 41 unsetenv update-copyright utimens