On Wed, 9 Aug 2023 06:37:10 GMT, Thomas Stuefe <stu...@openjdk.org> wrote:
>> Julian Waters has updated the pull request with a new target base due to a >> merge or a rebase. The incremental webrev excludes the unrelated changes >> brought in by the merge/rebase. The pull request contains 22 additional >> commits since the last revision: >> >> - Mismatched declaration in D3DGlyphCache.cpp >> - Fields in awt_TextComponent.cpp >> - reinterpret_cast needed in AccessBridgeJavaEntryPoints.cpp >> - Qualifiers in awt_PrintDialog.h should be removed >> - Likewise for awt_DnDDT.cpp >> - awt_ole.h include order issue in awt_DnDDS.cpp >> - Revert awt_ole.h >> - Earlier fix in awt_ole.h was not complete >> - Merge branch 'openjdk:master' into patch-10 >> - Likewise for awt_Frame.cpp >> - ... and 12 more: https://git.openjdk.org/jdk/compare/7b4bc18a...51230f3d > > src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp line 59: > >> 57: AwtTextComponent::OleCallback AwtTextComponent::sm_oleCallback; >> 58: WNDPROC AwtTextComponent::sm_pDefWindowProc = NULL; >> 59: > > Did the compiler complain here? I'm fine with the change, just wanted to know > the reason. the latter two are inside an extern "C" block, meaning their initial C++ linkage (by virtue of them being static class members) conflicts with the now C linkage, also the comment there states the AwtComponent fields are supposed to be set here, and I have no idea why this was not done, so I moved them all to be under that comment ------------- PR Review Comment: https://git.openjdk.org/jdk/pull/15096#discussion_r1288325155