APPROVE COMMIT 21.5 The FC_WIDTH patch actually prevents an error if you're not using the compatibility option for fontconfig/Xft. I think the default changed fairly recently. The others are minor warning things. diff --git a/src/ChangeLog b/src/ChangeLog index 6900d60..5a333f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -0,0 +1,11 ＠＠ +2007-02-21 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * objects-tty.c (tty_font_spec_matches_charset): Use Aidan's enum. + + * objects-xlike-inc.c (xft_find_charset_font): FC_WIDTH is obsolete + and may be undefined. + + * sysdll.c (image_for_address): const cleanliness for Darwin. + + * fileio.c (Finsert_file_contents_internal): Remove unused gcpro5. + diff --git a/src/fileio.c b/src/fileio.c index 1732604..b9dd6e2 100644 --- a/src/fileio.c +++ b/src/fileio.c ＠＠ -2885,7 +2885,7 ＠＠ under Mule, is very difficult.) int saverrno = 0; Charcount inserted = 0; int speccount; - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_Object val; int total; Ibyte read_buf[READ_BUF_SIZE]; diff --git a/src/objects-tty.c b/src/objects-tty.c index bdadfde..caed6f6 100644 --- a/src/objects-tty.c +++ b/src/objects-tty.c ＠＠ -339,7 +339,7 ＠＠ static int tty_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, - int stage) + enum font_specifier_matchspec_stages stage) { const Ibyte *the_nonreloc = nonreloc; diff --git a/src/objects-xlike-inc.c b/src/objects-xlike-inc.c index a162579..68c4d0c 100644 --- a/src/objects-xlike-inc.c +++ b/src/objects-xlike-inc.c ＠＠ -465,7 +465,9 ＠＠ xft_find_charset_font (Lisp_Object font, Lisp_Object charset, of rarely useful properties */ FcPatternDel (p, FC_CHARSET); FcPatternDel (p, FC_LANG); +#ifdef FC_WIDTH FcPatternDel (p, FC_WIDTH); +#endif FcPatternDel (p, FC_SPACING); FcPatternDel (p, FC_HINTING); FcPatternDel (p, FC_VERTICAL_LAYOUT); diff --git a/src/sysdll.c b/src/sysdll.c index 5b0d566..1ee987c 100644 --- a/src/sysdll.c +++ b/src/sysdll.c ＠＠ -267,12 +267,12 ＠＠ dll_close (dll_handle h) * (http://www.opendarwin.org/projects/dlcompat). */ -static struct mach_header* +static const struct mach_header* image_for_address(void *address) { unsigned long i; unsigned long count = _dyld_image_count(); - struct mach_header *mh = 0; + const struct mach_header *mh = 0; for (i = 0; i < count; i++) { _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches