hide dispatch_queue.h

awslabs · Nov 11, 2024 · 145e7d7 · 145e7d7
1 parent c408e30
commit 145e7d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/source/darwin/nw_socket.c b/source/darwin/nw_socket.c
@@ -12,12 +12,13 @@
 #include <aws/io/private/event_loop_impl.h>
 
 #include <Network/Network.h>
-#include <aws/io/private/dispatch_queue.h>
 #include <aws/io/private/tls_channel_handler_shared.h>
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
+#include "dispatch_queue.h"
+
 static int s_determine_socket_error(int error) {
     switch (error) {
         case ECONNREFUSED:

diff --git a/source/darwin/secure_transport_tls_channel_handler.c b/source/darwin/secure_transport_tls_channel_handler.c
@@ -6,7 +6,6 @@
 
 #include <aws/io/channel.h>
 #include <aws/io/file_utils.h>
-#include <aws/io/private/dispatch_queue.h>
 #include <aws/io/private/pki_utils.h>
 #include <aws/io/private/tls_channel_handler_shared.h>
 #include <aws/io/statistics.h>
@@ -25,6 +24,8 @@
 #include <dlfcn.h>
 #include <math.h>
 
+#include "dispatch_queue.h"
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"

diff --git a/source/windows/iocp/socket.c b/source/windows/iocp/socket.c
@@ -456,7 +456,6 @@ int aws_socket_init_winsock(
 
     return err;
 }
-#endif // AWS_USE_IO_COMPLETION_PORTS
 
 static void s_socket_clean_up(struct aws_socket *socket) {
     if (!socket->impl) {

diff --git a/tests/socket_test.c b/tests/socket_test.c
@@ -687,7 +687,7 @@ static int s_test_socket_with_bind_to_invalid_interface(struct aws_allocator *al
     options.domain = AWS_SOCKET_IPV4;
     strncpy(options.network_interface_name, "invalid", AWS_NETWORK_INTERFACE_NAME_MAX);
     struct aws_socket outgoing;
-#if (defined(AWS_OS_APPLE) && defined(AWS_USE_KQUEUE)) || defined(AWS_OS_LINUX)
+#if (defined(AWS_OS_APPLE) && !defined(AWS_USE_APPLE_NETWORK_FRAMEWORK)) || defined(AWS_OS_LINUX)
     ASSERT_ERROR(AWS_IO_SOCKET_INVALID_OPTIONS, aws_socket_init(&outgoing, allocator, &options));
 #else
     ASSERT_ERROR(AWS_ERROR_PLATFORM_NOT_SUPPORTED, aws_socket_init(&outgoing, allocator, &options));