(union Lisp_Object): Give a more precise type for `type'.

Remove unused `gu' alternative.

2 files changed, 13 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d2a88c1dfe..508da2fe482 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (union Lisp_Object): Give a more precise type for `type'.
+        Remove unused `gu' alternative.
+
 2004-02-19  Andreas Schwab  <schwab@suse.de>
 
         * fringe.c (Fdefine_fringe_bitmap): Use && instead of & to avoid
@@ -49,9 +54,9 @@
 
 2004-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * data.c (Fbyteorder): 
-        * fringe.c (Fdefine_fringe_bitmap): 
-        * xdisp.c (handle_single_display_prop): 
+        * data.c (Fbyteorder):
+        * fringe.c (Fdefine_fringe_bitmap):
+        * xdisp.c (handle_single_display_prop):
         * xselect.c (x_handle_dnd_message): Lisp_Object/int mixup.
 
 2004-02-16  Jason Rumney  <jasonr@gnu.org>
@@ -64,7 +69,7 @@
         controlling emulation of a three button mouse with option and
         command keys.
         (Qreverse, mac_get_enumlated_btn): Handle the emulation
-        (mac_event_to_emacs_modifiers, XTread_socket): Ditto
+        (mac_event_to_emacs_modifiers, XTread_socket): Ditto.
 
 2004-02-15  Kim F. Storm  <storm@cua.dk>
 
diff --git a/src/lisp.h b/src/lisp.h
index 6137182847f..c9eb714be18 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -178,18 +178,13 @@ union Lisp_Object
     struct
       {
         EMACS_INT val  : VALBITS;
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
       } s;
     struct
       {
         EMACS_UINT val : VALBITS;
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
       } u;
-    struct
-      {
-        EMACS_UINT val          : VALBITS;
-        enum Lisp_Type type     : GCTYPEBITS;
-      } gu;
   }
 Lisp_Object;
 
@@ -204,19 +199,14 @@ union Lisp_Object
 
     struct
       {
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
         EMACS_INT val  : VALBITS;
       } s;
     struct
       {
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
         EMACS_UINT val : VALBITS;
       } u;
-    struct
-      {
-        enum Lisp_Type type     : GCTYPEBITS;
-        EMACS_UINT val          : VALBITS;
-      } gu;
   }
 Lisp_Object;