From a47fd449451b479be54ac7d7d7cb7a1c46cdba81 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Fri, 4 Oct 2024 13:51:03 -0700 Subject: [PATCH 1/2] remove platform.h --- include/aws/io/platform.h | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 include/aws/io/platform.h diff --git a/include/aws/io/platform.h b/include/aws/io/platform.h deleted file mode 100644 index 749eee60a..000000000 --- a/include/aws/io/platform.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0. - */ - -#ifndef AWS_IO_PLATFORM_H -#define AWS_IO_PLATFORM_H - -/* iOS and tvOS should use both AWS_USE_DISPATCH_QUEUE and AWS_USE_SECITEM. */ -#if defined(AWS_OS_IOS) || defined(AWS_OS_TVOS) -# define AWS_USE_DISPATCH_QUEUE -# define AWS_USE_SECITEM -#endif /* AWS_OS_IOS || AWS_OS_TVOS */ - -/* macOS can use either kqueue or dispatch queue but defaults to AWS_USE_KQUEUE unless explicitly - * instructed otherwise. In the event that AWS_USE_DISPATCH_QUEUE is defined on macOS, it will take - * precedence over AWS_USE_KQUEUE */ -#if defined(AWS_OS_MACOS) -# define AWS_USE_KQUEUE -#endif /* AWS_OS_MACOS */ - -#endif /* AWS_IO_PLATFORM_H */ From b4cd99351bce1d43a3ac0a5a5726c5f42e08112b Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Fri, 4 Oct 2024 13:53:49 -0700 Subject: [PATCH 2/2] remove platform.h --- include/aws/io/event_loop.h | 1 - include/aws/io/io.h | 1 - source/darwin/dispatch_queue_event_loop.c | 24 +++++++++++------------ source/event_loop.c | 1 - tests/event_loop_test.c | 1 - 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/aws/io/event_loop.h b/include/aws/io/event_loop.h index fa8fa8c14..e021ab4b5 100644 --- a/include/aws/io/event_loop.h +++ b/include/aws/io/event_loop.h @@ -9,7 +9,6 @@ #include #include #include -#include #include diff --git a/include/aws/io/io.h b/include/aws/io/io.h index 966ff4612..832a46b21 100644 --- a/include/aws/io/io.h +++ b/include/aws/io/io.h @@ -9,7 +9,6 @@ #include #include #include -#include AWS_PUSH_SANE_WARNING_LEVEL diff --git a/source/darwin/dispatch_queue_event_loop.c b/source/darwin/dispatch_queue_event_loop.c index f1a019321..237f60eb6 100644 --- a/source/darwin/dispatch_queue_event_loop.c +++ b/source/darwin/dispatch_queue_event_loop.c @@ -2,25 +2,23 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0. */ -#include - #ifdef AWS_USE_DISPATCH_QUEUE -#include +# include -#include -#include -#include -#include +# include +# include +# include +# include -#include +# include -#include +# include -#include -#include -#include -#include +# include +# include +# include +# include static void s_destroy(struct aws_event_loop *event_loop); static int s_run(struct aws_event_loop *event_loop); diff --git a/source/event_loop.c b/source/event_loop.c index d45ff1ec2..e8b04e254 100644 --- a/source/event_loop.c +++ b/source/event_loop.c @@ -9,7 +9,6 @@ #include #include #include -#include #ifdef __APPLE__ // DEBUG WIP we may need to wrap this for iOS specific diff --git a/tests/event_loop_test.c b/tests/event_loop_test.c index 4bf0973d8..02e081ab3 100644 --- a/tests/event_loop_test.c +++ b/tests/event_loop_test.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include