Don't hard-code MAGIC_NO_CHECK_BUILTIN, build it from it's components.

diff --git a/src/magic.h b/src/magic.h
index d87523deefa7326c4748a84c5322afd646268fcb..2bbed764d26d12608572942266d2aa6791f2101e 100644 (file)
--- a/src/magic.h
+++ b/src/magic.h
@@ -55,7 +55,17 @@
 #define MAGIC_NO_CHECK_ENCODING 0x200000 /* Don't check text encodings */
 
 /* No built-in tests; only consult the magic file */
-#define MAGIC_NO_CHECK_BUILTIN 0x3fb000
+#define MAGIC_NO_CHECK_BUILTIN ( \
+       MAGIC_NO_CHECK_COMPRESS | \
+       MAGIC_NO_CHECK_TAR      | \
+/*     MAGIC_NO_CHECK_SOFT     | */ \
+       MAGIC_NO_CHECK_APPTYPE  | \
+       MAGIC_NO_CHECK_ELF      | \
+       MAGIC_NO_CHECK_TEXT     | \
+       MAGIC_NO_CHECK_CDF      | \
+       MAGIC_NO_CHECK_TOKENS   | \
+       MAGIC_NO_CHECK_ENCODING | \
+)
 
 /* Defined for backwards compatibility (renamed) */
 #define        MAGIC_NO_CHECK_ASCII    MAGIC_NO_CHECK_TEXT