carbon2-commit: Remove the definition of Q_data from glyphs.c, fixing C++ build.

[Aidan Kehoe]

changeset:   5277:acc4a6c9f5f9
user:        Aidan Kehoe <kehoea at parhasard.net>
date:        Tue Jun 01 20:31:11 2010 +0100
files:       src/ChangeLog src/glyphs.c
description:
Remove the definition of Q_data from glyphs.c, fixing C++ build.

2010-06-01  Aidan Kehoe  <kehoea at parhasard.net>

	* glyphs.c (syms_of_glyphs):
	Remove the definition of Q_data from this file, now it's in
	general-slots.h. Problem picked up by a C++ build.


diff -r 18c0b5909d16 -r acc4a6c9f5f9 src/ChangeLog
--- a/src/ChangeLog	Mon May 31 16:47:44 2010 +0100
+++ b/src/ChangeLog	Tue Jun 01 20:31:11 2010 +0100
@@ -1,3 +1,9 @@
+2010-06-01  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* glyphs.c (syms_of_glyphs):
+	Remove the definition of Q_data from this file, now it's in
+	general-slots.h. Problem picked up by a C++ build.
+
 2010-05-31  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* rangetab.c (print_range_table, rangetab_instantiate)
diff -r 18c0b5909d16 -r acc4a6c9f5f9 src/glyphs.c
--- a/src/glyphs.c	Mon May 31 16:47:44 2010 +0100
+++ b/src/glyphs.c	Tue Jun 01 20:31:11 2010 +0100
@@ -82,7 +82,7 @@
 Lisp_Object Qwidget_image_instance_p;
 Lisp_Object Qconst_glyph_variable;
 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
-Lisp_Object Q_file, Q_data, Q_face, Q_pixel_width, Q_pixel_height;
+Lisp_Object Q_file, Q_face, Q_pixel_width, Q_pixel_height;
 Lisp_Object Qformatted_string;
 Lisp_Object Vcurrent_display_table;
 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;
@@ -5209,7 +5209,6 @@
   DEFSUBR (Fconsole_type_image_conversion_list);
 
   DEFKEYWORD (Q_file);
-  DEFKEYWORD (Q_data);
   DEFKEYWORD (Q_face);
   DEFKEYWORD (Q_pixel_height);
   DEFKEYWORD (Q_pixel_width);