OpenJDK / jdk / jdk
changeset 59359:034b35d94afc
8244183: linker error jpackageapplauncher on Windows 32bit
Reviewed-by: asemenyuk
| author | mbaesken |
|---|---|
| date | Wed, 06 May 2020 17:24:47 +0200 |
| parents | 5bc71b982f41 |
| children | 5ff07f5ad00e |
| files | src/jdk.incubator.jpackage/windows/native/applauncher/WinLauncher.cpp |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.incubator.jpackage/windows/native/applauncher/WinLauncher.cpp Wed May 20 10:54:11 2020 +0200 +++ b/src/jdk.incubator.jpackage/windows/native/applauncher/WinLauncher.cpp Wed May 06 17:24:47 2020 +0200 @@ -136,10 +136,9 @@ } // namespace - #ifndef JP_LAUNCHERW -int APIENTRY wmain() { +int __cdecl wmain() { return AppLauncher::launch(std::nothrow, launchApp); } @@ -242,7 +241,7 @@ } // namespace -int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) { +int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) { LastErrorGuiLogAppender lastErrorLogAppender; TeeLogAppender logAppender(&AppLauncher::defaultLastErrorLogAppender(), &lastErrorLogAppender);