fix bugs for Swift 6

awslabs · Aug 20, 2024 · 2b95d25 · 2b95d25
1 parent 26be737
commit 2b95d25
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 42 deletions.
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,11 @@ var package = Package(name: "aws-crt-swift",
 )
 
 let cSettings: [CSetting] = [
-    .define("DEBUG_BUILD", .when(configuration: .debug))
+    .define("DEBUG_BUILD", .when(configuration: .debug)),
+/* Disable Intel VTune tracing API here since aws-crt-swift doesn't use CMake */
+    .define("INTEL_NO_ITTNOTIFY_API"),
+/* Don't use APIs forbidden by App Stores (e.g. non-public system APIs) */
+    .defien("AWS_APPSTORE_SAFE"),
 ]
 
 //////////////////////////////////////////////////////////////////////

diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth
diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal
diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common
diff --git a/aws-common-runtime/aws-c-event-stream b/aws-common-runtime/aws-c-event-stream
diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http
diff --git a/aws-common-runtime/config/aws/common/config.h b/aws-common-runtime/config/aws/common/config.h
@@ -1,48 +1,19 @@
-#ifdef __APPLE__
-#    include <TargetConditionals.h>
-#endif
-
-#ifndef AWS_COMMON_CONFIG_H
-#    define AWS_COMMON_CONFIG_H
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
  */
+
+#ifndef AWS_COMMON_CONFIG_H
+#define AWS_COMMON_CONFIG_H
 /*
  * This header exposes compiler feature test results determined during cmake
  * configure time to inline function implementations. The macros defined here
  * should be considered to be an implementation detail, and can change at any
  * time.
  */
-#    if TARGET_OS_IPHONE
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    elif TARGET_OS_SIMULATOR
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    elif TARGET_OS_MAC
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    endif
-#else
-#    define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#    define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#    define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#endif
+#define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
+#define AWS_HAVE_GCC_INLINE_ASM
 #define AWS_UNSTABLE_TESTING_API 1
-
 #define AWS_AFFINITY_METHOD 0
-
 #define AWS_HAVE_EXECINFO 1
-/* Disable Intel VTune tracing API here since aws-crt-swift doesn't use CMake */
-#define INTEL_NO_ITTNOTIFY_API
-
-/* Don't use APIs forbidden by App Stores (e.g. non-public system APIs) */
-#define AWS_APPSTORE_SAFE 1
+#endif
diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n