RFR: 8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler [v46]
Magnus Ihse Bursie
ihse at openjdk.org
Fri Mar 22 12:35:48 UTC 2024
On Sat, 20 Jan 2024 00:40:40 GMT, Phil Race <prr at openjdk.org> wrote:
>> Julian Waters has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 79 commits:
>>
>> - Merge branch 'openjdk:master' into patch-10
>> - Merge branch 'openjdk:master' into patch-10
>> - Fix awt_Window.cpp
>> - Fix awt_PrintJob.cpp
>> - -Zc:stringStrings no longer needed with -permissive- flags-cflags.m4
>> - Fix awt_Window.cpp
>> - awt_Window.cpp
>> - awt_PrintJob.cpp
>> - awt_Frame.cpp
>> - Whitespace awt_Component.cpp
>> - ... and 69 more: https://git.openjdk.org/jdk/compare/35e96627...cbfbaee6
>
> src/java.desktop/windows/native/libawt/windows/awt_Window.cpp line 3308:
>
>> 3306: return;
>> 3307: } else {
>> 3308: pData = JNI_GET_PDATA(self);
>
> set directly
@TheShermanTanker What this means is that you need to replace the line:
PDATA pData;
above with:
AwtWindow *window;
and remove
AwtWindow *window = (AwtWindow *)pData;
below, and then change all references to `pData` in this block to `window`.
The same changes needs to be done in all places where pData is references. This was a temporary variable that is no longer needed.
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/15096#discussion_r1535500631
More information about the build-dev
mailing list