jdk8u-dev
jdk8u-dev copied to clipboard
8337312: [8u] Windows x86 VS2010 build broken by JDK-8320097
Attempt to fix 8337312 using the same logic from jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h:
/// Properly define some macros to accommodate
/// older MSVC versions.
# if defined(_MSC_VER) && _MSC_VER <= 1700
#include <float.h>
#define isnan _isnan
#define isinf(x) (!_finite((x)))
# endif
Progress
- [x] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8337312 needs maintainer approval
Issue
- JDK-8337312: [8u] Windows x86 VS2010 build broken by JDK-8320097 (Bug - P4 - Requested)
Reviewers
- Paul Hohensee (@phohensee - Reviewer)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/555/head:pull/555
$ git checkout pull/555
Update a local copy of the PR:
$ git checkout pull/555
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/555/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 555
View PR using the GUI difftool:
$ git pr show -t 555
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/555.diff
Webrev
:wave: Welcome back andrew! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
@gnu-andrew This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
8337312: [8u] Windows x86 VS2010 build broken by JDK-8320097
Reviewed-by: phh
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.
At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.
➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.
⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.
Thanks Paul for the review.
/approval request Fixes Windows x86_32 build with VS2010 which was broken by a security patch. The fix is just to borrow some logic from LCMS 2, which already builds on this platform with the isnan and isinf functions. The patch was reviewed by Paul Hohensee.
@gnu-andrew 8337312: The approval request has been created successfully.
/integrate
Going to push as commit b4fc8e711c5953823e687f8cc133aac5e8fdd577.
Since your change was applied there have been 3 commits pushed to the master branch:
- 09bab6e4c31531975ab6461832d4618dc9759ca9: 8145919: sun/management/jmxremote/bootstrap/RmiSslBootstrapTest failed with Connection failed for no credentials
- d4adbe339c3dd09a7f431da2c909b03560c6579e: 8152207: Perform array bound checks while getting a length of bytecode instructions
- 047b08a891d837efb925448b6334679f772ef0e5: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16
Your commit was automatically rebased without conflicts.
@gnu-andrew Pushed as commit b4fc8e711c5953823e687f8cc133aac5e8fdd577.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.