aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorEli Zaretskii2012-07-27 12:24:34 +0300
committerEli Zaretskii2012-07-27 12:24:34 +0300
commit3438fe218c77633ee2c5f106e3a335f906347247 (patch)
tree4b7cfbb14dbf83c94541eb4b69b673bc6ec73099 /src/keymap.c
parent0000d0d54bb9cbc835172d9f5f8ff7595786af62 (diff)
downloademacs-3438fe218c77633ee2c5f106e3a335f906347247.tar.gz
emacs-3438fe218c77633ee2c5f106e3a335f906347247.zip
Fix failure to compile on Windows due to 2012-07-27T06:04:35Z!dmantipov@yandex.ru.
src/lisp.h (enum constype): Use CONSTYPE_HEAP and CONSTYPE_PURE for enumeration constants, as PURE and HEAP are too general, and clash with other headers and sources, such as gmalloc.c and the MS-Windows system headers. All users changed.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c
index d86a4cd74de..6cc76700542 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3702,7 +3702,7 @@ syms_of_keymap (void)
3702 Fset (intern_c_string ("ctl-x-map"), control_x_map); 3702 Fset (intern_c_string ("ctl-x-map"), control_x_map);
3703 Ffset (intern_c_string ("Control-X-prefix"), control_x_map); 3703 Ffset (intern_c_string ("Control-X-prefix"), control_x_map);
3704 3704
3705 exclude_keys = listn (PURE, 5, 3705 exclude_keys = listn (CONSTYPE_PURE, 5,
3706 pure_cons (build_pure_c_string ("DEL"), build_pure_c_string ("\\d")), 3706 pure_cons (build_pure_c_string ("DEL"), build_pure_c_string ("\\d")),
3707 pure_cons (build_pure_c_string ("TAB"), build_pure_c_string ("\\t")), 3707 pure_cons (build_pure_c_string ("TAB"), build_pure_c_string ("\\t")),
3708 pure_cons (build_pure_c_string ("RET"), build_pure_c_string ("\\r")), 3708 pure_cons (build_pure_c_string ("RET"), build_pure_c_string ("\\r")),
@@ -3760,7 +3760,7 @@ be preferred. */);
3760 where_is_preferred_modifier = 0; 3760 where_is_preferred_modifier = 0;
3761 3761
3762 staticpro (&Vmouse_events); 3762 staticpro (&Vmouse_events);
3763 Vmouse_events = listn (PURE, 9, 3763 Vmouse_events = listn (CONSTYPE_PURE, 9,
3764 intern_c_string ("menu-bar"), 3764 intern_c_string ("menu-bar"),
3765 intern_c_string ("tool-bar"), 3765 intern_c_string ("tool-bar"),
3766 intern_c_string ("header-line"), 3766 intern_c_string ("header-line"),