Skip to content

Commit 0e524e2

Browse files
Jan KratochvilTheRealMDoerr
authored andcommitted
8324243: Compilation failures in java.desktop module with gcc 14
Reviewed-by: mdoerr Backport-of: 8e5f6ddb68572c0cc8b6e256e423706f6f7cec94
1 parent fed9693 commit 0e524e2

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

make/modules/java.desktop/lib/Awt2dLibraries.gmk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,11 @@ else
468468
# noexcept-type required for GCC 7 builds. Not required for GCC 8+.
469469
# expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
470470
# maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.
471+
# calloc-transposed-args required for GCC 14 builds. (fixed upstream in Harfbuzz 032c931e1c0cfb20f18e5acb8ba005775242bd92)
471472
HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
472473
maybe-uninitialized class-memaccess unused-result extra use-after-free noexcept-type \
473-
expansion-to-defined dangling-reference maybe-uninitialized
474+
expansion-to-defined dangling-reference maybe-uninitialized \
475+
calloc-transposed-args
474476
HARFBUZZ_DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
475477
tautological-constant-out-of-range-compare int-to-pointer-cast \
476478
undef missing-field-initializers range-loop-analysis \

src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ MidiMessage* MIDI_IN_GetMessage(MidiDeviceHandle* handle) {
218218
return NULL;
219219
}
220220
}
221-
jdk_message = (MidiMessage*) calloc(sizeof(MidiMessage), 1);
221+
jdk_message = (MidiMessage*) calloc(1, sizeof(MidiMessage));
222222
if (!jdk_message) {
223223
ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
224224
return NULL;

src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
383383

384384
TRACE0("> openMidiDevice()\n");
385385

386-
(*handle) = (MidiDeviceHandle*) calloc(sizeof(MidiDeviceHandle), 1);
386+
(*handle) = (MidiDeviceHandle*) calloc(1, sizeof(MidiDeviceHandle));
387387
if (!(*handle)) {
388388
ERROR0("ERROR: openDevice: out of memory\n");
389389
return MIDI_OUT_OF_MEMORY;

src/java.desktop/share/native/libfontmanager/sunFont.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int isNullScalerContext(void *context) {
6767
*/
6868
JNIEXPORT jlong JNICALL Java_sun_font_NullFontScaler_getGlyphImage
6969
(JNIEnv *env, jobject scaler, jlong pContext, jint glyphCode) {
70-
void *nullscaler = calloc(sizeof(GlyphInfo), 1);
70+
void *nullscaler = calloc(1, sizeof(GlyphInfo));
7171
return ptr_to_jlong(nullscaler);
7272
}
7373

0 commit comments

Comments
 (0)