--- src/mach32.c.orig	1999-09-29 11:52:14.000000000 -0500
+++ src/mach32.c	2005-09-01 08:55:19.000000000 -0500
@@ -1544,7 +1544,7 @@
 		goto writerr;
 	    printf("mach32: Notice: new EEPROM file >%s< succesful created.\n",
 		   eeprom_fname);
-	  finish_w_eeprom:
+	finish_w_eeprom: ;
 	}
 	/* Change eeprom contents if requested: */
 	if (!(eeprom_option & EEPROM_USE_MEMCFG))
--- src/s3.c.orig	2000-05-03 07:23:57.000000000 -0500
+++ src/s3.c	2005-09-01 08:54:44.000000000 -0500
@@ -474,7 +474,7 @@
 	    dac_used->restoreState(regs);
 	    return old_values;
 	}
-    default:
+    default: ;
     }
     return 0;
 }
--- src/vga.c.orig	2001-05-29 09:37:55.000000000 -0500
+++ src/vga.c	2005-09-01 09:07:24.000000000 -0500
@@ -3914,7 +3914,7 @@
 
 #define ML_GETINT(x) \
 	ptr = strtok(NULL, " "); if(!ptr) break; \
-	mmt.##x = atoi(ptr);
+	mmt.x = atoi(ptr);
 
 	    ML_GETINT(HDisplay);
 	    ML_GETINT(HSyncStart);