diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-30 16:17:44 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-30 16:17:44 +0400 |
| commit | 9d7693d74c4ec73c01d03d990d552e1480ec2739 (patch) | |
| tree | 9b3862361d8d0ca7ca8456321e8eda3e4ac5c54c /src/composite.h | |
| parent | 112798c18dbbb095a34ace257767ae6f57643468 (diff) | |
| download | emacs-9d7693d74c4ec73c01d03d990d552e1480ec2739.tar.gz | |
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/composite.h')
| -rw-r--r-- | src/composite.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/composite.h b/src/composite.h index 53665b36bd1..df170093797 100644 --- a/src/composite.h +++ b/src/composite.h @@ -25,6 +25,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef EMACS_COMPOSITE_H #define EMACS_COMPOSITE_H +#include "font.h" + INLINE_HEADER_BEGIN #ifndef COMPOSITE_INLINE # define COMPOSITE_INLINE INLINE @@ -312,10 +314,6 @@ enum lglyph_indices #define LGLYPH_WADJUST(g) (VECTORP (LGLYPH_ADJUSTMENT (g)) \ ? XINT (AREF (LGLYPH_ADJUSTMENT (g), 2)) : 0) -struct composition_it; -struct face; -struct font_metrics; - extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t); extern Lisp_Object composition_gstring_from_id (ptrdiff_t); extern bool composition_gstring_p (Lisp_Object); |