magic: fix compile warnings

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 0cdad2c77d6e8f3c7f653e7ab733909b3472bec3..8145add23bf782847f5c0462b0539d841458a18c 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -56,7 +56,7 @@
 
 #ifndef HAVE_MAGIC
 
-static int DetectFilemagicSetupNoSupport (DetectEngineCtx *de_ctx, Signature *s, char *str)
+static int DetectFilemagicSetupNoSupport (DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
     SCLogError(SC_ERR_NO_MAGIC_SUPPORT, "no libmagic support built in, needed for filemagic keyword");
     return -1;

diff --git a/src/util-magic.c b/src/util-magic.c
index a25e13bc4774b10d9a135ad1778b70a838d5d140..9e1179747c8225adbb1d8335442653fa15a9e65b 100644 (file)
--- a/src/util-magic.c
+++ b/src/util-magic.c
@@ -29,12 +29,12 @@
 
 #include "suricata-common.h"
 
-#ifdef HAVE_MAGIC
 #include "conf.h"
 
 #include "util-unittest.h"
 #include "util-magic.h"
 
+#ifdef HAVE_MAGIC
 static magic_t g_magic_ctx = NULL;
 static SCMutex g_magic_lock;