curl.test.patch test improve patch with auto-detection 2

curl · Nov 7, 2024 · ffaece6 · ffaece6
1 parent 66cc851
commit ffaece6
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/curl.test.patch b/curl.test.patch
@@ -179,7 +179,7 @@ index e8be5d0ccd9104..804cdebc648032 100644
     that started advertising the `availability` attribute, which then gets used
     by Apple SDK, but, in a way incompatible with gcc, resulting in misc errors
     inside SDK headers, e.g.:
-@@ -51,12 +51,19 @@
+@@ -51,14 +51,23 @@
              definition
       error: expected ',' or '}' before
     Followed by missing declarations.
@@ -194,14 +194,18 @@ index e8be5d0ccd9104..804cdebc648032 100644
 +   fail.
 +   Fixed upstream in 14.2.0_1. Disable the workaround if the fix is detected.
 + */
-+#if defined(__APPLE__) &&                            \
-+  !defined(__clang__) &&                             \
-+  !defined(CURL_NO_APPLE_AVAILABILITY_WORKAROUND) && \
-+  defined(__GNUC__) &&                               \
-+  defined(__has_attribute) &&                        \
-+  (defined(CURL_APPLE_AVAILABILITY_WORKAROUND) ||    \
-+   !defined(__has_feature) ||                        \
-+   !__has_feature(attribute_availability))
++#if defined(__APPLE__) &&                          \
++  !defined(__clang__) &&                           \
++  defined(__GNUC__) &&                             \
++  defined(__has_attribute) &&                      \
++  !defined(CURL_NO_APPLE_AVAILABILITY_WORKAROUND)
++/* Separate #if to make it compile with some non-Apple gcc compilers */
++#if defined(CURL_APPLE_AVAILABILITY_WORKAROUND) || \
++  !defined(__has_feature) ||                       \
++  !__has_feature(attribute_availability)
  #define availability curl_pp_attribute_disabled
  #endif
++#endif
 
+ #if defined(__APPLE__)
+ #include <sys/types.h>