diff options
Diffstat (limited to 'kio')
| -rw-r--r-- | kio/kio/kmimemagic.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; |