aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-10-25 12:52:37 +0300
committerEli Zaretskii2013-10-25 12:52:37 +0300
commitf67599d554a0b5f7c5ad50dbda61c20b98fcec49 (patch)
tree6e510b915d4606acfbcd7913026e46f7c04c69dd /src
parentfbfd0e1d751dd142064b9aaebbf71818d99ae5f1 (diff)
downloademacs-f67599d554a0b5f7c5ad50dbda61c20b98fcec49.tar.gz
emacs-f67599d554a0b5f7c5ad50dbda61c20b98fcec49.zip
Another fix for the MS-Windows build broken 4 revisions ago.
src/w32uniscribe.c (uniscribe_close): Adjust the argument list to the changed signature of the font driver's 'close' method.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/w32uniscribe.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3245eaa6d1e..52c025ad7aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12013-10-25 Eli Zaretskii <eliz@gnu.org> 12013-10-25 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32uniscribe.c (uniscribe_close): Adjust the argument list to
4 the changed signature of the font driver's 'close' method.
5
3 * w32font.h (w32font_close): Adjust the prototype to the change in 6 * w32font.h (w32font_close): Adjust the prototype to the change in
4 function definition. 7 function definition.
5 8
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index d8873dac383..fb3fbd0d607 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -135,7 +135,7 @@ uniscribe_open (struct frame *f, Lisp_Object font_entity, int pixel_size)
135} 135}
136 136
137static void 137static void
138uniscribe_close (struct frame *f, struct font *font) 138uniscribe_close (struct font *font)
139{ 139{
140 struct uniscribe_font_info *uniscribe_font 140 struct uniscribe_font_info *uniscribe_font
141 = (struct uniscribe_font_info *) font; 141 = (struct uniscribe_font_info *) font;