Mercurial > hg > xemacs-beta
changeset 5223:acc4a6c9f5f9
Remove the definition of Q_data from glyphs.c, fixing C++ build.
2010-06-01 Aidan Kehoe <kehoea@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.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 01 Jun 2010 20:31:11 +0100 |
| parents | 18c0b5909d16 |
| children | 35c2b7e9c03f |
| files | src/ChangeLog src/glyphs.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@parhasard.net> * rangetab.c (print_range_table, rangetab_instantiate)
--- 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);