--- np2/x11/main.c	2004/03/23 15:16:43	1.14
+++ np2/x11/main.c	2004/05/22 16:35:08	1.16
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
 
 	rand_setseed((SINT32)time(NULL));
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	mmxflag = havemmx() ? 0 : MMXFLAG_NOTSUPPORT;
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
@@ -270,7 +270,7 @@ main(int argc, char *argv[])
 	scrnmng_initialize();
 	kbdmng_init();
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 	scrnmode = 0;
 	if (np2cfg.RASTER) {