Replace @windowsxp_only macro with runtime check #11133
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -56,11 +56,3 @@ end | |||
| @unix_only windows_version() = (0,0) | |||
|
|
|||
| WINDOWS_XP_VER = (5,1) | |||
There was a problem hiding this comment.
(5,2) is also a Windows XP version (Vista started with 6.0)
https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
seems like a pre-existing bug, but maybe better to compare against WINDOWS_VISTA_VER?
There was a problem hiding this comment.
Oh, no kidding, guess my wine thinks it's either server 2003 or xp 64. I don't have either of those handy aside from in Wine, so I think comparing to vista does make sense. Will change that.
XP 64 or Server 2003 are version 5.2, apparently
|
Merging. @vtjnash I trust you'll open a new issue and/or let me know if there are any other problems with this. |
tkelman
added a commit
that referenced
this pull request
May 6, 2015
Replace @windowsxp_only macro with runtime check
|
looked good. i was assuming you would hit merge when travis finished. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #11108