Mac OS X can run 64-bit app on 32-bit kernel (bb #2153).

So don't warn for these mismatches.

ChangeLog

@@ -1,3 +1,7 @@
+Mon Aug  9 19:46:58 EEST 2010 (edwin)
+-------------------------------------
+ * libclamav/c++/detect.cpp: Mac OS X can run 64-bit apps on 32-bit kernel (bb #2153).
+
 Mon Aug  9 16:49:44 CEST 2010 (tk)
 ----------------------------------
  * libclamav/others.h: bump f-level

libclamav/c++/detect.cpp

@@ -81,7 +81,8 @@ void cli_detect_env_jit(struct cli_environment *env)
 	    break;
 	case Triple::ppc:
 	    earch = arch_ppc32;
-	    if (env->arch != earch) conflicts = true;
+	    if (env->arch != earch &&
+		env->arch != arch_ppc64) conflicts = true;
 	    break;
 	case Triple::ppc64:
 	    earch = arch_ppc64;
@@ -91,11 +92,19 @@ void cli_detect_env_jit(struct cli_environment *env)
 	    break;
 	case Triple::x86:
 	    earch = arch_i386;
-	    if (env->arch != earch) conflicts = true;
+	    if (env->arch != earch) {
+		/* bb #2153 */
+		if (env->os_category != os_darwin || env->arch != arch_x86_64)
+		    conflicts = true;
+	    }
 	    break;
 	case Triple::x86_64:
 	    earch = arch_x86_64;
-	    if (env->arch != earch) conflicts = true;
+	    if (env->arch != earch) {
+		/* bb #2153 */
+		if (env->os_category != os_darwin || env->arch != arch_x86)
+		    conflicts = true;
+	    }
 	    break;
 	default:
 	    earch = arch_unknown;