Merge from trunk.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 7f78619407d..0e68817629c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6320,11 +6320,12 @@ which_symbols (Lisp_Object obj, EMACS_INT find_max)
      {
        for (sblk = symbol_block; sblk; sblk = sblk->next)
          {
-           struct Lisp_Symbol *sym = sblk->symbols;
+           union aligned_Lisp_Symbol *aligned_sym = sblk->symbols;
            int bn;
 
-           for (bn = 0; bn < SYMBOL_BLOCK_SIZE; bn++, sym++)
+           for (bn = 0; bn < SYMBOL_BLOCK_SIZE; bn++, aligned_sym++)
              {
+               struct Lisp_Symbol *sym = &aligned_sym->s;
                Lisp_Object val;
                Lisp_Object tem;