Branch: master

58c3aed2 2014-10-08 12:01:23 Timothy Pearson
Do not use magic_version function if magic version support not available
This relates to Bug 656
M tdeio/tdeio/kmimemagic.cpp
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index dcc15fa..41c69dd 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -254,7 +254,11 @@
 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;