From ef226b8a0e9aff97bbd6cfc5116a91badbbf829d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
Date: Tue, 31 Aug 2010 10:36:52 +0300
Subject: [PATCH] Really don't warn about x86_64 vs i386 mismatch (bb #2214).

---
 libclamav/c++/detect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libclamav/c++/detect.cpp b/libclamav/c++/detect.cpp
index 0612a154f..7994afa8b 100644
--- a/libclamav/c++/detect.cpp
+++ b/libclamav/c++/detect.cpp
@@ -94,7 +94,7 @@ void cli_detect_env_jit(struct cli_environment *env)
 	    earch = arch_i386;
 	    if (env->arch != earch) {
 		/* bb #2153 */
-		if (env->os_category != os_darwin || env->arch != arch_x86_64)
+		if (env->arch != arch_x86_64)
 		    conflicts = true;
 	    }
 	    break;