diff options
| author | Dmitry Antipov <[email protected]> | 2013-08-03 07:29:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov <[email protected]> | 2013-08-03 07:29:03 +0400 |
| commit | a10c82694e253f891cdfa220ba75b59f5ed50ab3 (patch) | |
| tree | 3dcdc0400f8fa190ac1e2408c38bb2b4e82f52ff /src/ftfont.c | |
| parent | 0372256bed8f8c1372579001ba42b21dbe5d2adb (diff) | |
Drop FRAME_PTR typedef.
* composite.c, font.c, font.h, fontset.c, fontset.h, frame.c, frame.h:
* ftfont.c, ftxfont.c, gtkutil.c, gtkutil.h, image.c, keyboard.c:
* menu.c, menu.h, msdos.c, nsfns.m, nsfont.m, nsmenu.m, nsterm.h:
* nsterm.m, scroll.c, term.c, w32fns.c, w32font.c, w32font.h:
* w32inevt.c, w32inevt.h, w32menu.c, w32notify.c, w32term.c, w32term.h:
* w32uniscribe.c, w32xfns.c, widget.c, window.c, xdisp.c, xfaces.c:
* xfns.c, xfont.c, xftfont.c, xmenu.c, xselect.c, xterm.c:
All related users changed.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 14896e3f66..3636f86f5c 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -493,12 +493,12 @@ ftfont_get_otf (struct ftfont_info *ftfont_info) } #endif /* HAVE_LIBOTF */ -static Lisp_Object ftfont_get_cache (FRAME_PTR); +static Lisp_Object ftfont_get_cache (struct frame *); static Lisp_Object ftfont_list (struct frame *, Lisp_Object); static Lisp_Object ftfont_match (struct frame *, Lisp_Object); static Lisp_Object ftfont_list_family (struct frame *); -static Lisp_Object ftfont_open (FRAME_PTR, Lisp_Object, int); -static void ftfont_close (FRAME_PTR, struct font *); +static Lisp_Object ftfont_open (struct frame *, Lisp_Object, int); +static void ftfont_close (struct frame *, struct font *); static int ftfont_has_char (Lisp_Object, int); static unsigned ftfont_encode_char (struct font *, int); static int ftfont_text_extents (struct font *, unsigned *, int, @@ -568,7 +568,7 @@ struct font_driver ftfont_driver = }; static Lisp_Object -ftfont_get_cache (FRAME_PTR f) +ftfont_get_cache (struct frame *f) { return freetype_font_cache; } @@ -1173,7 +1173,7 @@ ftfont_list_family (struct frame *f) static Lisp_Object -ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) +ftfont_open (struct frame *f, Lisp_Object entity, int pixel_size) { struct ftfont_info *ftfont_info; struct font *font; @@ -1317,7 +1317,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) } static void -ftfont_close (FRAME_PTR f, struct font *font) +ftfont_close (struct frame *f, struct font *font) { struct ftfont_info *ftfont_info = (struct ftfont_info *) font; Lisp_Object val, cache; |