diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-03 07:29:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-03 07:29:03 +0400 |
| commit | a10c82694e253f891cdfa220ba75b59f5ed50ab3 (patch) | |
| tree | 3dcdc0400f8fa190ac1e2408c38bb2b4e82f52ff /src/nsfont.m | |
| parent | 0372256bed8f8c1372579001ba42b21dbe5d2adb (diff) | |
| download | emacs-a10c82694e253f891cdfa220ba75b59f5ed50ab3.tar.gz emacs-a10c82694e253f891cdfa220ba75b59f5ed50ab3.tar.bz2 emacs-a10c82694e253f891cdfa220ba75b59f5ed50ab3.zip | |
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/nsfont.m')
| -rw-r--r-- | src/nsfont.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index 26a80624f7c..ad169d7ddae 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -619,13 +619,13 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch) ========================================================================== */ -static Lisp_Object nsfont_get_cache (FRAME_PTR frame); +static Lisp_Object nsfont_get_cache (struct frame *frame); static Lisp_Object nsfont_list (struct frame *, Lisp_Object); static Lisp_Object nsfont_match (struct frame *, Lisp_Object); static Lisp_Object nsfont_list_family (struct frame *); -static Lisp_Object nsfont_open (FRAME_PTR f, Lisp_Object font_entity, +static Lisp_Object nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size); -static void nsfont_close (FRAME_PTR f, struct font *font); +static void nsfont_close (struct frame *f, struct font *font); static int nsfont_has_char (Lisp_Object entity, int c); static unsigned int nsfont_encode_char (struct font *font, int c); static int nsfont_text_extents (struct font *font, unsigned int *code, @@ -659,7 +659,7 @@ struct font_driver nsfont_driver = /* Return a cache of font-entities on FRAME. The cache must be a cons whose cdr part is the actual cache area. */ static Lisp_Object -nsfont_get_cache (FRAME_PTR frame) +nsfont_get_cache (struct frame *frame) { Display_Info *dpyinfo = FRAME_NS_DISPLAY_INFO (frame); return (dpyinfo->name_list_element); @@ -724,7 +724,7 @@ nsfont_list_family (struct frame *f) /* Open a font specified by FONT_ENTITY on frame F. If the font is scalable, open it with PIXEL_SIZE. */ static Lisp_Object -nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) +nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size) { BOOL synthItal; unsigned int traits = 0; @@ -931,7 +931,7 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) /* Close FONT on frame F. */ static void -nsfont_close (FRAME_PTR f, struct font *font) +nsfont_close (struct frame *f, struct font *font) { struct nsfont_info *font_info = (struct nsfont_info *)font; int i; |