diff options
| author | Paul Eggert | 2016-12-12 14:27:35 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-12 14:27:35 -0800 |
| commit | a41ded87b318ce3cbeb0ba3624bcb83ae3b8a437 (patch) | |
| tree | 02ae5860fd214689f9397c5d4a04dd71b524c3ac /src/xftfont.c | |
| parent | 3c655230d2517d091d6af9835031cbc5d665dccb (diff) | |
| download | emacs-a41ded87b318ce3cbeb0ba3624bcb83ae3b8a437.tar.gz emacs-a41ded87b318ce3cbeb0ba3624bcb83ae3b8a437.zip | |
Use C99 syntax for font drivers
Problem reported by Daniel Colascione in:
http://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00515.html
* src/ftcrfont.c (ftcrfont_driver):
* src/ftfont.c (ftfont_driver):
* src/ftxfont.c (ftxfont_driver):
* src/macfont.m (macfont_driver):
* src/nsfont.m (nsfont_driver):
* src/xfont.c (xfont_driver):
* src/xftfont.c (xftfont_driver):
Use C99 syntax, not the old GNU C syntax.
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 74f5ec66e74..7f0e3c6ceb5 100644 --- a/src/xftfont.c +++ b/src/xftfont.c | |||
| @@ -752,35 +752,35 @@ xftfont_cached_font_ok (struct frame *f, Lisp_Object font_object, | |||
| 752 | struct font_driver const xftfont_driver = | 752 | struct font_driver const xftfont_driver = |
| 753 | { | 753 | { |
| 754 | /* We can't draw a text without device dependent functions. */ | 754 | /* We can't draw a text without device dependent functions. */ |
| 755 | type: LISPSYM_INITIALLY (Qxft), | 755 | .type = LISPSYM_INITIALLY (Qxft), |
| 756 | get_cache: xfont_get_cache, | 756 | .get_cache = xfont_get_cache, |
| 757 | list: xftfont_list, | 757 | .list = xftfont_list, |
| 758 | match: xftfont_match, | 758 | .match = xftfont_match, |
| 759 | list_family: ftfont_list_family, | 759 | .list_family = ftfont_list_family, |
| 760 | open: xftfont_open, | 760 | .open = xftfont_open, |
| 761 | close: xftfont_close, | 761 | .close = xftfont_close, |
| 762 | prepare_face: xftfont_prepare_face, | 762 | .prepare_face = xftfont_prepare_face, |
| 763 | done_face: xftfont_done_face, | 763 | .done_face = xftfont_done_face, |
| 764 | has_char: xftfont_has_char, | 764 | .has_char = xftfont_has_char, |
| 765 | encode_char: xftfont_encode_char, | 765 | .encode_char = xftfont_encode_char, |
| 766 | text_extents: xftfont_text_extents, | 766 | .text_extents = xftfont_text_extents, |
| 767 | draw: xftfont_draw, | 767 | .draw = xftfont_draw, |
| 768 | get_bitmap: ftfont_get_bitmap, | 768 | .get_bitmap = ftfont_get_bitmap, |
| 769 | anchor_point: ftfont_anchor_point, | 769 | .anchor_point = ftfont_anchor_point, |
| 770 | #ifdef HAVE_LIBOTF | 770 | #ifdef HAVE_LIBOTF |
| 771 | otf_capability: ftfont_otf_capability, | 771 | .otf_capability = ftfont_otf_capability, |
| 772 | #endif | 772 | #endif |
| 773 | end_for_frame: xftfont_end_for_frame, | 773 | .end_for_frame = xftfont_end_for_frame, |
| 774 | #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF | 774 | #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF |
| 775 | shape: xftfont_shape, | 775 | .shape = xftfont_shape, |
| 776 | #endif | 776 | #endif |
| 777 | #ifdef HAVE_OTF_GET_VARIATION_GLYPHS | 777 | #ifdef HAVE_OTF_GET_VARIATION_GLYPHS |
| 778 | get_variation_glyphs: ftfont_variation_glyphs, | 778 | .get_variation_glyphs = ftfont_variation_glyphs, |
| 779 | #endif | 779 | #endif |
| 780 | filter_properties: ftfont_filter_properties, | 780 | .filter_properties = ftfont_filter_properties, |
| 781 | cached_font_ok: xftfont_cached_font_ok, | 781 | .cached_font_ok = xftfont_cached_font_ok, |
| 782 | combining_capability: ftfont_combining_capability, | 782 | .combining_capability = ftfont_combining_capability, |
| 783 | drop_xrender_surfaces: xftfont_drop_xrender_surfaces, | 783 | .drop_xrender_surfaces = xftfont_drop_xrender_surfaces, |
| 784 | }; | 784 | }; |
| 785 | 785 | ||
| 786 | void | 786 | void |