From f6b2c93c68cedabf71f11f1c6e7b7c9bc4ff0796 Mon Sep 17 00:00:00 2001 From: Bob Rudis Date: Sat, 13 Aug 2016 12:44:55 -0400 Subject: [PATCH] Support libmagic 5.09 --- src/wand.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/wand.cpp b/src/wand.cpp index 5c68e42..b688af4 100644 --- a/src/wand.cpp +++ b/src/wand.cpp @@ -40,7 +40,11 @@ DataFrame incant(CharacterVector path, std::string magic_db="system") { const char *mdb; std::string mdbcpp; +#ifndef MAGIC_VERSION + int version = 500; +#else int version = magic_version(); +#endif if (magic_db == "system") { mdb = NULL; @@ -147,4 +151,10 @@ DataFrame incant(CharacterVector path, std::string magic_db="system") { } // [[Rcpp::export]] -int lib_version() { return(magic_version()); } +int lib_version() { +#ifndef MAGIC_VERSION + return(500); +#else + return(magic_version()); +#endif +}