diff options
| author | YAMAMOTO Mitsuharu | 2019-05-02 09:33:01 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-02 09:33:01 +0900 |
| commit | 27511b9821d3a4d3dcb7d8bf50c37d1a46247362 (patch) | |
| tree | a5232127cee70a296a7ef5fc6ba66eb5da1d9c78 /src | |
| parent | 886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28 (diff) | |
| download | emacs-27511b9821d3a4d3dcb7d8bf50c37d1a46247362.tar.gz emacs-27511b9821d3a4d3dcb7d8bf50c37d1a46247362.zip | |
Fix NS build
* src/macfont.m: Fix prototype of macfont_shape.
(mac_font_shape): Fix type of 5th argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfont.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfont.m b/src/macfont.m index 6cefd00d74c..8fcbd50fe33 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -1650,7 +1650,7 @@ static unsigned macfont_encode_char (struct font *, int); | |||
| 1650 | static void macfont_text_extents (struct font *, unsigned int *, int, | 1650 | static void macfont_text_extents (struct font *, unsigned int *, int, |
| 1651 | struct font_metrics *); | 1651 | struct font_metrics *); |
| 1652 | static int macfont_draw (struct glyph_string *, int, int, int, int, bool); | 1652 | static int macfont_draw (struct glyph_string *, int, int, int, int, bool); |
| 1653 | static Lisp_Object macfont_shape (Lisp_Object); | 1653 | static Lisp_Object macfont_shape (Lisp_Object, Lisp_Object); |
| 1654 | static int macfont_variation_glyphs (struct font *, int c, | 1654 | static int macfont_variation_glyphs (struct font *, int c, |
| 1655 | unsigned variations[256]); | 1655 | unsigned variations[256]); |
| 1656 | static void macfont_filter_properties (Lisp_Object, Lisp_Object); | 1656 | static void macfont_filter_properties (Lisp_Object, Lisp_Object); |
| @@ -3666,7 +3666,7 @@ mac_font_create_line_with_string_and_font (CFStringRef string, | |||
| 3666 | static CFIndex | 3666 | static CFIndex |
| 3667 | mac_font_shape (CTFontRef font, CFStringRef string, | 3667 | mac_font_shape (CTFontRef font, CFStringRef string, |
| 3668 | struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len, | 3668 | struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len, |
| 3669 | lgstring_direction dir) | 3669 | enum lgstring_direction dir) |
| 3670 | { | 3670 | { |
| 3671 | CFIndex used, result = 0; | 3671 | CFIndex used, result = 0; |
| 3672 | CTLineRef ctline = mac_font_create_line_with_string_and_font (string, font); | 3672 | CTLineRef ctline = mac_font_create_line_with_string_and_font (string, font); |