Skip to content
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

8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5 #3808

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Apr 30, 2021

The new XCode does not like the cast of NULL to the UInt32. The fix replaces NULL with zero.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3808/head:pull/3808
$ git checkout pull/3808

Update a local copy of the PR:
$ git checkout pull/3808
$ git pull https://git.openjdk.java.net/jdk pull/3808/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3808

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3808.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 30, 2021

👋 Welcome back serb! 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
Copy link

openjdk bot commented Apr 30, 2021

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

  • sound

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.

@openjdk openjdk bot added the sound client-libs-dev@openjdk.org label Apr 30, 2021
@mrserb mrserb marked this pull request as ready for review April 30, 2021 23:07
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 30, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 30, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 30, 2021

@mrserb 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:

8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

Reviewed-by: prr, azvegint

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 17 new commits pushed to the master branch:

  • 5c083e8: 8266129: tools/jpackage/windows/WinInstallerIconTest.java hangs with fastdebug
  • 3e667cc: 8265356: need code example for getting canonical constructor of a Record
  • f86b70c: 8266328: C2: Remove InlineWarmCalls
  • 928d632: 8252237: C2: Call to compute_separating_interferences has wrong argument order
  • 50fa162: 8266389: ProblemList java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on generic-all
  • dd05158: 8266155: Convert java.base to use Stream.toList()
  • c36c63a: 8260560: convert jdeps and jdeprscan tools to use Stream.toList()
  • 096e9e5: 8266318: Switch to macos prefix for macOS bundles
  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/51b218842f001f1c4fd5ca7a02a2ba21e9e8a82c...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 openjdk bot added the ready Pull request is ready to be integrated label Apr 30, 2021
@mrserb
Copy link
Member Author

mrserb commented May 2, 2021

/integrate

@openjdk openjdk bot closed this May 2, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 2, 2021
@mrserb mrserb deleted the JDK-8266248 branch May 2, 2021 05:29
@openjdk
Copy link

openjdk bot commented May 2, 2021

@mrserb Since your change was applied there have been 17 commits pushed to the master branch:

  • 5c083e8: 8266129: tools/jpackage/windows/WinInstallerIconTest.java hangs with fastdebug
  • 3e667cc: 8265356: need code example for getting canonical constructor of a Record
  • f86b70c: 8266328: C2: Remove InlineWarmCalls
  • 928d632: 8252237: C2: Call to compute_separating_interferences has wrong argument order
  • 50fa162: 8266389: ProblemList java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on generic-all
  • dd05158: 8266155: Convert java.base to use Stream.toList()
  • c36c63a: 8260560: convert jdeps and jdeprscan tools to use Stream.toList()
  • 096e9e5: 8266318: Switch to macos prefix for macOS bundles
  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/51b218842f001f1c4fd5ca7a02a2ba21e9e8a82c...master

Your commit was automatically rebased without conflicts.

Pushed as commit dedddd5.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated sound client-libs-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants