From: Victor Julien <victor@inliniac.net>
Date: Thu, 28 Nov 2019 14:05:05 +0000 (+0100)
Subject: util/mem: reduce scope of win32 specific include
X-Git-Tag: suricata-6.0.0-beta1~525
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4613e5c70d8a3325d9f378b5a49d4741ccfd2d8;p=thirdparty%2Fsuricata.git

util/mem: reduce scope of win32 specific include
---

diff --git a/src/decode.h b/src/decode.h
index f07e6cb1c8..aa5591518f 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -29,6 +29,7 @@
 
 #include "suricata-common.h"
 #include "threadvars.h"
+#include "util-debug.h"
 #include "decode-events.h"
 #include "flow-worker.h"
 
diff --git a/src/util-mem.c b/src/util-mem.c
index 381dc0557b..2cf008e709 100644
--- a/src/util-mem.c
+++ b/src/util-mem.c
@@ -19,6 +19,10 @@
 #include "suricata.h"
 #include "util-atomic.h"
 
+#if defined(_WIN32) || defined(__WIN32)
+#include <mm_malloc.h>
+#endif
+
 SC_ATOMIC_EXTERN(unsigned int, engine_stage);
 
 void *SCMallocFunc(const size_t sz)
diff --git a/src/util-mem.h b/src/util-mem.h
index e5c43cd844..b84fc48256 100644
--- a/src/util-mem.h
+++ b/src/util-mem.h
@@ -43,10 +43,6 @@
 #else /* CPPCHECK */
 
 
-#if defined(_WIN32) || defined(__WIN32)
-#include "mm_malloc.h"
-#endif
-
 void *SCMallocFunc(const size_t sz);
 #define SCMalloc(sz) SCMallocFunc((sz))
 
diff --git a/src/win32-service.c b/src/win32-service.c
index cf11524f10..06191b1973 100644
--- a/src/win32-service.c
+++ b/src/win32-service.c
@@ -28,6 +28,7 @@
 #include "suricata-common.h"
 #include "suricata.h"
 #include "win32-service.h"
+#include "util-debug.h"
 
 static SERVICE_STATUS_HANDLE service_status_handle = 0;
 
diff --git a/src/win32-syscall.c b/src/win32-syscall.c
index b91dcc2780..0c2789264d 100644
--- a/src/win32-syscall.c
+++ b/src/win32-syscall.c
@@ -51,6 +51,7 @@
 #undef _snprintf
 #define _snprintf StringCbPrintfA
 
+#include "suricata-common.h"
 #include "util-debug.h"
 #include "util-device.h"
 #include "util-mem.h"
@@ -1688,4 +1689,4 @@ void Win32SyscallRegisterTests()
 #endif
 }
 
-#endif /* OS_WIN32 */
\ No newline at end of file
+#endif /* OS_WIN32 */