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

[xemacs-cvs at xemacs.org]

  User: crestani
  Date: 07/08/17 10:08:17

  Modified:    xemacs/src ChangeLog database.c gc.c objects-tty.c
                        objects-xlike-inc.c
Log:
2007-08-15  Marcus Crestani  <crestani at xemacs.org>

	* database.c (dbm_map): Add typecast.
	* database.c (dbm_get): Add typecast.
	* gc.c (gc_state_type): Declare type.
	* objects-tty.c (tty_find_charset_font): Add typecast.
	* objects-xlike-inc.c (count_hyphens): Add typecast.
	* objects-xlike-inc.c (endif): Add typecast.

Revision  Changes    Path
1.1087    +9 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -p -r1.1086 -r1.1087
--- ChangeLog	2007/08/17 08:04:25	1.1086
+++ ChangeLog	2007/08/17 08:08:05	1.1087
@@ -1,5 +1,14 @@
 2007-08-15  Marcus Crestani  <crestani at xemacs.org>
 
+	* database.c (dbm_map): Add typecast.
+	* database.c (dbm_get): Add typecast.
+	* gc.c (gc_state_type): Declare type.
+	* objects-tty.c (tty_find_charset_font): Add typecast.
+	* objects-xlike-inc.c (count_hyphens): Add typecast.
+	* objects-xlike-inc.c (endif): Add typecast.
+
+2007-08-15  Marcus Crestani  <crestani at xemacs.org>
+
 	* input-method-xlib.c (EmacsFreeXIMStyles):
 	* lisp.h:
 	* process-unix.c (connect_to_file_descriptor):



1.40      +3 -3      XEmacs/xemacs/src/database.c

Index: database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- database.c	2006/12/11 19:44:56	1.39
+++ database.c	2007/08/17 08:08:10	1.40
@@ -281,9 +281,9 @@ dbm_map (Lisp_Database *db, Lisp_Object 
        keydatum = dbm_nextkey (db->dbm_handle))
     {
       valdatum = dbm_fetch (db->dbm_handle, keydatum);
-      key = make_ext_string (keydatum.dptr, keydatum.dsize,
+      key = make_ext_string ((Extbyte *) keydatum.dptr, keydatum.dsize,
 			     db->coding_system);
-      val = make_ext_string (valdatum.dptr, valdatum.dsize,
+      val = make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize,
 			     db->coding_system);
       call2 (func, key, val);
     }
@@ -300,7 +300,7 @@ dbm_get (Lisp_Database *db, Lisp_Object 
   valdatum = dbm_fetch (db->dbm_handle, keydatum);
 
   return (valdatum.dptr
-	  ? make_ext_string (valdatum.dptr, valdatum.dsize,
+	  ? make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize,
 			     db->coding_system)
 	  : Qnil);
 }



1.8       +6 -4      XEmacs/xemacs/src/gc.c

Index: gc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gc.c	2007/08/14 18:58:16	1.7
+++ gc.c	2007/08/17 08:08:10	1.8
@@ -107,10 +107,10 @@ enum gc_phase
 };
 
 #ifndef ERROR_CHECK_GC
-struct
+typedef struct gc_state_type
 {
   enum gc_phase phase;
-} gc_state;
+} gc_state_type;
 #else /* ERROR_CHECK_GC */
 enum gc_stat_id
 {
@@ -122,7 +122,7 @@ enum gc_stat_id
   GC_STAT_COUNT /* has to be last */
 };
 
-struct
+typedef struct gc_state_type
 {
   enum gc_phase phase;
   double n_gc[GC_STAT_COUNT];
@@ -134,8 +134,10 @@ struct
   double dequeued2[GC_STAT_COUNT];
   double finalized[GC_STAT_COUNT];
   double freed[GC_STAT_COUNT];
-} gc_state;
+} gc_state_type;
 #endif /* ERROR_CHECK_GC */
+
+gc_state_type gc_state;
 
 #define GC_PHASE gc_state.phase
 #define GC_SET_PHASE(p) GC_PHASE = p



1.21      +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.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- objects-tty.c	2007/08/15 11:06:10	1.20
+++ objects-tty.c	2007/08/17 08:08:10	1.21
@@ -374,7 +374,7 @@ tty_find_charset_font (Lisp_Object devic
   if (strchr ((const char *) fontname, '/'))
     {
       if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
-					 font, 0, -1, 0))
+					 font, 0, -1, initial))
 	return font;
       return Qnil;
     }



1.7       +2 -2      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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- objects-xlike-inc.c	2007/02/22 16:19:44	1.6
+++ objects-xlike-inc.c	2007/08/17 08:08:10	1.7
@@ -61,7 +61,7 @@ count_hyphens(const Ibyte *str, Bytecoun
   const Ibyte *new_hyphening;
 
   for (hyphen_count = 0; 
-       NULL != (new_hyphening = memchr((const void *)hyphening, '-', length));
+       NULL != (new_hyphening = (Ibyte *) memchr((const void *)hyphening, '-', length));
        hyphen_count++)
     {
       ++new_hyphening;
@@ -786,7 +786,7 @@ x_find_charset_font (Lisp_Object device,
       for (j = 0; j < registries_len; ++j)
 	{
 	  if (0 == qxestrcasecmp(XSTRING_DATA(XVECTOR_DATA(registries)[j]),
-				 FALLBACK_ASCII_REGISTRY))
+				 (Ibyte *) FALLBACK_ASCII_REGISTRY))
 	    {
 	      have_latin1 = 1;
 	      break;