diff options
| author | Paul Eggert | 2013-09-20 08:34:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-09-20 08:34:36 -0700 |
| commit | 00382e8b9834e58203507d0461884671b78ebc01 (patch) | |
| tree | cf28670199af0c1189cbcfbd14ffa49cbaaa0fba /src/keyboard.h | |
| parent | 2fd3a9f7491a59d427150fab0ad4df6ea12b3249 (diff) | |
| download | emacs-00382e8b9834e58203507d0461884671b78ebc01.tar.gz emacs-00382e8b9834e58203507d0461884671b78ebc01.zip | |
A simpler, centralized INLINE.
* lib-src/profile.c (INLINE): New macro.
(SYSTIME_INLINE): Remove.
* src/conf_post.h (INLINE): Define only if not already defined.
This allows us to use a single INLINE, defined by one file
per executable.
* src/emacs.c (INLINE): Define it.
Also, include category.h, charset.h, composite.h, dispextern.h,
syntax.h, systime.h, so that their INLINE definitions are expanded
properly for Emacs.
* src/blockinput.h, src/keyboard.c (BLOCKINPUT_INLINE):
* src/buffer.h, src/buffer.c (BUFFER_INLINE):
* src/category.h, src/category.c (CATEGORY_INLINE):
* src/character.h, src/character.c (CHARACTER_INLINE):
* src/charset.h, src/charset.c (CHARSET_INLINE):
* src/composite.h, src/composite.c (COMPOSITE_INLINE):
* src/dispextern.h, src/dispnew.c (DISPEXTERN_INLINE):
* src/frame.h, src/frame.c (FRAME_INLINE):
* src/intervals.h, src/intervals.c (INTERVALS_INLINE):
* src/keyboard.h, src/keyboard.c (KEYBOARD_INLINE):
* src/lisp.h, src/alloc.c (LISP_INLINE):
* src/process.h, src/process.c (PROCESS_INLINE):
* src/syntax.h, src/syntax.c (SYNTAX_INLINE):
* src/systime.h, src/sysdep.c (SYSTIME_INLINE):
* src/termhooks.h, src/terminal.h (TERMHOOKS_INLINE):
* src/window.h, src/window.c (WINDOW_INLINE):
Remove. All uses replaced with INLINE.
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 1ee4a97c5c5..49f87b20a43 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -22,9 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 22 | #include "termhooks.h" | 22 | #include "termhooks.h" |
| 23 | 23 | ||
| 24 | INLINE_HEADER_BEGIN | 24 | INLINE_HEADER_BEGIN |
| 25 | #ifndef KEYBOARD_INLINE | ||
| 26 | # define KEYBOARD_INLINE INLINE | ||
| 27 | #endif | ||
| 28 | 25 | ||
| 29 | /* Most code should use this macro to access Lisp fields in struct kboard. */ | 26 | /* Most code should use this macro to access Lisp fields in struct kboard. */ |
| 30 | 27 | ||
| @@ -179,42 +176,42 @@ struct kboard | |||
| 179 | ptrdiff_t echo_after_prompt; | 176 | ptrdiff_t echo_after_prompt; |
| 180 | }; | 177 | }; |
| 181 | 178 | ||
| 182 | KEYBOARD_INLINE void | 179 | INLINE void |
| 183 | kset_default_minibuffer_frame (struct kboard *kb, Lisp_Object val) | 180 | kset_default_minibuffer_frame (struct kboard *kb, Lisp_Object val) |
| 184 | { | 181 | { |
| 185 | kb->INTERNAL_FIELD (Vdefault_minibuffer_frame) = val; | 182 | kb->INTERNAL_FIELD (Vdefault_minibuffer_frame) = val; |
| 186 | } | 183 | } |
| 187 | KEYBOARD_INLINE void | 184 | INLINE void |
| 188 | kset_defining_kbd_macro (struct kboard *kb, Lisp_Object val) | 185 | kset_defining_kbd_macro (struct kboard *kb, Lisp_Object val) |
| 189 | { | 186 | { |
| 190 | kb->INTERNAL_FIELD (defining_kbd_macro) = val; | 187 | kb->INTERNAL_FIELD (defining_kbd_macro) = val; |
| 191 | } | 188 | } |
| 192 | KEYBOARD_INLINE void | 189 | INLINE void |
| 193 | kset_input_decode_map (struct kboard *kb, Lisp_Object val) | 190 | kset_input_decode_map (struct kboard *kb, Lisp_Object val) |
| 194 | { | 191 | { |
| 195 | kb->INTERNAL_FIELD (Vinput_decode_map) = val; | 192 | kb->INTERNAL_FIELD (Vinput_decode_map) = val; |
| 196 | } | 193 | } |
| 197 | KEYBOARD_INLINE void | 194 | INLINE void |
| 198 | kset_last_command (struct kboard *kb, Lisp_Object val) | 195 | kset_last_command (struct kboard *kb, Lisp_Object val) |
| 199 | { | 196 | { |
| 200 | kb->INTERNAL_FIELD (Vlast_command) = val; | 197 | kb->INTERNAL_FIELD (Vlast_command) = val; |
| 201 | } | 198 | } |
| 202 | KEYBOARD_INLINE void | 199 | INLINE void |
| 203 | kset_last_kbd_macro (struct kboard *kb, Lisp_Object val) | 200 | kset_last_kbd_macro (struct kboard *kb, Lisp_Object val) |
| 204 | { | 201 | { |
| 205 | kb->INTERNAL_FIELD (Vlast_kbd_macro) = val; | 202 | kb->INTERNAL_FIELD (Vlast_kbd_macro) = val; |
| 206 | } | 203 | } |
| 207 | KEYBOARD_INLINE void | 204 | INLINE void |
| 208 | kset_prefix_arg (struct kboard *kb, Lisp_Object val) | 205 | kset_prefix_arg (struct kboard *kb, Lisp_Object val) |
| 209 | { | 206 | { |
| 210 | kb->INTERNAL_FIELD (Vprefix_arg) = val; | 207 | kb->INTERNAL_FIELD (Vprefix_arg) = val; |
| 211 | } | 208 | } |
| 212 | KEYBOARD_INLINE void | 209 | INLINE void |
| 213 | kset_system_key_alist (struct kboard *kb, Lisp_Object val) | 210 | kset_system_key_alist (struct kboard *kb, Lisp_Object val) |
| 214 | { | 211 | { |
| 215 | kb->INTERNAL_FIELD (Vsystem_key_alist) = val; | 212 | kb->INTERNAL_FIELD (Vsystem_key_alist) = val; |
| 216 | } | 213 | } |
| 217 | KEYBOARD_INLINE void | 214 | INLINE void |
| 218 | kset_window_system (struct kboard *kb, Lisp_Object val) | 215 | kset_window_system (struct kboard *kb, Lisp_Object val) |
| 219 | { | 216 | { |
| 220 | kb->INTERNAL_FIELD (Vwindow_system) = val; | 217 | kb->INTERNAL_FIELD (Vwindow_system) = val; |