From 2e8f61cd9117ecadeedce3ed1066d294fdf8f02e Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 17 Apr 2026 18:37:07 -0500 Subject: [PATCH 1/3] Remove private in6 header includes Remove the dead netinet6/in6.h imports from ODWReachability and its Objective-C unit test so Apple builds no longer fail on the private-header error from main. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- tests/unittests/obj-c/ODWReachabilityTests.mm | 1 - third_party/Reachability/ODWReachability.m | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/unittests/obj-c/ODWReachabilityTests.mm b/tests/unittests/obj-c/ODWReachabilityTests.mm index 501a3be7a..f43200cd8 100644 --- a/tests/unittests/obj-c/ODWReachabilityTests.mm +++ b/tests/unittests/obj-c/ODWReachabilityTests.mm @@ -13,7 +13,6 @@ #import #import -#import #import #import #import diff --git a/third_party/Reachability/ODWReachability.m b/third_party/Reachability/ODWReachability.m index 0e13591d5..49799827b 100644 --- a/third_party/Reachability/ODWReachability.m +++ b/third_party/Reachability/ODWReachability.m @@ -29,7 +29,6 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF #import #import -#import #import #import #import From 24ec59bda28d7dd893cd9129516fe5bfce6adf9d Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Mon, 20 Apr 2026 00:46:41 -0500 Subject: [PATCH 2/3] Remove dead reachability imports Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- tests/unittests/obj-c/ODWReachabilityTests.mm | 5 ----- third_party/Reachability/ODWReachability.m | 5 ----- 2 files changed, 10 deletions(-) diff --git a/tests/unittests/obj-c/ODWReachabilityTests.mm b/tests/unittests/obj-c/ODWReachabilityTests.mm index f43200cd8..4f211d921 100644 --- a/tests/unittests/obj-c/ODWReachabilityTests.mm +++ b/tests/unittests/obj-c/ODWReachabilityTests.mm @@ -11,12 +11,7 @@ #import #import "ODWReachability.h" -#import -#import #import -#import -#import -#import @interface ODWReachabilityTests : XCTestCase @end diff --git a/third_party/Reachability/ODWReachability.m b/third_party/Reachability/ODWReachability.m index 49799827b..84eb8767c 100644 --- a/third_party/Reachability/ODWReachability.m +++ b/third_party/Reachability/ODWReachability.m @@ -27,12 +27,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF #import "ODWReachability.h" -#import -#import #import -#import -#import -#import NSString *const kNetworkReachabilityChangedNotification = @"NetworkReachabilityChangedNotification"; From 772637914c48ef4b6a0535e37600497e57438151 Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 24 Apr 2026 09:16:11 -0500 Subject: [PATCH 3/3] Restore explicit reachability socket headers Add back the canonical sys/socket.h and netinet/in.h includes in ODWReachability.m and ODWReachabilityTests.mm while keeping the other dead imports removed. This avoids relying on transitive Apple headers in the reachability PR review. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- tests/unittests/obj-c/ODWReachabilityTests.mm | 3 ++- third_party/Reachability/ODWReachability.m | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unittests/obj-c/ODWReachabilityTests.mm b/tests/unittests/obj-c/ODWReachabilityTests.mm index 4f211d921..cc8a7c24e 100644 --- a/tests/unittests/obj-c/ODWReachabilityTests.mm +++ b/tests/unittests/obj-c/ODWReachabilityTests.mm @@ -11,6 +11,8 @@ #import #import "ODWReachability.h" +#import +#import #import @interface ODWReachabilityTests : XCTestCase @@ -104,4 +106,3 @@ - (void)testReachabilityForLocalWiFi } @end - diff --git a/third_party/Reachability/ODWReachability.m b/third_party/Reachability/ODWReachability.m index 84eb8767c..7947f7df0 100644 --- a/third_party/Reachability/ODWReachability.m +++ b/third_party/Reachability/ODWReachability.m @@ -27,6 +27,8 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF #import "ODWReachability.h" +#import +#import #import