Skip to content

Commit 69fbd54

Browse files
committed
8376352: [8u] Build failure on Windows 32-bit after January 2026 CPU integration
1 parent 056cb52 commit 69fbd54

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ mlib_status mlib_AffineEdges(mlib_affine_param *param,
7474
mlib_s32 top, bot;
7575
mlib_s32 topIdx, max_xsize = 0;
7676
mlib_s32 i, j, t;
77+
int intSize;
7778

7879
srcData = mlib_ImageGetData(src);
7980
dstData = mlib_ImageGetData(dst);
@@ -101,7 +102,7 @@ mlib_status mlib_AffineEdges(mlib_affine_param *param,
101102
return MLIB_FAILURE;
102103
}
103104

104-
int intSize = sizeof(mlib_s32);
105+
intSize = sizeof(mlib_s32);
105106
if (!SAFE_TO_MULT(dstHeight, intSize) ||
106107
!SAFE_TO_ADD(dstHeight * intSize, 7)) {
107108
return MLIB_FAILURE;

jdk/src/windows/native/sun/windows/awt_Desktop.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <float.h>
3131
#include <Windows.h>
3232
#include <shlwapi.h> // for AssocQueryStringW
33+
#include "awt_Desktop.h"
3334
#include <wchar.h>
3435
#include <cwchar>
3536
#include <string.h>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright (c) 2026, IBM Corporation. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
#ifndef AWT_DESKTOP_H
27+
#define AWT_DESKTOP_H
28+
29+
// Work around build failure on 32-bit Windows.
30+
#if !defined(_WIN64)
31+
#ifndef ASSOCF_NONE
32+
#define ASSOCF_NONE 0x00000000
33+
#endif // ASSOCF_NONE
34+
#endif // 32 bit Windows
35+
36+
#endif // AWT_DESKTOP_H

0 commit comments

Comments
 (0)