puae 2.3.1

src/debug.c

@@ -625,8 +625,7 @@ static void dumpmem (uaecptr addr, uaecptr *nxmem, int lines)
 
 static void dump_custom_regs (int aga)
 {
-	unsigned int len;
-	unsigned int i, j, end;
+	unsigned int len, i, j, end;
 	uae_u8 *p1, *p2, *p3, *p4;
 
 	if (aga) {

src/expansion.c

@@ -306,7 +306,7 @@ static void REGPARAM2 expamem_wput (uaecptr addr, uae_u32 value)
 				ecard++;
 				if (p1 != p2)
 					write_log ("   Card %d remapped %04x0000 -> %04x0000\n", ecard, p1, p2);
-				write_log ("   Card %d (Zorro%s) done.\n", ecard, expamem_type () == 0xc0 ? L"II" : L"III");
+				write_log ("   Card %d (Zorro%s) done.\n", ecard, expamem_type () == 0xc0 ? "II" : "III");
 				if (ecard < cardno)
 					(*card_init[ecard]) ();
 				else

src/main.c

@@ -615,7 +615,7 @@ static void parse_cmdline (int argc, TCHAR **argv)
 			TCHAR *txt2 = xmalloc(TCHAR, _tcslen(txt) + 2);
 			_tcscpy(txt2, txt);
 			if (_tcsrchr(txt2, ',') != NULL)
-				_tcscat(txt2, L",");
+				_tcscat(txt2, ",");
 			cfgfile_parse_option (&currprefs, "cdimage0", txt2, 0);
 			xfree(txt2);
 			xfree (txt);

src/readcpu.c

@@ -112,8 +112,8 @@ struct mnemolookup lookuptab[] = {
     { i_ROXLW,	"ROXLW","ROXLW" },
     { i_ROXRW,	"ROXRW","ROXRW" },
 
-    { i_MOVE2C,	"MOVE2C", "MOVE" },
-    { i_MOVEC2,	"MOVEC2", "MOVE" },
+    { i_MOVE2C,	"MOVE2C", "MOVEC" },
+    { i_MOVEC2,	"MOVEC2", "MOVEC" },
     { i_CAS,	"CAS","CAS" },
     { i_CAS2,	"CAS2","CAS2" },
     { i_MULL,	"MULL","MULL" },