Mercurial > hg > xemacs-beta
changeset 3841:5989b9bbb612
[xemacs-hg @ 2007-02-22 16:19:40 by stephent]
Various warning fixes. <87lkiqkvpa.fsf@uwakimon.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Thu, 22 Feb 2007 16:19:44 +0000 |
| parents | 468d3e5fc353 |
| children | 1c2a46ea1f78 |
| files | src/ChangeLog src/fileio.c src/objects-tty.c src/objects-xlike-inc.c src/sysdll.c |
| diffstat | 5 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 21 22:51:09 2007 +0000 +++ b/src/ChangeLog Thu Feb 22 16:19:44 2007 +0000 @@ -1,3 +1,14 @@ +2007-02-21 Stephen J. Turnbull <stephen@xemacs.org> + + * 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. + 2007-02-17 Stephen J. Turnbull <stephen@xemacs.org> * glyphs-eimage.c (png_instantiate_unwind): Avoid recursion.
--- a/src/fileio.c Wed Feb 21 22:51:09 2007 +0000 +++ b/src/fileio.c Thu Feb 22 16:19:44 2007 +0000 @@ -2885,7 +2885,7 @@ 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];
--- a/src/objects-tty.c Wed Feb 21 22:51:09 2007 +0000 +++ b/src/objects-tty.c Thu Feb 22 16:19:44 2007 +0000 @@ -339,7 +339,7 @@ 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;
--- a/src/objects-xlike-inc.c Wed Feb 21 22:51:09 2007 +0000 +++ b/src/objects-xlike-inc.c Thu Feb 22 16:19:44 2007 +0000 @@ -465,7 +465,9 @@ 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);
--- a/src/sysdll.c Wed Feb 21 22:51:09 2007 +0000 +++ b/src/sysdll.c Thu Feb 22 16:19:44 2007 +0000 @@ -267,12 +267,12 @@ * (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++) {