Skip to content

Commit

Permalink
8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with …
Browse files Browse the repository at this point in the history 
…Xcode 12.5

Reviewed-by: prr, azvegint
  • Loading branch information
@mrserb
mrserb committed May 2, 2021
1 parent 5c083e8 commit dedddd5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -255,9 +255,9 @@ INT32 MIDI_Utils_GetDeviceVersion(int direction, INT32 deviceID, char *name, UIN
}


static MIDIClientRef client = (MIDIClientRef) NULL;
static MIDIPortRef inPort = (MIDIPortRef) NULL;
static MIDIPortRef outPort = (MIDIPortRef) NULL;
static MIDIClientRef client = (MIDIClientRef) 0;
static MIDIPortRef inPort = (MIDIPortRef) 0;
static MIDIPortRef outPort = (MIDIPortRef) 0;

// Each MIDIPacket can contain more than one midi messages.
// This function processes the packet and adds the messages to the specified message queue.
Expand Down Expand Up @@ -463,7 +463,7 @@ INT32 MIDI_Utils_OpenDevice(int direction, INT32 deviceID, MacMidiDeviceHandle**
midiInit();

int err = MIDI_ERROR_NONE;
MIDIEndpointRef endpoint = (MIDIEndpointRef) NULL;
MIDIEndpointRef endpoint = (MIDIEndpointRef) 0;

TRACE0("MIDI_Utils_OpenDevice\n");

Expand Down

9 comments on commit dedddd5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@phohensee
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on dedddd5 Jun 18, 2021

Choose a reason for hiding this comment

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

@phohensee the backport was successfully created on the branch phohensee-backport-dedddd5a in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit dedddd5a from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 2 May 2021 and was reviewed by Phil Race and Alexander Zvegintsev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev phohensee-backport-dedddd5a:phohensee-backport-dedddd5a
$ git checkout phohensee-backport-dedddd5a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev phohensee-backport-dedddd5a

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk15u-dev

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk13u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on dedddd5 Sep 13, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-dedddd5a in my personal fork of openjdk/jdk15u-dev. To create a pull request with this backport targeting openjdk/jdk15u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit dedddd5a from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 2 May 2021 and was reviewed by Phil Race and Alexander Zvegintsev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk15u-dev:

$ git fetch https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-dedddd5a:VladimirKempik-backport-dedddd5a
$ git checkout VladimirKempik-backport-dedddd5a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-dedddd5a

@openjdk
Copy link

@openjdk openjdk bot commented on dedddd5 Sep 13, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-dedddd5a in my personal fork of openjdk/jdk13u-dev. To create a pull request with this backport targeting openjdk/jdk13u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit dedddd5a from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 2 May 2021 and was reviewed by Phil Race and Alexander Zvegintsev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk13u-dev:

$ git fetch https://github.com/openjdk-bots/jdk13u-dev VladimirKempik-backport-dedddd5a:VladimirKempik-backport-dedddd5a
$ git checkout VladimirKempik-backport-dedddd5a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk13u-dev VladimirKempik-backport-dedddd5a

@mrserb
Copy link
Member Author

@mrserb mrserb commented on dedddd5 Jun 12, 2024

Choose a reason for hiding this comment

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

/backport jdk8u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on dedddd5 Jun 12, 2024

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch backport-mrserb-dedddd5a-master in my personal fork of openjdk/jdk8u-dev. To create a pull request with this backport targeting openjdk/jdk8u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit dedddd5a from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 2 May 2021 and was reviewed by Phil Race and Alexander Zvegintsev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk8u-dev:

$ git fetch https://github.com/openjdk-bots/jdk8u-dev.git backport-mrserb-dedddd5a-master:backport-mrserb-dedddd5a-master
$ git checkout backport-mrserb-dedddd5a-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk8u-dev.git backport-mrserb-dedddd5a-master

Please sign in to comment.