windows: move win32 source into windows/

jasonish · Dec 5, 2023 · 34da074 · 34da074
1 parent 33b6766
commit 34da074
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -621,10 +621,10 @@ noinst_HEADERS = \
 	util/validate.h \
 	util/var.h \
 	util/var-name.h \
-	win32-misc.h \
-	win32-service.h \
-	win32-syscall.h \
-	win32-syslog.h
+	windows/win32-misc.h \
+	windows/win32-service.h \
+	windows/win32-syscall.h \
+	windows/win32-syslog.h
 
 libsuricata_c_a_SOURCES = \
 	alert-debuglog.c \
@@ -1225,9 +1225,9 @@ libsuricata_c_a_SOURCES = \
 	util/unittest-helper.c \
 	util/var.c \
 	util/var-name.c \
-	win32-misc.c \
-	win32-service.c \
-	win32-syscall.c
+	windows/win32-misc.c \
+	windows/win32-service.c \
+	windows/win32-syscall.c
 
 EXTRA_DIST = \
 	tests/stream-tcp-inline.c \

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
@@ -115,7 +115,7 @@
 #include "decode-vxlan.h"
 
 #ifdef OS_WIN32
-#include "win32-syscall.h"
+#include "windows/win32-syscall.h"
 #endif
 
 #ifdef WINDIVERT

diff --git a/src/source-windivert.c b/src/source-windivert.c
@@ -88,7 +88,7 @@ TmEcode NoWinDivertSupportExit(ThreadVars *tv, const void *initdata, void **data
 
 #else /* implied we do have WinDivert support */
 #include "action-globals.h"
-#include "win32-syscall.h"
+#include "windows/win32-syscall.h"
 
 typedef struct WinDivertThreadVars_ {
     WinDivertHandle filter_handle;

diff --git a/src/suricata-common.h b/src/suricata-common.h
@@ -155,13 +155,13 @@ typedef unsigned char u_char;
 #include <syslog.h>
 #else
 #ifdef OS_WIN32
-#include "win32-syslog.h"
+#include "windows/win32-syslog.h"
 #endif /* OS_WIN32 */
 #endif /* HAVE_SYSLOG_H */
 
 #ifdef OS_WIN32
-#include "win32-misc.h"
-#include "win32-service.h"
+#include "windows/win32-misc.h"
+#include "windows/win32-service.h"
 #endif /* OS_WIN32 */
 
 #if HAVE_SYS_TIME_H

diff --git a/src/suricata.c b/src/suricata.c
@@ -147,7 +147,7 @@
 
 #ifdef WINDIVERT
 #include "decode-sll.h"
-#include "win32-syscall.h"
+#include "windows/win32-syscall.h"
 #endif
 
 /*

diff --git a/src/util/ioctl.c b/src/util/ioctl.c
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef OS_WIN32
-#include "win32-syscall.h"
+#include "windows/win32-syscall.h"
 #endif
 
 /**

diff --git a/src/win32-misc.c → src/windows/win32-misc.c b/src/win32-misc.c → src/windows/win32-misc.c
@@ -26,7 +26,7 @@
 #ifdef OS_WIN32
 
 #include "suricata-common.h"
-#include "win32-misc.h"
+#include "windows/win32-misc.h"
 #include "direct.h"
 #include "util/ip.h"
 

diff --git a/src/win32-misc.h → src/windows/win32-misc.h b/src/win32-misc.h → src/windows/win32-misc.h
diff --git a/src/win32-service.c → src/windows/win32-service.c b/src/win32-service.c → src/windows/win32-service.c
@@ -27,7 +27,7 @@
 
 #include "suricata-common.h"
 #include "suricata.h"
-#include "win32-service.h"
+#include "windows/win32-service.h"
 #include "util/debug.h"
 
 static SERVICE_STATUS_HANDLE service_status_handle = 0;

diff --git a/src/win32-service.h → src/windows/win32-service.h b/src/win32-service.h → src/windows/win32-service.h
diff --git a/src/win32-syscall.c → src/windows/win32-syscall.c b/src/win32-syscall.c → src/windows/win32-syscall.c
@@ -59,7 +59,7 @@
 
 #include "suricata.h"
 
-#include "win32-syscall.h"
+#include "windows/win32-syscall.h"
 
 /**
  * \brief return only the GUID portion of the name

diff --git a/src/win32-syscall.h → src/windows/win32-syscall.h b/src/win32-syscall.h → src/windows/win32-syscall.h
diff --git a/src/win32-syslog.h → src/windows/win32-syslog.h b/src/win32-syslog.h → src/windows/win32-syslog.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ @@
     #endif
     #ifdef OS_WIN32
-    #include "win32-syscall.h"
+    #include "windows/win32-syscall.h"
     #endif
     /**
@@ Expand Down @@