File swami-type-fix.dif of Package swami

--- src/gui/SwamiUIObject.c-dist	2004-04-16 15:20:28.000000000 +0200
+++ src/gui/SwamiUIObject.c	2004-04-16 15:20:59.000000000 +0200
@@ -428,6 +428,7 @@ swamiui_init_plugin_guis (void)
 {
   GList *plugins, *p;
   SwamiUIPluginDesc *desc;
+  gpointer descp;
   SwamiPlugin *plugin;
 
   plugins = swami_plugin_get_list ();
@@ -438,8 +439,9 @@ swamiui_init_plugin_guis (void)
       plugin = (SwamiPlugin *)(p->data);
       if (swami_plugin_is_loaded (plugin) &&
 	  g_module_symbol (plugin->module, "swamiui_plugin_desc",
-			   (gpointer *)&desc))
+			   &descp))
 	{
+	  desc = descp;
 	  if (desc->gui_init)
 	    if ((*desc->gui_init)(plugin->module, plugin) != SWAMI_OK)
 	      g_critical (_("GUI init routine failed for plugin %s"),
--- src/libswami/SwamiPlugin.c-dist	2004-04-16 15:04:08.000000000 +0200
+++ src/libswami/SwamiPlugin.c	2004-04-16 15:20:16.000000000 +0200
@@ -367,6 +367,7 @@ swami_plugin_load_plugin (SwamiPlugin *p
 {
   GModule *module;
   SwamiPluginDesc *desc;
+  gpointer descp;
   struct stat file_status;
   gchar *filename;
 
@@ -389,8 +390,9 @@ swami_plugin_load_plugin (SwamiPlugin *p
 
   if (module != NULL)
     {
-      if (g_module_symbol (module, "swami_plugin_desc", (gpointer *)&desc))
+      if (g_module_symbol (module, "swami_plugin_desc", &descp))
 	{
+	  desc = descp;
 	  g_message (_("Loading plugin \"%s\"..."), filename);
 
 	  plugin->filename = g_strdup (filename);
--- src/plugins/wavetbl_fluidsynth.c-dist	2004-04-16 15:21:28.000000000 +0200
+++ src/plugins/wavetbl_fluidsynth.c	2004-04-16 15:22:20.000000000 +0200
@@ -635,7 +635,9 @@ sfloader_load_sfont (fluid_sfloader_t *l
      temporary preset item to work when no sound fonts loaded (HACK COUGH) */
   if (filename[0] == '&')
     {
-      sscanf (filename, "&%p", (void **)(&item));
+      void *p;
+      sscanf (filename, "&%p", &p);
+      item = p;
       if (!item) return (NULL);
       instp_item_ref (item);	/* ++ Add a reference to the sound font */
     }