diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-24 10:43:20 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-24 10:43:20 +0400 |
| commit | d6d9cbc15cbebfe466756a7a75601173c15287a2 (patch) | |
| tree | 2f3e5223e8f8d637dc9c3c152929b879748b7918 /src/composite.h | |
| parent | ec7bc82f9c63b6ec533f7489e67b1c1b18d08dd5 (diff) | |
| download | emacs-d6d9cbc15cbebfe466756a7a75601173c15287a2.tar.gz | |
Use union for the payload of struct Lisp_Vector.
This helps to avoid a few glitches dictated by C's aliasing rules.
* lisp.h (struct Lisp_Vector): Use union for next and
contents member. Adjust comment. Change related users.
* alloc.c (next_in_free_list, set_next_in_free_list): Remove.
Related users changed.
* buffer.c, bytecode.c, ccl.c, character.h, chartab.c, composite.c:
* composite.h, disptab.h, fns.c, fontset.c, indent.c, keyboard.c:
* lread.c, msdos.c, process.c, w32menu.c, window.c, xdisp.c:
* xfaces.c, xfont.c, xmenu.c: Related users changed.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/composite.h b/src/composite.h index 9026d03f7b6..b3ea5cd1ed8 100644 --- a/src/composite.h +++ b/src/composite.h @@ -88,8 +88,8 @@ composition_registered_p (Lisp_Object prop) #define COMPOSITION_GLYPH(cmp, n) \ XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ ->key_and_value) \ - ->contents[cmp->hash_index * 2]) \ - ->contents[cmp->method == COMPOSITION_WITH_RULE_ALTCHARS \ + ->u.contents[cmp->hash_index * 2]) \ + ->u.contents[cmp->method == COMPOSITION_WITH_RULE_ALTCHARS \ ? (n) * 2 : (n)]) /* Return the encoded composition rule to compose the Nth glyph of @@ -98,8 +98,8 @@ composition_registered_p (Lisp_Object prop) #define COMPOSITION_RULE(cmp, n) \ XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ ->key_and_value) \ - ->contents[cmp->hash_index * 2]) \ - ->contents[(n) * 2 - 1]) + ->u.contents[cmp->hash_index * 2]) \ + ->u.contents[(n) * 2 - 1]) /* Decode encoded composition rule RULE_CODE into GREF (global reference point code), NREF (new ref. point code). Don't check RULE_CODE; |