8348892: Properly fix compilation error for zip_util.c on Windows

[alexeysemenyukoracle]

Reapply JDK-8348348

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8348892: Properly fix compilation error for zip_util.c on Windows (Sub-task - P2) ⚠️ Issue is already resolved. Consider making this a "backport pull request" by setting the PR title to Backport <hash> with the hash of the original commit. See Backports.

Reviewers

• Kevin Rushforth (@kevinrushforth - Author)
• Jiangli Zhou (@jianglizhou - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23344/head:pull/23344
$ git checkout pull/23344

Update a local copy of the PR:
$ git checkout pull/23344
$ git pull https://git.openjdk.org/jdk.git pull/23344/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23344

View PR using the GUI difftool:
$ git pr show -t 23344

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23344.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back asemenyuk! 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.

[openjdk]

@alexeysemenyukoracle This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8348892: Properly fix compilation error for zip_util.c on Windows

Reviewed-by: kcr, jiangli

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.

[openjdk]

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

• core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[alexeysemenyukoracle]

@jianglizhou, @jerboaa, @kevinrushforth please review. This PR will be integrated after integrating a patch to the closed Oracle JDK build so it will not result in the build failure as it happened to JDK-8348348.

[kevinrushforth]

This looks good. I confirm that this is the correct backout patch for JDK-8348888, thus restoring the fix for JDK-8348348.

[kevinrushforth]

@jianglizhou Can you also review?

[mlbridge]

Webrevs

• 00: Full (bef6ddbe)

[jianglizhou]

Looks good.

@alexeysemenyukoracle, Is the actual change addressing the compilation issue in closed repo? If so, is it to properly add -Zc:preprocessor?

[alexeysemenyukoracle]

Is the actual change addressing the compilation issue in closed repo?

Yes.

If so, is it to properly add -Zc:preprocessor?

No. The fix was to add missing DEF_STATIC_JNI_OnLoad define.

[alexeysemenyukoracle]

/integrate

[openjdk]

Going to push as commit 5e81fa6.

[openjdk]

@alexeysemenyukoracle Pushed as commit 5e81fa6.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.