Fixed some compiler warnings, which arose from recent commits.

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index fdd552fed58d3c08d7a95d27f471ef9257296f69..239a3a833c6dbb61dd235b7fdaf37a340c78a057 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -358,11 +358,12 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
 {
   int i;
   struct variable_node *vn = NULL;
+  double weight;
 
   if (NULL == cat)
     return;
 
-  const double weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
+  weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
 
   assert (NULL == cat->reverse_variable_map_short);
   assert (NULL == cat->reverse_variable_map_long);

diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c
index 605cea3303766c36f7c70acfae20d33a36cbad54..680e147b62c845424c5aeb83ca7c507ff4bbf539 100644 (file)
--- a/src/ui/gui/psppire-val-chooser.c
+++ b/src/ui/gui/psppire-val-chooser.c
@@ -361,7 +361,7 @@ psppire_val_chooser_init (PsppireValChooser *vr)
       vr->rw[i].label = GTK_LABEL (gtk_label_new (gettext (l->label)));
       gtk_label_set_use_underline (vr->rw[i].label, TRUE);
       vr->rw[i].rb = GTK_TOGGLE_BUTTON (gtk_radio_button_new (group));
-      gtk_label_set_mnemonic_widget (vr->rw[i].label, vr->rw[i].rb);
+      gtk_label_set_mnemonic_widget (vr->rw[i].label, GTK_WIDGET (vr->rw[i].rb));
 
       gtk_misc_set_alignment (GTK_MISC (vr->rw[i].label), 0, 0.5);
 

diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c
index 1e44c0eb05829dcaf698d63adc034ef3717f23e1..671eba0c32c18b0a19fded5b9a7281c0a519a8fa 100644 (file)
--- a/src/ui/gui/t-test-options.c
+++ b/src/ui/gui/t-test-options.c
@@ -66,7 +66,7 @@ tt_options_dialog_create (GtkWindow *parent)
   
   g_object_set (tto->confidence, 
                "use-underline", TRUE, 
-               "mnemonic-widget", psppire_scanf_get_child (tto->confidence, 0),
+               "mnemonic-widget", psppire_scanf_get_child (PSPPIRE_SCANF (tto->confidence), 0),
                NULL);
 
   tto->dialog = get_widget_assert (tto->xml, "options-dialog");