# HG changeset patch
# User crestani
# Date 1187338090 0
# Node ID 9a633a00c3f235ae9528f6f5ac12ed42450e16b2
# Parent  5333f383efbd3f387b99a404cc339511ffb35df5
[xemacs-hg @ 2007-08-17 08:08:05 by crestani]
2007-08-15  Marcus Crestani  <crestani@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.

diff -r 5333f383efbd -r 9a633a00c3f2 src/ChangeLog
--- a/src/ChangeLog	Fri Aug 17 08:04:28 2007 +0000
+++ b/src/ChangeLog	Fri Aug 17 08:08:10 2007 +0000
@@ -1,3 +1,12 @@
+2007-08-15  Marcus Crestani  <crestani@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@xemacs.org>
 
 	* input-method-xlib.c (EmacsFreeXIMStyles):
diff -r 5333f383efbd -r 9a633a00c3f2 src/database.c
--- a/src/database.c	Fri Aug 17 08:04:28 2007 +0000
+++ b/src/database.c	Fri Aug 17 08:08:10 2007 +0000
@@ -281,9 +281,9 @@
        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 @@
   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);
 }
diff -r 5333f383efbd -r 9a633a00c3f2 src/gc.c
--- a/src/gc.c	Fri Aug 17 08:04:28 2007 +0000
+++ b/src/gc.c	Fri Aug 17 08:08:10 2007 +0000
@@ -107,10 +107,10 @@
 };
 
 #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 @@
   GC_STAT_COUNT /* has to be last */
 };
 
-struct
+typedef struct gc_state_type
 {
   enum gc_phase phase;
   double n_gc[GC_STAT_COUNT];
@@ -134,9 +134,11 @@
   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
 
diff -r 5333f383efbd -r 9a633a00c3f2 src/objects-tty.c
--- a/src/objects-tty.c	Fri Aug 17 08:04:28 2007 +0000
+++ b/src/objects-tty.c	Fri Aug 17 08:08:10 2007 +0000
@@ -374,7 +374,7 @@
   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;
     }
diff -r 5333f383efbd -r 9a633a00c3f2 src/objects-xlike-inc.c
--- a/src/objects-xlike-inc.c	Fri Aug 17 08:04:28 2007 +0000
+++ b/src/objects-xlike-inc.c	Fri Aug 17 08:08:10 2007 +0000
@@ -61,7 +61,7 @@
   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 @@
       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;