mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Merge from trunk.

Browse Source
This commit is contained in:
Paul Eggert 2012-04-15 17:35:58 -07:00
commit 8dcd9adf66
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2012-04-16 Paul Eggert <eggert@cs.ucla.edu>
* alloc.c (which_symbols): Fix alignment issue / type clash.
2012-04-15 Andreas Schwab <schwab@linux-m68k.org> 2012-04-15 Andreas Schwab <schwab@linux-m68k.org>
* lisp.h (struct Lisp_Symbol): Remove explicit padding. * lisp.h (struct Lisp_Symbol): Remove explicit padding.

5
src/alloc.c
View File

@ -6320,11 +6320,12 @@ which_symbols (Lisp_Object obj, EMACS_INT find_max)
{ {
for (sblk = symbol_block; sblk; sblk = sblk->next) for (sblk = symbol_block; sblk; sblk = sblk->next)
{ {
struct Lisp_Symbol *sym = sblk->symbols; union aligned_Lisp_Symbol *aligned_sym = sblk->symbols;
int bn; 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 val;
Lisp_Object tem; Lisp_Object tem;