Mercurial > hg > xemacs-beta

comparison src/objects-msw.c @ 4982:3c3c1d139863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children 2eec7322eb7f d95c102a96d3
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
1374 static void 1374 static void
1375 mswindows_finalize_color_instance (Lisp_Color_Instance *c) 1375 mswindows_finalize_color_instance (Lisp_Color_Instance *c)
1376 { 1376 {
1377 if (c->data) 1377 if (c->data)
1378 { 1378 {
1379 xfree (c->data, void *); 1379 xfree (c->data);
1380 c->data = 0; 1380 c->data = 0;
1381 } 1381 }
1382 } 1382 }
1383 1383
1384 static int 1384 static int
1902 if (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != NULL 1902 if (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != NULL
1903 && FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != MSWINDOWS_BAD_HFONT) 1903 && FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != MSWINDOWS_BAD_HFONT)
1904 DeleteObject (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i)); 1904 DeleteObject (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i));
1905 } 1905 }
1906 1906
1907 xfree (f->data, void *); 1907 xfree (f->data);
1908 f->data = 0; 1908 f->data = 0;
1909 } 1909 }
1910 } 1910 }
1911 1911
1912 #if 0 1912 #if 0