Mercurial > hg > xemacs-beta
changeset 950:c1a972caf831
[xemacs-hg @ 2002-08-02 15:18:38 by youngs]
2002-08-03 Steve Youngs <youngs@xemacs.org>
* objects-gtk.c: Fix '--with-mule' '--with-gtk' builds.
From Vaclav Barta <vbar@comp.cz>.
| author | youngs |
|---|---|
| date | Fri, 02 Aug 2002 15:18:46 +0000 |
| parents | 7a35465d73bc |
| children | 93e076dd7825 |
| files | src/ChangeLog src/objects-gtk.c |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 02 15:15:47 2002 +0000 +++ b/src/ChangeLog Fri Aug 02 15:18:46 2002 +0000 @@ -38,7 +38,6 @@ * alloc.c: Fix various kkcc-related nits that show up in MULE and union-type builds. ->>>>>>> 1.488 2002-07-31 David Bush <David.Bush@intel.com> * events.c (event_equal): Correct comparison in MS Windows
--- a/src/objects-gtk.c Fri Aug 02 15:15:47 2002 +0000 +++ b/src/objects-gtk.c Fri Aug 02 15:18:46 2002 +0000 @@ -425,7 +425,7 @@ /* find a font spec that matches font spec FONT and also matches (the registry of) CHARSET. */ -static Lisp_Object gtk_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset); +static Lisp_Object gtk_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset, int stage); #endif /* MULE */