From b802615c363c05c7bb3284fe79197ae98d3cbbc1 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Fri, 20 Feb 2004 17:33:28 +0000
Subject: [PATCH] Don't include SSE/MMX intrinsics headers if they are not
 available

---
 SheepShaver/src/Unix/configure.in                      | 6 +++---
 SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SheepShaver/src/Unix/configure.in b/SheepShaver/src/Unix/configure.in
index 13184e5b..2c16eefb 100644
--- a/SheepShaver/src/Unix/configure.in
+++ b/SheepShaver/src/Unix/configure.in
@@ -183,9 +183,9 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
 AC_CHECK_HEADERS(sys/time.h sys/times.h)
 AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
-AC_CHECK_HEADER(mmintrin.h, [have_mmintrin_h=yes])
-AC_CHECK_HEADER(xmmintrin.h, [have_xmmintrin_h=yes])
-AC_CHECK_HEADER(emmintrin.h, [have_emmintrin_h=yes])
+AC_CHECK_HEADERS(mmintrin.h, [have_mmintrin_h=yes])
+AC_CHECK_HEADERS(xmmintrin.h, [have_xmmintrin_h=yes])
+AC_CHECK_HEADERS(emmintrin.h, [have_emmintrin_h=yes])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
diff --git a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
index 4d425071..57e51d81 100644
--- a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
+++ b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
@@ -1489,7 +1489,7 @@ void op_record_cr6_VD(void)
  *		SSE optimizations
  **/
 
-#if defined(__SSE__)
+#if defined(__SSE__) && defined(HAVE_XMMINTRIN_H)
 #include <xmmintrin.h>
 #undef  VD
 #define VD *((__m128 *)reg_VD)
@@ -1575,7 +1575,7 @@ void op_sse_vxor(void)
  *		MMX optimizations
  **/
 
-#if defined(__MMX__)
+#if defined(__MMX__) && defined(HAVE_MMINTRIN_H)
 #include <mmintrin.h>
 #undef  VD
 #define VD ((__m64 *)reg_VD)