commit f8ad8ff81a703ac203cea0f0ff8675ce4088b8bb
author DRC <dcommander@users.sourceforge.net> Wed Mar 03 08:48:44 2010 +0000
committer DRC <dcommander@users.sourceforge.net> Wed Mar 03 08:48:44 2010 +0000
tree 749ad79431e56129c4a224b8cf8f9c1b02f21818
parent fed5ff056ff410ca379a0ad61bd7935cae72fafe

Don't allow code path to be forced on a	system that doesn't support it


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4000 3789f03b-4d11-0410-bbf8-ca57d06f2519

common/jpeg/simd/jsimd_i386.c

diff --git a/common/jpeg/simd/jsimd_i386.c b/common/jpeg/simd/jsimd_i386.c
index ed1339b..66af024 100644
--- a/common/jpeg/simd/jsimd_i386.c
+++ b/common/jpeg/simd/jsimd_i386.c
@@ -48,16 +48,16 @@
   /* Force different settings through environment variables */
   env = getenv("JSIMD_FORCEMMX");
   if ((env != NULL) && (strcmp(env, "1") == 0))
-    simd_support = JSIMD_MMX;
+    simd_support &= JSIMD_MMX;
   env = getenv("JSIMD_FORCE3DNOW");
   if ((env != NULL) && (strcmp(env, "1") == 0))
-    simd_support = JSIMD_3DNOW|JSIMD_MMX;
+    simd_support &= JSIMD_3DNOW|JSIMD_MMX;
   env = getenv("JSIMD_FORCESSE");
   if ((env != NULL) && (strcmp(env, "1") == 0))
-    simd_support = JSIMD_SSE|JSIMD_MMX;
+    simd_support &= JSIMD_SSE|JSIMD_MMX;
   env = getenv("JSIMD_FORCESSE2");
   if ((env != NULL) && (strcmp(env, "1") == 0))
-    simd_support = JSIMD_SSE2;
+    simd_support &= JSIMD_SSE2;
 }
 
 GLOBAL(int)