From 6a2645238245e1f92b4fa92fc108e4559c849da8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 8 Oct 2014 12:01:23 -0500
Subject: Do not use magic_version function if magic version support not
 available This relates to Bug 656 (cherry picked from commit
 58c3aed2bb340467aa9734a9141ebe1d89e4074b)

---
 kio/kio/kmimemagic.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp
index 4127e3451..f9001e5cd 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/kio/kio/kmimemagic.cpp
@@ -251,7 +251,11 @@ KMimeMagic::~KMimeMagic() {
 bool KMimeMagic::mergeConfig(const TQString & _configfile) {
 	conf->databases.append(_configfile);
 	TQString merged_databases = conf->databases.join(":");
+#ifdef MAGIC_VERSION
 	int magicvers = magic_version();
+#else // MAGIC_VERSION
+	int magicvers = 0;
+#endif // MAGIC_VERSION
 	if ((magicvers < 512) || (magicvers >= 518)) {
 		if (magic_load(conf->magic, merged_databases.latin1()) == 0) {
 			return true;
-- 
cgit v1.2.1