15 lines
446 B
C
15 lines
446 B
C
--- include/iprt/x86.h.orig 2014-01-11 03:15:24.000000000 -0500
|
|
+++ include/iprt/x86.h 2014-03-13 14:13:50.000000000 -0400
|
|
@@ -35,6 +35,12 @@
|
|
# pragma D depends_on library vbox-types.d
|
|
#endif
|
|
|
|
+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
|
|
+#ifdef RT_OS_FREEBSD
|
|
+# undef MSR_IA32_PLATFORM_ID
|
|
+# undef MSR_IA32_MISC_ENABLE
|
|
+#endif
|
|
+
|
|
/* Workaround for Solaris sys/regset.h defining CS, DS */
|
|
#ifdef RT_OS_SOLARIS
|
|
# undef CS
|