util/mem: reduce scope of win32 specific include

diff --git a/src/decode.h b/src/decode.h
index f07e6cb1c84ba2deeebc61d7d7f7dc986ee179f5..aa5591518f802bfd87985434695b031097747c43 100644 (file)
--- 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 381dc0557b339eb4e8bce5de05490b64c771a729..2cf008e7095232cb16f7409d69fa7ec2c80906be 100644 (file)
--- 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 e5c43cd84433ca4273c5cc471a3ea0c47aacd69a..b84fc482561423093b1593dd299c3279888b2569 100644 (file)
--- 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 cf11524f10a1a1881797afa744a935780f7e5ea9..06191b197334a2112fba4e2cf34522da714319c4 100644 (file)
--- 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 b91dcc278039d8ff599f5e6c4d85bd3c7d1bd8c6..0c2789264d9708100f3de567aff302e9ae713bcf 100644 (file)
--- 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 */