# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1077222294 0
# Node ID 16821fe4a0bf13b451bf668a056e400f617d0b24
# Parent  326f995edc57a763f65c72ea48ccd3f1a2ddafa8
(union Lisp_Object): Give a more precise type for `type'.
Remove unused `gu' alternative.

diff -r 326f995edc57 -r 16821fe4a0bf src/ChangeLog
--- a/src/ChangeLog	Thu Feb 19 19:36:36 2004 +0000
+++ b/src/ChangeLog	Thu Feb 19 20:24:54 2004 +0000
@@ -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 -r 326f995edc57 -r 16821fe4a0bf src/lisp.h
--- a/src/lisp.h	Thu Feb 19 19:36:36 2004 +0000
+++ b/src/lisp.h	Thu Feb 19 20:24:54 2004 +0000
@@ -178,18 +178,13 @@
     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 @@
 
     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;