glib/gconvert.c glib/gen-unicode-tables.pl fixed cast/type problems to

2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
  * glib/gconvert.c
  * glib/gen-unicode-tables.pl
  * glib/gunidecomp.h : fixed cast/type problems to
    avoid warnings (with forte compiler)
  * gobject/gclosure.c
  * gobject/gobject.c
  * gobject/gsignal.c: fixed cast problems with function pointer
    to avoid warnings (with forte compiler) (#73898)

15 files changed, 71 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 46cf7a475..d85822145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 46cf7a475..d85822145 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * glib/gconvert.c 
+	  glib/gen-unicode-tables.pl
+	  glib/gunidecomp.h : fixed cast/type problems to 
+	  avoid warnings (with forte compiler) (#73898)
+	
 2002-03-12  Alexander Larsson  <alla@lysator.liu.se>
 
 	* glib/gconvert.c:
diff --git a/glib/gconvert.c b/glib/gconvert.c
index bec69f4ba..c12569efe 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -196,7 +196,7 @@ struct _iconv_cache_bucket {
   gchar *key;
   guint32 refcount;
   gboolean used;
-  iconv_t cd;
+  GIConv cd;
 };
 
 static GList *iconv_cache_list;
@@ -233,7 +233,7 @@ iconv_cache_init (void)
  * Returns a pointer to the newly allocated cache bucket.
  **/
 struct _iconv_cache_bucket *
-iconv_cache_bucket_new (const gchar *key, iconv_t cd)
+iconv_cache_bucket_new (const gchar *key, GIConv cd)
 {
   struct _iconv_cache_bucket *bucket;
   
@@ -349,7 +349,7 @@ open_converter (const gchar *to_codeset,
       if (bucket->used)
         {
           cd = g_iconv_open (to_codeset, from_codeset);
-          if (cd == (iconv_t) -1)
+          if (cd == (GIConv) -1)
             goto error;
         }
       else
@@ -366,7 +366,7 @@ open_converter (const gchar *to_codeset,
   else
     {
       cd = g_iconv_open (to_codeset, from_codeset);
-      if (cd == (iconv_t) -1)
+      if (cd == (GIConv) -1)
         goto error;
       
       iconv_cache_expire_unused ();
@@ -402,11 +402,11 @@ close_converter (GIConv converter)
 {
   struct _iconv_cache_bucket *bucket;
   const gchar *key;
-  iconv_t cd;
+  GIConv cd;
   
-  cd = (iconv_t) converter;
+  cd = converter;
   
-  if (cd == (iconv_t) -1)
+  if (cd == (GIConv) -1)
     return 0;
   
   G_LOCK (iconv_cache_lock);
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index 90e883bc2..13349fce8 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -768,7 +768,7 @@ sub print_decomp
     }
     print OUT "\n};\n\n";
 
-    printf OUT "static const char decomp_expansion_string[] = %s;\n\n", $decomp_string;
+    printf OUT "static const guchar decomp_expansion_string[] = %s;\n\n", $decomp_string;
 
     print OUT "#endif /* DECOMP_H */\n";
 
diff --git a/glib/gunidecomp.h b/glib/gunidecomp.h
index 87a41cfe2..6b1ac1175 100644
--- a/glib/gunidecomp.h
+++ b/glib/gunidecomp.h
@@ -4019,7 +4019,7 @@ static const decomposition decomp_table[] =
   { 0xffee, 255, 0, 16468 }
 };
 
-static const char decomp_expansion_string[] = 
+static const guchar decomp_expansion_string[] = 
   "\x00\x20\0\0" /* offset 0 */
   "\x00\x20\x03\x08\0\0" /* offset 4 */
   "\x00\x61\0\0" /* offset 10 */
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 2fbe66ded..23e4c46e1 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-13  Erwann Chenede  <erwann.chenede@sun.com>
+        * gobject/gclosure.c  
+	* gobject/gobject.c 
+	* gobject/gsignal.c: fixed cast problems with function pointer
+	to avoid warnings (with forte compiler) (#73898)
+	
+
 2002-03-05  Sven Neumann  <sven@gimp.org>
 
 	* gvaluetransform.c (g_value_transforms_init): don't try to 
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index b6282bb7b..73f2b16e5 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -104,7 +104,7 @@ closure_invoke_notifiers (GClosure *closure,
 	  register guint n = --closure->n_fnotifiers;
 
 	  ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + n;
-	  closure->marshal = (gpointer) ndata->notify;
+	  closure->marshal = (GClosureMarshal) ndata->notify;
 	  closure->data = ndata->data;
 	  ndata->notify (ndata->data, closure);
 	}
@@ -118,7 +118,7 @@ closure_invoke_notifiers (GClosure *closure,
           register guint n = --closure->n_inotifiers;
 
 	  ndata = closure->notifiers + CLOSURE_N_MFUNCS (closure) + closure->n_fnotifiers + n;
-	  closure->marshal = (gpointer) ndata->notify;
+	  closure->marshal = (GClosureMarshal) ndata->notify;
 	  closure->data = ndata->data;
 	  ndata->notify (ndata->data, closure);
 	}
@@ -472,7 +472,7 @@ g_cclosure_new (GCallback      callback_func,
   closure = g_closure_new_simple (sizeof (GCClosure), user_data);
   if (destroy_data)
     g_closure_add_finalize_notifier (closure, user_data, destroy_data);
-  ((GCClosure*) closure)->callback = callback_func;
+  ((GCClosure*) closure)->callback = (gpointer) callback_func;
   
   return closure;
 }
@@ -489,7 +489,7 @@ g_cclosure_new_swap (GCallback      callback_func,
   closure = g_closure_new_simple (sizeof (GCClosure), user_data);
   if (destroy_data)
     g_closure_add_finalize_notifier (closure, user_data, destroy_data);
-  ((GCClosure*) closure)->callback = callback_func;
+  ((GCClosure*) closure)->callback = (gpointer) callback_func;
   closure->derivative_flag = TRUE;
   
   return closure;
diff --git a/gobject/gobject.c b/gobject/gobject.c
index ebfd82c9e..6f248b7e6 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1168,7 +1168,7 @@ g_object_disconnect (gpointer     _object,
 	g_warning ("%s: invalid signal name \"%s\"", G_STRLOC, signal_spec);
       else if (!g_signal_handlers_disconnect_matched (object, mask | (detail ? G_SIGNAL_MATCH_DETAIL : 0),
 						      sid, detail,
-						      NULL, callback, data))
+						      NULL, (gpointer)callback, data))
 	g_warning (G_STRLOC ": signal handler %p(%p) is not connected", callback, data);
       signal_spec = va_arg (var_args, gchar*);
     }
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 20c826e4c..530a96127 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -829,7 +829,7 @@ g_signal_add_emission_hook (guint               signal_id,
     }
   hook = g_hook_alloc (node->emission_hooks);
   hook->data = hook_data;
-  hook->func = hook_func;
+  hook->func = (gpointer) hook_func;
   hook->destroy = data_destroy;
   signal_hook = SIGNAL_HOOK (hook);
   signal_hook->detail = detail;
@@ -2298,7 +2298,7 @@ signal_emit_unlocked_R (SignalNode   *node,
 	  
 	  if (!signal_hook->detail || signal_hook->detail == detail)
 	    {
-	      GSignalEmissionHook hook_func = hook->func;
+	      GSignalEmissionHook hook_func = (GSignalEmissionHook) hook->func;
 	      
 	      was_in_call = G_HOOK_IN_CALL (hook);
 	      hook->flags |= G_HOOK_FLAG_IN_CALL;