Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8227684: jpackage must handle win32 mangled names in jli.dll JDK-8200758-branch
authorherrick
Thu, 25 Jul 2019 17:07:08 -0400
branchJDK-8200758-branch
changeset 57553 96335b232d4d
parent 57552 abd51a0c612c
child 57554 cb6733b3ed62
8227684: jpackage must handle win32 mangled names in jli.dll Submitted-by: rlichten Reviewed-by: kcr
src/jdk.jpackage/share/native/libapplauncher/Library.h file | annotate | diff | comparison | revisions 
--- a/src/jdk.jpackage/share/native/libapplauncher/Library.h	Thu Jul 25 15:47:00 2019 -0400
+++ b/src/jdk.jpackage/share/native/libapplauncher/Library.h	Thu Jul 25 17:07:08 2019 -0400
@@ -43,7 +43,13 @@
 using namespace std;
 
 // Private typedef for function pointer casting
+
+#if defined(_WIN32) && !defined(_WIN64)
+#define LAUNCH_FUNC "_JLI_Launch@56"
+#else
 #define LAUNCH_FUNC "JLI_Launch"
+#endif
+
 
 typedef int (JNICALL *JAVA_CREATE)(int argc, char ** argv,
         int jargc, const char** jargv,
jdk-sandbox