diff -urpN 179-a/src/md4-mmx.S john-1.7.9-a/src/md4-mmx.S
--- 179-a/src/md4-mmx.S	2011-11-29 16:26:47.959125000 +0000
+++ john-1.7.9-a/src/md4-mmx.S	2011-11-29 16:52:07.146625000 +0000
@@ -116,7 +116,7 @@ buffer:
 // These are 'magic' param marshalling calls to convert VC __fastcall, to 
 // GCC/GAS register param ordering.  Same as was done in MD5/SHA1. Requires
 // MinGW32 to build the .o, and then VC can use that .o file properly.
-mdfivemmx_VC:
+mdfourmmx_VC:
     lea mdfourmmx_VC_exit, %eax
     push %eax
     pusha
diff -urpN 179-a/src/x86-any.h john-1.7.9-a/src/x86-any.h
--- 179-a/src/x86-any.h	2011-11-28 17:29:46.427875000 +0000
+++ john-1.7.9-a/src/x86-any.h	2011-11-29 17:45:30.365375000 +0000
@@ -28,12 +28,7 @@
 #define OS_TIMER			1
 #endif
 #define OS_FLOCK			1
-
-#ifdef _MSC_VER
-#define CPU_DETECT			0
-#else
 #define CPU_DETECT			1
-#endif
 #define CPU_REQ				0
 
 #define DES_ASM				1
diff -urpN 179-a/src/x86-mmx.h john-1.7.9-a/src/x86-mmx.h
--- 179-a/src/x86-mmx.h	2011-11-28 17:29:46.443500000 +0000
+++ john-1.7.9-a/src/x86-mmx.h	2011-11-29 17:44:43.193500000 +0000
@@ -30,11 +30,11 @@
 #endif
 #define OS_FLOCK			1
 
-#ifdef _MSC_VER
-#define CPU_DETECT			0
-#else
+//#ifdef _MSC_VER
+//#define CPU_DETECT			0
+//#else
 #define CPU_DETECT			1
-#endif
+//#endif
 #define CPU_REQ				1
 #define CPU_NAME			"MMX"
 #ifndef CPU_FALLBACK
@@ -82,7 +82,11 @@
 #define BF_ASM				0
 #define BF_X2				1
 #else
+#ifdef _MSC_VER
+#define BF_ASM				0
+#else
 #define BF_ASM				1
+#endif
 #define BF_X2				0
 #endif
 #define BF_SCALE			1
diff -urpN 179-a/src/x86-sse.h john-1.7.9-a/src/x86-sse.h
--- 179-a/src/x86-sse.h	2011-11-28 17:29:46.474750000 +0000
+++ john-1.7.9-a/src/x86-sse.h	2011-11-29 17:48:46.302875000 +0000
@@ -30,12 +30,7 @@
 #define OS_TIMER			1
 #endif
 #define OS_FLOCK			1
-
-#ifdef _MSC_VER
-#define CPU_DETECT			0
-#else
 #define CPU_DETECT			1
-#endif
 #define CPU_REQ				1
 #define CPU_NAME			"SSE2"
 #ifndef CPU_FALLBACK
@@ -136,11 +131,7 @@
 #define BF_ASM				0
 #define BF_X2				1
 #else
-#ifdef _MSC_VER
-#define BF_ASM				0
-#else
 #define BF_ASM				1
-#endif
 #define BF_X2				0
 #endif
 #define BF_SCALE			1
diff -urpN 179-a/src/x86-ssei.h john-1.7.9-a/src/x86-ssei.h
--- 179-a/src/x86-ssei.h	2011-11-28 17:29:48.521625000 +0000
+++ john-1.7.9-a/src/x86-ssei.h	2011-11-29 17:47:31.631000000 +0000
@@ -30,12 +30,7 @@
 #define OS_TIMER			1
 #endif
 #define OS_FLOCK			1
-
-#ifdef _MSC_VER
-#define CPU_DETECT			0
-#else
 #define CPU_DETECT			1
-#endif
 #define CPU_REQ				1
 #define CPU_NAME			"SSE2"
 #ifndef CPU_FALLBACK
@@ -136,18 +131,11 @@
 #define BF_ASM				0
 #define BF_X2				1
 #else
-#ifdef _MSC_VER
-#define BF_ASM				0
-#else
 #define BF_ASM				1
-#endif
 #define BF_X2				0
 #endif
 #define BF_SCALE			1
 
-//#define MMX_TYPE			" SSE2"
-//#define MMX_COEF			4
-
 #if defined(__INTEL_COMPILER) || defined(USING_ICC_S_FILE)
 #define MD5_SSE_PARA		3
 #define MD5_N_STR			"12x"