(struct face): Move lface and hash from the middle

of bitfields.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2cdf55d9cf4e631f373561284f5c8e3e0ec015d7..46d35f7f7631d9e55acd80e09e7d2ea3ba78bccd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-12-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * dispextern.h (struct face): Move lface and hash from the middle
+       of bitfields.
+
        * Makefile.in (INTERVALS_H): Rename from INTERVAL_SRC, update all users.
 
 2008-12-29  Dan Nicolaescu  <dann@ics.uci.edu>

diff --git a/src/dispextern.h b/src/dispextern.h
index ef66006cc0891749aa4ee992142909f4dc6e1a8d..4c6d20c2ede8c03e4045a2d41500abc4059c7dd4 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1524,13 +1524,6 @@ struct face
      drawing shadows.  */
   unsigned use_box_color_for_shadows_p : 1;
 
-  /* The Lisp face attributes this face realizes.  All attributes
-     in this vector are non-nil.  */
-  Lisp_Object lface[LFACE_VECTOR_SIZE];
-
-  /* The hash value of this face.  */
-  unsigned hash;
-
   /* Non-zero if text in this face should be underlined, overlined,
      strike-through or have a box drawn around it.  */
   unsigned underline_p : 1;
@@ -1580,6 +1573,13 @@ struct face
   unsigned synth_ital : 1;
 #endif
 
+  /* The Lisp face attributes this face realizes.  All attributes
+     in this vector are non-nil.  */
+  Lisp_Object lface[LFACE_VECTOR_SIZE];
+
+  /* The hash value of this face.  */
+  unsigned hash;
+
   /* Next and previous face in hash collision list of face cache.  */
   struct face *next, *prev;