summaryrefslogtreecommitdiff
path: root/src/keyboard.h
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-08-30 16:17:44 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-08-30 16:17:44 +0400
commit9d7693d74c4ec73c01d03d990d552e1480ec2739 (patch)
tree9b3862361d8d0ca7ca8456321e8eda3e4ac5c54c /src/keyboard.h
parent112798c18dbbb095a34ace257767ae6f57643468 (diff)
downloademacs-9d7693d74c4ec73c01d03d990d552e1480ec2739.tar.gz
emacs-9d7693d74c4ec73c01d03d990d552e1480ec2739.tar.bz2
emacs-9d7693d74c4ec73c01d03d990d552e1480ec2739.zip
Minor cleanup to avoid forward declarations.
* coding.h (struct ccl_spec): Remove forward declaration. * composite.h (toplevel): Include font.h. (struct composition_it, struct face, struct font_metrics): Remove forward declaration. * dispextern.h (struct image, struct atimer): Likewise. * emacsgtkfixed.h (struct frame): Likewise. * emacsgtkfixed.c (toplevel): Reorder headers and drop stdio.h. * font.h (struct font_driver, struct font, struct glyph_string) (struct face): Remove forward declaration. * fontset.h (struct face, struct font): Likewise. * frame.h (toplevel): Style cleanup. (enum output_method): Move to... * termhooks.h (enum output_method): ...here. (struct glyph, struct frame, struct ns_display_info) (struct x_display_info, struct w32_display_info): Remove forward declaration. * xterm.h (toplevel): Include termhooks.h. (struct font, struct window, struct glyph_matrix, struct frame) (struct input_event, struct face, struct image): Remove forward declaration. * gtkutil.h (struct _widget_value): Likewise. * keyboard.h (toplevel): Include termhooks.h. (struct input_event): Remove forward declaration.
Diffstat (limited to 'src/keyboard.h')
-rw-r--r--src/keyboard.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/keyboard.h b/src/keyboard.h
index 0953f1b7cfd..1ee4a97c5c5 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -19,6 +19,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "systime.h" /* for struct timespec, Time */
#include "coding.h" /* for ENCODE_UTF_8 and ENCODE_SYSTEM */
+#include "termhooks.h"
INLINE_HEADER_BEGIN
#ifndef KEYBOARD_INLINE
@@ -477,9 +478,6 @@ extern bool ignore_mouse_drag_p;
/* The primary selection. */
extern Lisp_Object QPRIMARY;
-/* Forward declaration for prototypes. */
-struct input_event;
-
extern Lisp_Object parse_modifiers (Lisp_Object);
extern Lisp_Object reorder_modifiers (Lisp_Object);
extern Lisp_Object read_char (int, Lisp_Object, Lisp_Object,