diff options
Diffstat (limited to 'tdeio')
| -rw-r--r-- | tdeio/tdeio/kmimemagic.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp index dcc15fafe..41c69dd3a 100644 --- a/tdeio/tdeio/kmimemagic.cpp +++ b/tdeio/tdeio/kmimemagic.cpp @@ -254,7 +254,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; |