FIx various build errors

Signed-off-by: Dave Thaler <dthaler@microsoft.com>

.clang-format

@@ -42,6 +42,10 @@ IncludeCategories:
   - Regex: '^<(ws2def|ws2ipdef).h>'
     Priority: 2
     SortPriority: 3
+  # ws2tcpip.h must be before mstcpip.h
+  - Regex: '^<ws2tcpip.h>'
+    Priority: 2
+    SortPriority: 3
   - Regex: '^(<|")ElfWrapper.h'
     Priority: 2
     SortPriority: 4

ebpfapi/ebpfapi.vcxproj

@@ -102,7 +102,6 @@
     <ClInclude Include="..\libs\api\platform.h">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </ClInclude>
-    <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

ebpfapi/ebpfapi.vcxproj.filters

@@ -19,9 +19,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\libs\api\platform.h">
       <Filter>Header Files</Filter>
     </ClInclude>

include/bpf/bpf_legacy.h

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
+#include "libbpf.h"
+
 #pragma warning(push)
 #pragma warning(disable : 4201) // nonstandard extension used: nameless struct/union
 

include/bpf_helpers_platform.h

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
-// This file contains platform-specific defines used by eBPF programs.
+/**
+ * @file
+ * @brief This file contains platform - specific defines used by eBPF programs.
+ */
+
+#include <stdint.h>
 
 // For eBPF programs, struct bpf_map means struct _ebpf_map_definition_in_file,
 // since they use inner_map_idx and pass pointers to such structures to the various

include/ebpf_structs.h

@@ -13,6 +13,10 @@
 #if !defined(NO_CRT)
 #include <stdbool.h>
 #include <stdint.h>
+#else
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
 #endif
 
 #define BPF_ENUM_TO_STRING(X) #X

include/ebpf_windows.h

@@ -5,6 +5,11 @@
 #ifdef _MSC_VER
 #include <guiddef.h>
 #else
+#if !defined(NO_CRT)
+#include <stdint.h>
+#else
+typedef unsigned char uint8_t;
+#endif
 typedef uint8_t GUID[16];
 #endif
 

libs/ebpfnetsh/links.h

@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
+#include <windows.h>
+#include <netsh.h>
+
 #ifdef __cplusplus
 extern "C"
 {

libs/ebpfnetsh/maps.h

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
+#include <windows.h>
 #include <netsh.h>
 
 #ifdef __cplusplus

libs/ebpfnetsh/programs.h

@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
+#include <windows.h>
+#include <netsh.h>
+
 #ifdef __cplusplus
 extern "C"
 {

tests/libs/util/socket_helper.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 /**
+ * @file
  * @brief Utility class and functions for doing socket I/O.
  */
 

tests/libs/util/socket_helper.h

@@ -9,10 +9,10 @@
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <Mswsock.h>
 #include <mstcpip.h>
 #include <netiodef.h>
-#include <ws2tcpip.h>
 
 #define CLIENT_MESSAGE "request from client"
 #define SERVER_MESSAGE "response from server"