Do not use magic_version function if magic version support not available

This relates to Bug 656
pull/16/head
Timothy Pearson 10 years ago
parent a44c924930
commit 58c3aed2bb

@ -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;

Loading…
Cancel
Save