* font.c (font_close_object): Check for live frame (Bug#16128).

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index b3ea5cd1ed83d85661004a88f9683d3aaf9ac833..9026d03f7b6d6db2caf3ad176e0fc2f1e67c4ea8 100644 (file)
--- 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)                              \
-                ->u.contents[cmp->hash_index * 2])                     \
-       ->u.contents[cmp->method == COMPOSITION_WITH_RULE_ALTCHARS      \
+                ->contents[cmp->hash_index * 2])                       \
+       ->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)                      \
-                ->u.contents[cmp->hash_index * 2])             \
-       ->u.contents[(n) * 2 - 1])
+                ->contents[cmp->hash_index * 2])               \
+       ->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;