windows: fix yqlworker build

7 files changed, 54 insertions, 34 deletions

diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-arm64.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-arm64.txt
index 64d2a9dee3..1608401534 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-arm64.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-arm64.txt
@@ -49,12 +49,7 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_lib.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_tls_op_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pki_utils.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/retry_strategy.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/socket_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/standard_retry_strategy.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/statistics.c
@@ -62,4 +57,9 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler_shared.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/bsd/kqueue_event_loop.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
 )
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
index 64d2a9dee3..1608401534 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
@@ -49,12 +49,7 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_lib.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_tls_op_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pki_utils.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/retry_strategy.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/socket_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/standard_retry_strategy.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/statistics.c
@@ -62,4 +57,9 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler_shared.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/bsd/kqueue_event_loop.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
 )
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.linux-aarch64.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-aarch64.txt
index 859d5769a1..be76545271 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-aarch64.txt
@@ -50,12 +50,7 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_lib.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_tls_op_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pki_utils.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/retry_strategy.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/socket_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/standard_retry_strategy.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/statistics.c
@@ -63,4 +58,9 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler_shared.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/linux/epoll_event_loop.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
 )
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
index 859d5769a1..be76545271 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
@@ -50,12 +50,7 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_lib.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_tls_op_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pki_utils.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/retry_strategy.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/socket_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/standard_retry_strategy.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/statistics.c
@@ -63,4 +58,9 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/tls_channel_handler_shared.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/linux/epoll_event_loop.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
 )
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.windows-x86_64.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.windows-x86_64.txt
index 7c1b0626c2..f353ab49e0 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.windows-x86_64.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.windows-x86_64.txt
@@ -25,7 +25,9 @@ target_compile_options(restricted-aws-aws-c-io PRIVATE
   -DS2N_MADVISE_SUPPORTED
   -DS2N_STACKTRACE
   -DS2N___RESTRICT__SUPPORTED
-  -DUSE_S2N
+  -DAWS_IO_EXPORTS
+  -DAWS_USE_IO_COMPLETION_PORTS
+  -std=c99
   $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
 )
 target_include_directories(restricted-aws-aws-c-io PUBLIC
@@ -34,7 +36,6 @@ target_include_directories(restricted-aws-aws-c-io PUBLIC
 target_link_libraries(restricted-aws-aws-c-io PUBLIC
   restricted-aws-aws-c-cal
   restricted-aws-aws-c-common
-  restricted-aws-s2n
 )
 target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/alpn_handler.c
@@ -49,12 +50,7 @@ target_sources(restricted-aws-aws-c-io PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_lib.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pkcs11_tls_op_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/pki_utils.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/host_resolver.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/pipe.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/shared_library.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/posix/socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/retry_strategy.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/s2n/s2n_tls_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/socket_channel_handler.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/standard_retry_strategy.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-io/source/statistics.c
diff --git a/contrib/restricted/aws/aws-c-io/include/aws/io/private/pki_utils.h b/contrib/restricted/aws/aws-c-io/include/aws/io/private/pki_utils.h
index feb8d65ce9..ec1c2c62b2 100644
--- a/contrib/restricted/aws/aws-c-io/include/aws/io/private/pki_utils.h
+++ b/contrib/restricted/aws/aws-c-io/include/aws/io/private/pki_utils.h
@@ -10,6 +10,7 @@
 /* It's ok to include external headers because this is a PRIVATE header file
  * (it is usually a crime to include windows.h from header file) */
 #    include <Windows.h>
+#    include <Wincrypt.h>
 #endif /* _WIN32 */
 
 #ifdef AWS_OS_APPLE
diff --git a/contrib/restricted/aws/aws-c-io/ya.make b/contrib/restricted/aws/aws-c-io/ya.make
index e8c6309246..f34f5a86f8 100644
--- a/contrib/restricted/aws/aws-c-io/ya.make
+++ b/contrib/restricted/aws/aws-c-io/ya.make
@@ -16,7 +16,6 @@ ORIGINAL_SOURCE(https://github.com/awslabs/aws-c-io/archive/v0.13.21.tar.gz)
 PEERDIR(
     contrib/restricted/aws/aws-c-cal
     contrib/restricted/aws/aws-c-common
-    contrib/restricted/aws/s2n
 )
 
 ADDINCL(
@@ -44,9 +43,28 @@ CFLAGS(
     -DS2N_MADVISE_SUPPORTED
     -DS2N_STACKTRACE
     -DS2N___RESTRICT__SUPPORTED
-    -DUSE_S2N
 )
 
+IF (CLANG_CL)
+    CFLAGS(
+        -DAWS_IO_EXPORTS
+        -DAWS_USE_IO_COMPLETION_PORTS
+        -std=c99
+    )
+ELSEIF (OS_WINDOWS)
+    CFLAGS(
+        -DAWS_IO_EXPORTS
+        -DAWS_USE_IO_COMPLETION_PORTS
+    )
+ELSE()
+    PEERDIR(
+        contrib/restricted/aws/s2n
+    )
+    CFLAGS(
+        -DUSE_S2N
+    )
+ENDIF()
+
 SRCS(
     source/alpn_handler.c
     source/channel.c
@@ -60,12 +78,7 @@ SRCS(
     source/pkcs11_lib.c
     source/pkcs11_tls_op_handler.c
     source/pki_utils.c
-    source/posix/host_resolver.c
-    source/posix/pipe.c
-    source/posix/shared_library.c
-    source/posix/socket.c
     source/retry_strategy.c
-    source/s2n/s2n_tls_channel_handler.c
     source/socket_channel_handler.c
     source/standard_retry_strategy.c
     source/statistics.c
@@ -77,10 +90,20 @@ SRCS(
 IF (OS_DARWIN)
     SRCS(
         source/bsd/kqueue_event_loop.c
+        source/posix/host_resolver.c
+        source/posix/pipe.c
+        source/posix/shared_library.c
+        source/posix/socket.c
+        source/s2n/s2n_tls_channel_handler.c
     )
 ELSEIF (OS_LINUX)
     SRCS(
         source/linux/epoll_event_loop.c
+        source/posix/host_resolver.c
+        source/posix/pipe.c
+        source/posix/shared_library.c
+        source/posix/socket.c
+        source/s2n/s2n_tls_channel_handler.c
     )
 ENDIF()