CVS update by stephent xemacs/src, objects-xlike-inc.c ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/02/22 17:19:50

  Modified:    xemacs/src ChangeLog fileio.c objects-tty.c
                        objects-xlike-inc.c sysdll.c
Log:
Various warning fixes. <87lkiqkvpa.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.1048    +11 -0     XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1047
retrieving revision 1.1048
diff -u -p -r1.1047 -r1.1048
--- ChangeLog	2007/02/21 10:49:30	1.1047
+++ ChangeLog	2007/02/22 16:19:40	1.1048
@@ -1,3 +1,14 @@
+2007-02-21  Stephen J. Turnbull  <stephen at 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 at xemacs.org>
 
 	* glyphs-eimage.c (png_instantiate_unwind): Avoid recursion.



1.112     +1 -1      XEmacs/xemacs/src/fileio.c

Index: fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- fileio.c	2007/02/05 15:33:19	1.111
+++ fileio.c	2007/02/22 16:19:43	1.112
@@ -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];



1.19      +1 -1      XEmacs/xemacs/src/objects-tty.c

Index: objects-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-tty.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- objects-tty.c	2006/11/05 22:31:45	1.18
+++ objects-tty.c	2007/02/22 16:19:44	1.19
@@ -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;
 



1.6       +2 -0      XEmacs/xemacs/src/objects-xlike-inc.c

Index: objects-xlike-inc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-xlike-inc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- objects-xlike-inc.c	2006/11/15 21:12:16	1.5
+++ objects-xlike-inc.c	2007/02/22 16:19:44	1.6
@@ -465,7 +465,9 @@ xft_find_charset_font (Lisp_Object font,
 	   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);



1.21      +2 -2      XEmacs/xemacs/src/sysdll.c

Index: sysdll.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdll.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sysdll.c	2005/07/12 12:22:13	1.20
+++ sysdll.c	2007/02/22 16:19:44	1.21
@@ -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++)
     {