--- np2/x11/gtk/Attic/dialog_config.c	2004/03/05 13:12:49	1.4
+++ np2/x11/gtk/Attic/dialog_config.c	2004/05/22 16:35:08	1.6
@@ -65,7 +65,7 @@ static GtkWidget *baseclock_entry;
 static GtkWidget *clockmult_entry;
 static GtkWidget *buffer_entry;
 static GtkWidget *resume_checkbutton;
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 static GtkWidget *disablemmx_checkbutton;
 #endif
 static const char *arch;
@@ -79,7 +79,9 @@ ok_button_clicked(GtkButton *b, gpointer
 	gchar *base = gtk_entry_get_text(GTK_ENTRY(baseclock_entry));
 	gchar *multp = gtk_entry_get_text(GTK_ENTRY(clockmult_entry));
 	gint resume = GTK_TOGGLE_BUTTON(resume_checkbutton)->active;
+#if defined(GCC_CPU_ARCH_IA32)
 	gint disablemmx = GTK_TOGGLE_BUTTON(disablemmx_checkbutton)->active;
+#endif
 	guint bufsize;
 	guint mult;
 	UINT renewal = 0;
@@ -145,7 +147,7 @@ ok_button_clicked(GtkButton *b, gpointer
 		soundrenewal = 1;
 	}
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	if (!(mmxflag & MMXFLAG_NOTSUPPORT)) {
 		disablemmx = disablemmx ? MMXFLAG_DISABLE : 0;
 		if (np2oscfg.disablemmx != disablemmx) {
@@ -194,7 +196,7 @@ rate_radiobutton_clicked(GtkButton *b, g
 
 	UNUSED(b);
 
-	rate = (gint)d;
+	rate = GPOINTER_TO_INT(d);
 }
 
 static void
@@ -433,7 +435,7 @@ create_configure_dialog(void)
 		gtk_box_pack_start(GTK_BOX(soundrate_hbox), rate_radiobutton[i], FALSE, FALSE, 0);
 		GTK_WIDGET_UNSET_FLAGS(rate_radiobutton[i], GTK_CAN_FOCUS);
 		gtk_signal_connect(GTK_OBJECT(rate_radiobutton[i]), "clicked",
-		    GTK_SIGNAL_FUNC(rate_radiobutton_clicked), (gpointer)samplingrate[i].rate);
+		    GTK_SIGNAL_FUNC(rate_radiobutton_clicked), GINT_TO_POINTER(samplingrate[i].rate));
 	}
 	if (np2cfg.samplingrate == 11025) {
 		i = 0;
@@ -485,7 +487,7 @@ create_configure_dialog(void)
 		gtk_signal_emit_by_name(GTK_OBJECT(resume_checkbutton), "clicked");
 	}
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	/* Disable MMX */
 	disablemmx_checkbutton = gtk_check_button_new_with_label("Disable MMX");
 	gtk_widget_show(disablemmx_checkbutton);