remove documentation-string reading hack

[bpt/emacs.git] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index b3ea5cd..f01ae32 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,5 +1,5 @@
 /* Header for composite sequence handler.
-   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
@@ -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;
@@ -112,7 +112,7 @@ composition_registered_p (Lisp_Object prop)
     gref = (rule_code) / 12;                                           \
     if (gref > 12) gref = 11;                                          \
     nref = (rule_code) % 12;                                           \
-  } while (0)
+  } while (false)
 
 /* Like COMPOSITION_DECODE_REFS (RULE_CODE, GREF, NREF), but also
    decode RULE_CODE into XOFF and YOFF (vertical offset).  */
@@ -122,7 +122,7 @@ composition_registered_p (Lisp_Object prop)
     xoff = (rule_code) >> 16;                                          \
     yoff = ((rule_code) >> 8) & 0xFF;                                  \
     COMPOSITION_DECODE_REFS (rule_code, gref, nref);                   \
-  } while (0)
+  } while (false)
 
 /* Nonzero if the global reference point GREF and new reference point NREF are
    valid.  */