--- ./dlls/ntdll/nt.c.orig	2012-04-21 23:03:51.000000000 -0700
+++ ./dlls/ntdll/nt.c	2012-04-21 23:04:14.000000000 -0700
@@ -34,7 +34,9 @@
 # include <machine/cpu.h>
 #endif
 #ifdef HAVE_MACH_MACHINE_H
+# define cpu_type_t mach_cpu_type_t
 # include <mach/machine.h>
+#undef cpu_type_t
 #endif
 
 #include <ctype.h>