Skip to content

Remove dead headers #1427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmehta001 merged 5 commits into from
Apr 29, 2026
+0 −9
Merged

Remove dead headers #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e8f61c
Remove private in6 header includes
bmehta001 Apr 17, 2026
24ec59b
Remove dead reachability imports
bmehta001 Apr 20, 2026
7726379
Restore explicit reachability socket headers
bmehta001 Apr 24, 2026
2958618
Merge branch 'main' into bhamehta/issue-1418-main
bmehta001 Apr 25, 2026
0749d57
Merge branch 'main' into bhamehta/issue-1418-main
bmehta001 Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions tests/unittests/obj-c/ODWReachabilityTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@

#import <sys/socket.h>
Copy link
Copy Markdown
Contributor

@ThomsonTan ThomsonTan Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The netinet6/in6.h removal fixes #1418, but this file still uses struct sockaddr_in, AF_INET, IN_LINKLOCALNETNUM, and htonl, whose canonical headers are /.

Copy link
Copy Markdown
Contributor Author

@bmehta001 bmehta001 Apr 25, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was relying on headers being brought transitively (arpa/inet.h brings in netinet/in.h and ODWReachability.h brings in SystemConfiguration, which brings in sys/socket.h), so had removed the headers, but I am now reverting that changes to keep the canonical header files where these are defined explicit. I will now only use this PR to remove dead headers.

#import <netinet/in.h>
#import <netinet6/in6.h>
#import <arpa/inet.h>
#import <ifaddrs.h>
#import <netdb.h>
#import <Foundation/Foundation.h>

@interface ODWReachabilityTests : XCTestCase
@end
Expand Down Expand Up @@ -110,4 +106,3 @@ - (void)testReachabilityForLocalWiFi
}

@end

4 changes: 0 additions & 4 deletions third_party/Reachability/ODWReachability.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

#import <sys/socket.h>
Comment thread
bmehta001 marked this conversation as resolved.
#import <netinet/in.h>
#import <netinet6/in6.h>
#import <arpa/inet.h>
#import <ifaddrs.h>
#import <netdb.h>
#import <Foundation/Foundation.h>


NSString *const kNetworkReachabilityChangedNotification = @"NetworkReachabilityChangedNotification";
Expand Down
Loading