Skip to content

Base: reorder includes for Windows (NFCI) #2623

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.

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
merged 1 commit into from
Jan 21, 2020
Merged

Conversation

compnerd
Copy link
Member

This reorders the Windows header includes for LARGE_INTEGER after
PR #2612.

This reorders the Windows header includes for `LARGE_INTEGER` after
PR swiftlang#2612.
@compnerd
Copy link
Member Author

CC: @3405691582

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@compnerd
Copy link
Member Author

#define FD_SETSIZE 1024
#include <winsock2.h>
#include <windows.h>
#include <time.h>
Copy link
Member

@3405691582 3405691582 Jan 21, 2020

Choose a reason for hiding this comment

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

Don't forget time.h is included adjacent to mach_absolute_time.

(Not sure if you need to redef BOOL for time.h, or whether it's just simpler to include time.h twice here.)

Copy link
Member Author

Choose a reason for hiding this comment

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

That needed to be shuffled due to the inclusion of Windows.h.

Copy link
Member

Choose a reason for hiding this comment

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

What I mean is: can you omit it here again, considering now time.h is included a second time below windows.h, or is there some other reason preventing that?

Copy link
Member Author

Choose a reason for hiding this comment

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

oh, I see; I'll do that as a follow up. The time.h was moved since it was in the block.

@3405691582
Copy link
Member

Optionally, it might be nice to bring up the boolean_t changes below into this block, but that might also be better to do in a separate PR sometime later down the line.

@compnerd compnerd merged commit cb63536 into swiftlang:master Jan 21, 2020
@compnerd compnerd deleted the 2616 branch January 21, 2020 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants